[josm] 02/07: New upstream version 0.0.svn13053+dfsg
Bas Couwenberg
sebastic at debian.org
Mon Oct 30 16:23:24 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 9fcf51faa13d4c85556d8865a8a2f8a1a725f327
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Oct 30 16:34:37 2017 +0100
New upstream version 0.0.svn13053+dfsg
---
.classpath | 4 +-
REVISION | 6 +-
build.xml | 8 +-
data/defaultpresets.xml | 204 +++-
data/validator/combinations.mapcss | 11 +-
data/validator/deprecated.mapcss | 23 +-
data/validator/geometry.mapcss | 41 +-
data/validator/highway.mapcss | 14 +-
data/validator/numeric.mapcss | 13 +-
data/validator/unnecessary.mapcss | 2 +-
data_nodist/mapcss/basic.mapcss | 220 -----
data_nodist/mapcss/basic.osm | 296 ------
data_nodist/mapcss/relation.mapcss | 12 -
data_nodist/mapcss/relation.osm | 151 ---
i18n/po/af.po | 502 ++++++++--
i18n/po/am.po | 502 ++++++++--
i18n/po/ar.po | 504 ++++++++--
i18n/po/ast.po | 514 ++++++++--
i18n/po/az.po | 502 ++++++++--
i18n/po/be.po | 524 ++++++++--
i18n/po/bg.po | 508 ++++++++--
i18n/po/bn.po | 502 ++++++++--
i18n/po/br.po | 502 ++++++++--
i18n/po/bs.po | 502 ++++++++--
i18n/po/ca.po | 530 ++++++++--
i18n/po/ca at valencia.po | 508 ++++++++--
i18n/po/cs.po | 560 +++++++++--
i18n/po/cy.po | 502 ++++++++--
i18n/po/da.po | 579 ++++++++---
i18n/po/de.po | 849 +++++++++++-----
i18n/po/de_DE.po | 502 ++++++++--
i18n/po/el.po | 502 ++++++++--
i18n/po/en_AU.po | 508 ++++++++--
i18n/po/en_CA.po | 502 ++++++++--
i18n/po/en_GB.po | 518 ++++++++--
i18n/po/eo.po | 502 ++++++++--
i18n/po/es.po | 638 +++++++++---
i18n/po/et.po | 504 ++++++++--
i18n/po/eu.po | 502 ++++++++--
i18n/po/fa.po | 502 ++++++++--
i18n/po/fi.po | 508 ++++++++--
i18n/po/fil.po | 502 ++++++++--
i18n/po/fo.po | 502 ++++++++--
i18n/po/fr.po | 1024 +++++++++++++++-----
i18n/po/ga.po | 502 ++++++++--
i18n/po/gl.po | 504 ++++++++--
i18n/po/he.po | 504 ++++++++--
i18n/po/hi.po | 502 ++++++++--
i18n/po/hr.po | 502 ++++++++--
i18n/po/ht.po | 502 ++++++++--
i18n/po/hu.po | 524 ++++++++--
i18n/po/hy.po | 502 ++++++++--
i18n/po/ia.po | 502 ++++++++--
i18n/po/id.po | 506 ++++++++--
i18n/po/is.po | 502 ++++++++--
i18n/po/it.po | 536 ++++++++--
i18n/po/ja.po | 528 ++++++++--
i18n/po/ka.po | 502 ++++++++--
i18n/po/km.po | 504 ++++++++--
i18n/po/ko.po | 502 ++++++++--
i18n/po/ku.po | 502 ++++++++--
i18n/po/ky.po | 502 ++++++++--
i18n/po/lb.po | 502 ++++++++--
i18n/po/lo.po | 502 ++++++++--
i18n/po/lt.po | 816 +++++++++++-----
i18n/po/lv.po | 502 ++++++++--
i18n/po/mk.po | 502 ++++++++--
i18n/po/mr.po | 504 ++++++++--
i18n/po/ms.po | 502 ++++++++--
i18n/po/nb.po | 504 ++++++++--
i18n/po/nds.po | 502 ++++++++--
i18n/po/nl.po | 585 +++++++++--
i18n/po/nn.po | 502 ++++++++--
i18n/po/oc.po | 502 ++++++++--
i18n/po/pa.po | 504 ++++++++--
i18n/po/pl.po | 526 ++++++++--
i18n/po/pt.po | 631 +++++++++---
i18n/po/pt_BR.po | 528 ++++++++--
i18n/po/rm.po | 502 ++++++++--
i18n/po/ro.po | 502 ++++++++--
i18n/po/ru.po | 587 +++++++++--
i18n/po/sk.po | 578 +++++++++--
i18n/po/sl.po | 502 ++++++++--
i18n/po/sq.po | 502 ++++++++--
i18n/po/sr.po | 502 ++++++++--
i18n/po/sv.po | 516 ++++++++--
i18n/po/ta.po | 502 ++++++++--
i18n/po/te.po | 502 ++++++++--
i18n/po/th.po | 502 ++++++++--
i18n/po/tr.po | 504 ++++++++--
i18n/po/ug.po | 502 ++++++++--
i18n/po/uk.po | 632 +++++++++---
i18n/po/ur.po | 502 ++++++++--
i18n/po/vi.po | 512 ++++++++--
i18n/po/wae.po | 502 ++++++++--
i18n/po/zh_CN.po | 738 ++++++++++----
i18n/po/zh_TW.po | 529 ++++++++--
images/presets/landuse/salt_pond.svg | 123 +++
images/presets/misc/grave.svg | 100 ++
images/presets/misc/tomb.svg | 107 ++
images/presets/place/quarter.svg | 79 ++
images/presets/power/pole_switch.svg | 121 +++
josm-latest.jnlp | 2 +-
josm.jnlp | 2 +-
netbeans/nbproject/genfiles.properties | 4 +-
scripts/TagInfoExtract.groovy | 3 +-
scripts/since_xxx.py | 6 +-
.../jcs/engine/control/CompositeCacheManager.java | 2 +-
src/org/openstreetmap/josm/Main.java | 3 +-
.../josm/actions/AlignInLineAction.java | 6 +-
.../josm/actions/ImageryAdjustAction.java | 12 +-
.../josm/actions/JoinAreasAction.java | 14 +-
.../josm/actions/MergeNodesAction.java | 1 +
.../openstreetmap/josm/actions/UploadAction.java | 14 +-
.../josm/actions/mapmode/DrawAction.java | 10 +-
.../josm/actions/mapmode/ExtrudeAction.java | 6 +-
.../actions/mapmode/ImproveWayAccuracyAction.java | 6 +-
.../josm/actions/mapmode/ParallelWayAction.java | 6 +-
.../josm/actions/mapmode/ParallelWays.java | 16 +-
.../josm/actions/upload/UploadHook.java | 32 +-
src/org/openstreetmap/josm/data/APIDataSet.java | 12 +-
src/org/openstreetmap/josm/data/Preferences.java | 366 +++----
.../openstreetmap/josm/data/UndoRedoHandler.java | 28 -
.../josm/data/imagery/TMSCachedTileLoaderJob.java | 60 +-
.../josm/data/oauth/OAuthAccessTokenHolder.java | 52 +
.../josm/data/oauth/OAuthParameters.java | 38 +-
.../josm/data/osm/DataSelectionListener.java | 20 +
src/org/openstreetmap/josm/data/osm/DataSet.java | 6 +-
src/org/openstreetmap/josm/data/osm/Node.java | 11 -
src/org/openstreetmap/josm/data/osm/OsmUtils.java | 14 +
src/org/openstreetmap/josm/data/osm/Way.java | 14 +-
.../openstreetmap/josm/data/osm/WaySegment.java | 4 +
.../josm/data/osm/event/SelectionEventManager.java | 18 +-
.../osm/visitor/paint/ComputeStyleListWorker.java | 21 +-
.../josm/data/osm/visitor/paint/PaintColors.java | 45 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 18 +-
.../josm/data/preferences/AbstractProperty.java | 27 +-
.../data/preferences/AbstractToStringProperty.java | 7 -
.../josm/data/preferences/CachingProperty.java | 8 +-
.../josm/data/preferences/CollectionProperty.java | 9 +-
.../josm/data/preferences/ColorInfo.java | 151 +++
.../josm/data/preferences/ColorProperty.java | 5 +-
.../josm/data/preferences/EnumProperty.java | 4 +-
.../josm/data/preferences/FallbackProperty.java | 99 ++
.../josm/data/preferences/IntegerProperty.java | 4 +-
.../josm/data/preferences/JosmBaseDirectories.java | 135 +++
.../josm/data/preferences/ListProperty.java | 4 +-
.../josm/data/preferences/NamedColorProperty.java | 178 ++++
.../josm/data/validation/Severity.java | 8 +-
.../data/validation/routines/DomainValidator.java | 2 -
.../data/validation/tests/ConditionalKeys.java | 2 +-
.../josm/data/validation/tests/CrossingWays.java | 41 +-
.../data/validation/tests/MapCSSTagChecker.java | 34 +-
.../data/validation/tests/MultipolygonTest.java | 37 +
.../data/validation/tests/RelationChecker.java | 17 +-
.../openstreetmap/josm/gui/DownloadParamType.java | 2 +-
.../openstreetmap/josm/gui/MainApplication.java | 64 +-
src/org/openstreetmap/josm/gui/MapFrame.java | 5 +-
src/org/openstreetmap/josm/gui/MapScaler.java | 4 +-
src/org/openstreetmap/josm/gui/MapStatus.java | 15 +-
.../openstreetmap/josm/gui/SelectionManager.java | 8 +-
.../josm/gui/autofilter/AutoFilterButton.java | 4 +-
.../josm/gui/bbox/SlippyMapBBoxChooser.java | 75 +-
.../openstreetmap/josm/gui/bbox/SourceButton.java | 220 ++---
.../josm/gui/bugreport/JosmUpdatePanel.java | 7 +-
.../josm/gui/conflict/ConflictColors.java | 6 +-
.../tags/CombinePrimitiveResolverDialog.java | 54 +-
.../josm/gui/dialogs/ConflictDialog.java | 6 +-
.../josm/gui/dialogs/LatLonDialog.java | 8 +-
.../josm/gui/dialogs/MapPaintDialog.java | 4 +-
.../josm/gui/dialogs/ValidatorDialog.java | 3 +-
.../changeset/query/BasicChangesetQueryPanel.java | 13 +-
.../dialogs/properties/PropertiesCellRenderer.java | 10 +-
.../dialogs/relation/GenericRelationEditor.java | 35 +-
.../actions/AbstractRelationEditorAction.java | 2 +-
.../gui/dialogs/relation/actions/SelectAction.java | 44 +
.../gui/dialogs/validator/ValidatorTreePanel.java | 8 +-
.../josm/gui/download/BoundingBoxSelection.java | 17 +-
.../josm/gui/download/OverpassDownloadSource.java | 2 +-
.../gui/download/OverpassQueryWizardDialog.java | 5 +-
.../josm/gui/history/OpenChangesetPopupMenu.java | 11 +-
.../josm/gui/history/VersionInfoPanel.java | 10 +-
.../josm/gui/io/CredentialDialog.java | 23 +-
src/org/openstreetmap/josm/gui/layer/GpxLayer.java | 4 +-
src/org/openstreetmap/josm/gui/layer/Layer.java | 9 +-
.../openstreetmap/josm/gui/layer/OsmDataLayer.java | 6 +-
.../josm/gui/layer/geoimage/ImageDisplay.java | 28 +-
.../josm/gui/layer/geoimage/ImageViewerDialog.java | 8 +
.../josm/gui/layer/geoimage/Offset.java | 3 +-
.../josm/gui/layer/gpx/GpxDrawHelper.java | 9 +-
.../josm/gui/layer/markerlayer/MarkerLayer.java | 6 +-
.../josm/gui/mappaint/ElemStyles.java | 30 +-
.../josm/gui/mappaint/MapPaintStyles.java | 32 +-
.../josm/gui/mappaint/RenderingCLI.java | 131 +--
.../josm/gui/mappaint/RenderingHelper.java | 188 ++++
.../josm/gui/mappaint/mapcss/ConditionFactory.java | 5 +-
.../josm/gui/mappaint/mapcss/MapCSSParser.jj | 9 +-
.../gui/mappaint/mapcss/MapCSSStyleSource.java | 2 +-
.../josm/gui/mappaint/mapcss/Selector.java | 9 +-
.../gui/mappaint/styleelement/LineElement.java | 4 +
.../josm/gui/oauth/AbstractAuthorizationUI.java | 13 +
.../gui/oauth/AdvancedOAuthPropertiesPanel.java | 36 +
.../gui/oauth/FullyAutomaticAuthorizationUI.java | 26 +
.../josm/gui/oauth/OAuthAuthorizationWizard.java | 10 +-
.../gui/preferences/DefaultPreferenceSetting.java | 53 +-
.../gui/preferences/advanced/PreferencesTable.java | 6 +-
.../gui/preferences/audio/AudioPreference.java | 22 +-
.../gui/preferences/display/ColorPreference.java | 383 ++++++--
.../gui/preferences/display/GPXSettingsPanel.java | 4 +-
.../gui/preferences/imagery/ImageryPreference.java | 4 +-
.../server/AuthenticationPreferencesPanel.java | 5 +-
.../OAuthAuthenticationPreferencesPanel.java | 9 +-
.../josm/gui/preferences/shortcut/PrefJPanel.java | 6 +-
.../josm/gui/tagging/presets/TaggingPreset.java | 2 +-
.../gui/widgets/BoundingBoxSelectionPanel.java | 25 +-
.../josm/gui/widgets/PopupMenuButton.java | 152 +++
.../josm/gui/widgets/QuadStateCheckBox.java | 4 +-
src/org/openstreetmap/josm/io/OsmApi.java | 9 +-
src/org/openstreetmap/josm/io/OsmApiException.java | 38 +-
src/org/openstreetmap/josm/io/OsmConnection.java | 34 +-
src/org/openstreetmap/josm/io/OsmServerReader.java | 5 +-
.../josm/io/auth/AbstractCredentialsAgent.java | 23 +-
.../josm/io/auth/CredentialsAgent.java | 8 +
.../josm/io/auth/CredentialsManager.java | 12 +
.../josm/io/protocols/data/DataConnection.java | 8 +-
src/org/openstreetmap/josm/plugins/Plugin.java | 62 ++
.../openstreetmap/josm/plugins/PluginHandler.java | 18 +-
.../josm/spi/preferences/IPreferences.java | 6 +
.../josm/spi/preferences/ListSetting.java | 2 +-
.../josm/spi/preferences/MemoryPreferences.java | 7 +
.../openstreetmap/josm/tools/ExceptionUtil.java | 2 +-
src/org/openstreetmap/josm/tools/ExifReader.java | 3 +-
src/org/openstreetmap/josm/tools/I18n.java | 102 +-
.../openstreetmap/josm/tools/ImageProvider.java | 80 +-
.../tools/JosmDecimalFormatSymbolsProvider.java | 53 +
src/org/openstreetmap/josm/tools/Logging.java | 4 +
src/org/openstreetmap/josm/tools/Utils.java | 18 +
.../template_engine/CompoundTemplateEntry.java | 21 +-
.../josm/tools/template_engine/Condition.java | 20 +-
.../josm/tools/template_engine/ParseError.java | 5 +
.../template_engine/SearchExpressionCondition.java | 9 +
.../josm/tools/template_engine/StaticText.java | 9 +
.../TemplateEngineDataProvider.java | 23 +-
.../josm/tools/template_engine/TemplateEntry.java | 19 +
.../josm/tools/template_engine/TemplateParser.java | 10 +-
.../josm/tools/template_engine/Tokenizer.java | 10 +
.../josm/tools/template_engine/Variable.java | 20 +-
styles/standard/elemstyles.mapcss | 28 +
test/data/renderer/area-fill-color/reference.png | Bin 1724 -> 1829 bytes
test/data/renderer/area-fill-image/reference.png | Bin 6343 -> 6699 bytes
test/data/renderer/area-icon/reference.png | Bin 10861 -> 11218 bytes
test/data/renderer/area-text/reference.png | Bin 4889 -> 5223 bytes
test/data/renderer/eval/data.osm | 18 +
test/data/renderer/eval/reference.png | Bin 0 -> 5395 bytes
test/data/renderer/eval/style.mapcss | 38 +
test/data/renderer/node-shapes-combined/data.osm | 13 +
.../renderer/node-shapes-combined/reference.png | Bin 0 -> 4953 bytes
.../renderer/node-shapes-combined/style.mapcss | 59 ++
test/data/renderer/node-shapes-default/data.osm | 7 +
.../renderer/node-shapes-default/reference.png | Bin 0 -> 360 bytes
.../data/renderer/node-shapes-default/style.mapcss | 9 +
test/data/renderer/node-shapes/reference.png | Bin 3850 -> 3856 bytes
test/data/renderer/node-shapes2/data.osm | 80 ++
test/data/renderer/node-shapes2/reference.png | Bin 0 -> 9088 bytes
test/data/renderer/node-shapes2/style.mapcss | 35 +
test/data/renderer/node-text/reference.png | Bin 6755 -> 6672 bytes
test/data/renderer/node-text2/data.osm | 8 +
test/data/renderer/node-text2/reference.png | Bin 0 -> 2344 bytes
test/data/renderer/node-text2/style.mapcss | 55 ++
test/data/renderer/order/reference.png | Bin 13118 -> 13153 bytes
test/data/renderer/relation-linkselector/data.osm | 73 ++
.../renderer/relation-linkselector/reference.png | Bin 0 -> 3598 bytes
.../renderer/relation-linkselector/style.mapcss | 9 +
.../data/renderer/relation-parentselector/data.osm | 55 ++
.../renderer/relation-parentselector/reference.png | Bin 0 -> 4053 bytes
.../renderer/relation-parentselector/style.mapcss | 11 +
test/data/renderer/way-color/reference.png | Bin 4779 -> 4284 bytes
test/data/renderer/way-dashes-clamp/reference.png | Bin 6015 -> 5407 bytes
test/data/renderer/way-dashes/reference.png | Bin 4889 -> 4893 bytes
test/data/renderer/way-dashes2/data.osm | 37 +
test/data/renderer/way-dashes2/reference.png | Bin 0 -> 5065 bytes
test/data/renderer/way-dashes2/style.mapcss | 34 +
.../renderer/way-repeat-image-clamp/reference.png | Bin 43650 -> 42746 bytes
test/data/renderer/way-repeat-image/reference.png | Bin 46674 -> 47455 bytes
test/data/renderer/way-text/reference.png | Bin 21086 -> 21247 bytes
test/data/renderer/way-width/reference.png | Bin 3557 -> 3573 bytes
.../josm/gui/mappaint/MapCSSRendererTest.java | 189 ++--
test/unit/org/openstreetmap/josm/JOSMFixture.java | 3 +-
.../openstreetmap/josm/data/APIDataSetTest.java | 12 +-
.../openstreetmap/josm/data/PreferencesTest.java | 33 -
.../josm/data/oauth/OAuthParametersTest.java | 2 +
...opertyTest.java => NamedColorPropertyTest.java} | 38 +-
.../gui/datatransfer/OsmTransferHandlerTest.java | 3 +-
.../relation/GenericRelationEditorTest.java | 2 +
.../actions/RelationEditorActionsTest.java | 1 +
.../josm/gui/layer/AutosaveTaskTest.java | 9 +
.../openstreetmap/josm/gui/layer/LayerTest.java | 10 +-
.../josm/gui/layer/markerlayer/WebMarkerTest.java | 2 +-
.../gui/mappaint/mapcss/MapCSSParserTest.groovy | 3 -
.../josm/testutils/JOSMTestRules.java | 5 +-
.../tools/template_engine/TemplateParserTest.java | 24 +-
301 files changed, 40784 insertions(+), 10014 deletions(-)
diff --git a/.classpath b/.classpath
index b46bc0d..f46a34b 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="org/apache/commons/compress/compressors/CompressorException.java|org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/CompressorStreamProvider.java|org/apache/commons/compress/compressors/FileNameUtil.java|org/apache/commons/compress/compressors/brotli/|org/apache/commons/compress/compressors/bzip2/BZip2Utils.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzi [...]
+ <classpathentry excluding="org/apache/commons/compress/compressors/CompressorException.java|org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/CompressorStreamProvider.java|org/apache/commons/compress/compressors/FileNameUtil.java|org/apache/commons/compress/compressors/brotli/|org/apache/commons/compress/compressors/bzip2/BZip2Utils.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzi [...]
<classpathentry including="data/|images/|resources/|styles/" kind="src" path=""/>
<classpathentry kind="src" path="test/unit"/>
<classpathentry kind="src" path="test/functional"/>
@@ -14,7 +14,7 @@
<classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar"/>
<classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/>
<classpathentry kind="lib" path="test/lib/jfcunit.jar"/>
- <classpathentry kind="lib" path="test/lib/equalsverifier-2.3.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.3.3.jar"/>
<classpathentry kind="lib" path="test/lib/reflections/reflections-0.9.10.jar"/>
<classpathentry kind="lib" path="test/lib/reflections/guava-21.0.jar"/>
<classpathentry kind="lib" path="test/lib/reflections/javassist-3.21.0-GA.jar"/>
diff --git a/REVISION b/REVISION
index 5ae6c40..a1a2ac4 100644
--- a/REVISION
+++ b/REVISION
@@ -3,7 +3,7 @@
<entry
kind="dir"
path="trunk"
- revision="12921">
+ revision="13053">
<url>https://josm.openstreetmap.de/svn/trunk</url>
<relative-url>^/trunk</relative-url>
<repository>
@@ -11,9 +11,9 @@
<uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
</repository>
<commit
- revision="12921">
+ revision="13053">
<author>Don-vip</author>
-<date>2017-10-03T19:43:00.819794Z</date>
+<date>2017-10-29T18:52:48.335778Z</date>
</commit>
</entry>
</info>
diff --git a/build.xml b/build.xml
index ba1c097..bad63a9 100644
--- a/build.xml
+++ b/build.xml
@@ -63,6 +63,8 @@
<target name="create-revision-eclipse">
<property name="revision.dir" value="bin"/>
<antcall target="create-revision"/>
+ <mkdir dir="bin/META-INF/services"/>
+ <echo encoding="UTF-8" file="bin/META-INF/services/java.text.spi.DecimalFormatSymbolsProvider">org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider</echo>
</target>
<!--
** Initializes the REVISION.XML file from SVN information
@@ -148,8 +150,9 @@ Build-Date: ${build.tstamp}
<attribute name="Application-Name" value="JOSM - Java OpenStreetMap Editor"/>
<!-- Java 9 stuff. Entries are safely ignored by Java 8 -->
<attribute name="Add-Exports" value="java.base/sun.security.util java.base/sun.security.x509 java.desktop/com.apple.eawt java.desktop/com.sun.imageio.spi javafx.graphics/com.sun.javafx.application jdk.deploy/com.sun.deploy.config" />
- <attribute name="Add-Opens" value="java.base/java.lang java.base/jdk.internal.loader java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
+ <attribute name="Add-Opens" value="java.base/java.lang java.base/java.nio java.base/jdk.internal.loader java.base/jdk.internal.ref java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
</manifest>
+ <service type="java.text.spi.DecimalFormatSymbolsProvider" provider="org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider" />
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
<zipfileset dir="styles" prefix="styles"/>
@@ -253,6 +256,7 @@ Build-Date: ${build.tstamp}
<exclude name="org/apache/commons/compress/compressors/pack200/**"/>
<exclude name="org/apache/commons/compress/compressors/snappy/**"/>
<exclude name="org/apache/commons/compress/compressors/z/**"/>
+ <exclude name="org/apache/commons/compress/compressors/zstandard/**"/>
<exclude name="org/apache/commons/compress/parallel/**"/>
<exclude name="org/apache/commons/compress/utils/ArchiveUtils.java"/>
<exclude name="org/apache/commons/jcs/JCS.java"/>
@@ -468,6 +472,8 @@ Build-Date: ${build.tstamp}
<jvmarg value="--add-opens" if:set="isJava9" />
<jvmarg value="java.base/java.lang=ALL-UNNAMED" if:set="isJava9" />
<jvmarg value="--add-opens" if:set="isJava9" />
+ <jvmarg value="java.base/java.nio=ALL-UNNAMED" if:set="isJava9" />
+ <jvmarg value="--add-opens" if:set="isJava9" />
<jvmarg value="java.base/java.text=ALL-UNNAMED" if:set="isJava9" />
<jvmarg value="--add-opens" if:set="isJava9" />
<jvmarg value="java.base/java.util=ALL-UNNAMED" if:set="isJava9" />
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index b94a315..0a6fb7b 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -105,6 +105,12 @@
<check key="bicycle" text="Bicycle"/>
</optional>
</chunk>
+ <chunk id="min_age">
+ <text key="min_age" text="Minimum age" />
+ </chunk>
+ <chunk id="max_age">
+ <text key="max_age" text="Maximum age" />
+ </chunk>
<chunk id="name_ref">
<text key="name" text="Name" />
<text key="ref" text="Reference" />
@@ -285,12 +291,15 @@
<text key="operator" text="Operator" />
<text key="branch" text="Branch operator" />
</chunk>
- <chunk id="cable_circuit">
+ <chunk id="cables">
<combo key="cables" text="Amount of Cables" values="1,2,3,4,6,9,12" />
+ </chunk>
+ <chunk id="cables_circuits">
+ <reference ref="cables" />
<combo key="circuits" text="Amount of circuits" values="1,2,3,4" />
</chunk>
<chunk id="power_loc">
- <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" values_context="power" />
+ <combo key="location" text="Location" values="outdoor,indoor,underground,platform,rooftop,kiosk" values_context="power" />
</chunk>
<chunk id="power_extra">
<reference ref="power_loc" />
@@ -298,7 +307,7 @@
<reference ref="ref_operator_branch" />
</chunk>
<chunk id="power_line_extra">
- <reference ref="cable_circuit" />
+ <reference ref="cables_circuits" />
<reference ref="voltage_frequency" />
</chunk>
<chunk id="power_generator">
@@ -333,6 +342,18 @@
<reference ref="voltage_frequency" />
</optional>
</chunk>
+ <chunk id="power_pole">
+ <text key="height" text="Height (meters)" />
+ <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
+ <check key="location:transition" text="Location transition" disable_off="true" />
+ <reference ref="ref_operator_branch" />
+ </chunk>
+ <chunk id="optional_rating_phases">
+ <optional>
+ <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
+ <combo key="phases" text="Phases" values="1,3" length="1" />
+ </optional>
+ </chunk>
<chunk id="optional_bridge">
<optional>
<text key="name" text="Name" />
@@ -994,16 +1015,8 @@
<preset_link preset_name="Road Restrictions" />
</item> <!-- Roundabout -->
<item name="Ford" icon="presets/vehicle/ford.svg" type="node,way" preset_name_label="true">
- <link href="http://wiki.openstreetmap.org/wiki/Key:ford"
- cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:ford"
- de.href="http://wiki.openstreetmap.org/wiki/DE:Key:ford"
- es.href="http://wiki.openstreetmap.org/wiki/ES:Key:ford"
- fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:ford"
- it.href="http://wiki.openstreetmap.org/wiki/IT:Key:ford"
- ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:ford"
- pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:ford"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:ford"
- uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:ford" />
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:ford=yes"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:ford=yes" />
<combo key="ford" text="Ford" values="yes,stepping_stones" default="yes" values_searchable="true" match="keyvalue!" />
<optional>
<text key="name" text="Name" />
@@ -1155,9 +1168,19 @@
</optional>
</item> <!-- Dedicated Cycleway -->
<item name="Segregated Foot- and Cycleway" icon="presets/transport/way/segregated_foot_cycleway.svg" type="way,closedway" preset_name_label="true">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
- de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
- it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=path"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=path"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=path"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=path"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=path"
+ nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:highway=path"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=path"
+ pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:highway=path"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=path"
+ sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:highway=path"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=path" />
<key key="highway" value="path" />
<key key="bicycle" value="designated" />
<key key="foot" value="designated" />
@@ -1169,9 +1192,19 @@
</optional>
</item> <!-- Segregated Foot- and Cycleway -->
<item name="Combined Foot- and Cycleway" icon="presets/transport/way/combined_foot_cycleway.svg" type="way,closedway" preset_name_label="true">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
- de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
- it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=path"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=path"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=path"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=path"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=path"
+ nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:highway=path"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=path"
+ pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:highway=path"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=path"
+ sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:highway=path"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=path" />
<key key="highway" value="path" />
<key key="bicycle" value="designated" />
<key key="foot" value="designated" />
@@ -3097,6 +3130,9 @@
<check key="fuel:1_50" text="1/50 mix (mofa/moped)" />
</checkgroup>
<space />
+ <label text="Additives:" />
+ <check key="fuel:adblue" text="Diesel Exhaust Fluid (AdBlue/AUS32)" />
+ <space />
<label text="Fuel cards:" />
<checkgroup columns="3">
<check key="payment:dkv" text="DKV" />
@@ -3507,6 +3543,7 @@
<check key="trolleybus" text="Trolleybus" />
<check key="share_taxi" text="Share taxi" />
<check key="subway" text="Subway" />
+ <check key="light_rail" text="Light Rail" />
<check key="monorail" text="Monorail" />
<check key="funicular" text="Funicular" />
<check key="aerialway" text="Aerialway" />
@@ -3962,6 +3999,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=chalet"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=chalet"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=chalet"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=chalet"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=chalet"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:tourism=chalet"
@@ -4466,7 +4504,7 @@
<check key="drive_in" text="Drive-in theater" />
<check key="cinema:3D" text="3D" />
<text key="screen" text="Number of screens" />
- <text key="min_age" text="Minimum age" />
+ <reference ref="min_age" />
<reference ref="link_contact_address_payment" />
<preset_link preset_name="Building" />
</item> <!-- Movie Theater/Cinema -->
@@ -4626,6 +4664,7 @@
<space />
<key key="leisure" value="playground" />
<reference ref="name_operator_oh_wheelchair" />
+ <reference ref="max_age" />
</item> <!-- Playground -->
<item name="Picnic Site" icon="presets/leisure/picnic.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=picnic_site"
@@ -4719,6 +4758,7 @@
<space />
<key key="amenity" value="nightclub" />
<reference ref="name_operator_oh_wheelchair" />
+ <reference ref="min_age" />
<space />
<reference ref="internet_smoking" />
<space />
@@ -5201,6 +5241,8 @@
<space />
<key key="amenity" value="kindergarten" />
<reference ref="name_operator_oh_wheelchair" />
+ <reference ref="min_age" />
+ <reference ref="max_age" />
<reference ref="link_contact_address" />
<preset_link preset_name="Building" />
</item> <!-- Kindergarten -->
@@ -5220,6 +5262,7 @@
<space />
<key key="amenity" value="school" />
<reference ref="name_operator_oh_wheelchair" />
+ <reference ref="min_age" />
<reference ref="link_contact_address" />
<preset_link preset_name="Building" />
</item> <!-- School -->
@@ -7566,10 +7609,7 @@
<key key="power" value="transformer" />
<combo key="transformer" text="Type of transformer" values="distribution,generator,converter,traction,auto,phase_angle_regulator,yes" match="key" values_context="power" />
<reference ref="power_extra" />
- <optional>
- <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
- <combo key="phases" text="Phases" values="1,3" length="1" />
- </optional>
+ <reference ref="optional_rating_phases" />
</item> <!-- Power Transformer -->
<item name="Power Switchgear" icon="presets/power/switchgear.svg" type="closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:power=switchgear"
@@ -7606,6 +7646,13 @@
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=switch" />
<space />
<key key="power" value="switch" />
+ <combo key="switch" text="Type of switch" values="mechanical,circuit_breaker,disconnector,earthing" match="key" values_context="power" />
+ <reference ref="power_loc" />
+ <optional>
+ <reference ref="voltage" />
+ <reference ref="cables" />
+ <reference ref="ref_operator_branch" />
+ </optional>
</item> <!-- Power Switch -->
<separator/>
<item name="Power Converter" icon="presets/power/converter.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -7709,11 +7756,29 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=pole" />
<space />
<key key="power" value="pole" />
- <text key="height" text="Height (meters)" />
- <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
- <check key="location:transition" text="Location transition" disable_off="true" />
- <reference ref="ref_operator_branch" />
+ <reference ref="power_pole" />
</item> <!-- Pole -->
+ <item name="Pole with Switch" icon="presets/power/pole_switch.svg" type="node" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=pole"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:power=pole"
+ fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=pole"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=pole"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=pole"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=pole"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=pole" />
+ <space />
+ <key key="power" value="pole" />
+ <label text="Pole Attributes:" />
+ <reference ref="power_pole" />
+ <space />
+ <label text="Switch Attributes:" />
+ <combo key="switch" text="Type" values="mechanical,circuit_breaker,disconnector,earthing" match="key!" values_context="power" />
+ <optional>
+ <reference ref="voltage" />
+ <reference ref="cables" />
+ </optional>
+ </item> <!-- Pole with Switch -->
<item name="Pole with Transformer" icon="presets/power/pole_transformer.svg" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=pole"
@@ -7726,19 +7791,13 @@
<space />
<key key="power" value="pole" />
<label text="Pole Attributes:" />
- <text key="height" text="Height (meters)" />
- <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
- <check key="location:transition" text="Location transition" disable_off="true" />
- <reference ref="ref_operator_branch" />
+ <reference ref="power_pole" />
<space />
<label text="Transformer Attributes:" />
<key key="transformer" value="distribution" match="key!" />
<reference ref="voltage_frequency" />
- <optional>
- <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
- <combo key="phases" text="Phases" values="1,3" length="1" />
- </optional>
- </item> <!-- Pole with Transformer-->
+ <reference ref="optional_rating_phases" />
+ </item> <!-- Pole with Transformer -->
<item name="Insulator" icon="presets/power/insulator.svg" type="node,way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:power=insulator"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=insulator" />
@@ -7761,7 +7820,7 @@
<reference ref="voltage_frequency" />
<reference ref="ref_operator_branch" />
<optional>
- <reference ref="cable_circuit" />
+ <reference ref="cables_circuits" />
<combo key="wires" text="Number of conductors/wires per cable" values="single,double,triple,quad,fivefold,sixfold,eightfold" values_context="power" />
<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<check key="communication" text="Used for data communications" value_on="line" value_off="" default="off" />
@@ -7777,7 +7836,7 @@
<reference ref="voltage_frequency" />
<reference ref="ref_operator_branch" />
<optional>
- <reference ref="cable_circuit" />
+ <reference ref="cables_circuits" />
<combo key="location" text="Location" values="underground,underwater,overground" values_context="power cable" />
<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<check key="communication" text="Used for data communications" value_on="line" value_off="" default="off" />
@@ -7818,6 +7877,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:historic=archaeological_site"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:historic=archaeological_site"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:historic=archaeological_site"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:historic=archaeological_site"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:historic=archaeological_site"
@@ -7854,6 +7914,32 @@
<text key="name" text="Name" />
</item> <!-- Palaeontological Site -->
<separator/>
+ <item name="Grave" icon="presets/misc/grave.svg" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:cemetery=grave"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:cemetery=grave"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:cemetery=grave"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:cemetery=grave"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:cemetery=grave"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:cemetery=grave"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:cemetery=grave" />
+ <space />
+ <key key="cemetery" value="grave" />
+ <text key="name" text="Name" />
+ </item> <!-- Grave -->
+ <item name="Tomb" icon="presets/misc/tomb.svg" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=tomb"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:historic=tomb"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=tomb"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:historic=tomb"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:historic=tomb"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:historic=tomb"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:historic=tomb" />
+ <space />
+ <key key="historic" value="tomb" />
+ <combo key="tomb" text="Type" values="tumulus,rock-cut,hypogeum,war_grave,mausoleum,columbarium,crypt,pyramid,sarcophagus,vault" values_context="tomb" values_searchable="true" />
+ <text key="name" text="Name" />
+ </item> <!-- Tomb -->
+ <separator/>
<item name="Monument" icon="presets/sightseeing/monument.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:historic=monument"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:historic=monument"
@@ -8891,6 +8977,7 @@
<space />
<key key="shop" value="erotic" />
<reference ref="name_operator_oh_wheelchair" />
+ <reference ref="min_age" />
<reference ref="link_contact_address_payment" />
</item> <!-- Erotic -->
</group> <!-- For the body -->
@@ -9345,7 +9432,9 @@
<item name="Foundation" icon="presets/office/foundation.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:office=foundation"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:office=foundation"
- es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:office=foundation" />
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:office=foundation"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:office=foundation"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:office=foundation" />
<space />
<key key="office" value="foundation" />
<reference ref="name_brand_operator_oh_wheelchair" />
@@ -10025,6 +10114,16 @@
<reference ref="name_wikipedia" />
<reference ref="population_postcode_website" />
</item> <!-- Suburb -->
+ <item name="Quarter" icon="presets/place/quarter.svg" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:place=quarter"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:place=quarter"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=quarter" />
+ <space />
+ <key key="place" value="quarter" />
+ <reference ref="name_wikipedia" />
+ <text key="population" text="Population" />
+ <text key="website" text="Website" />
+ </item> <!-- Quarter -->
<item name="Neighbourhood" icon="presets/place/neighbourhood.svg" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:place=neighbourhood"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:place=neighbourhood"
@@ -10557,7 +10656,7 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=vineyard" />
<space />
<key key="landuse" value="vineyard" />
- <combo key="crop" text="Crop" values="grape" default="grape" values_context="crop" />
+ <key key="crop" value="grape" match="keyvalue" />
<reference ref="optional_name" />
</item> <!-- Vineyard -->
<item name="Greenhouse Horticulture" icon="presets/landuse/greenhouse_horticulture.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10588,6 +10687,20 @@
<reference ref="genus_species_taxon" />
<reference ref="optional_name_operator" />
</item> <!-- Plant Nursery -->
+ <item name="Salt Pond" icon="presets/landuse/salt_pond.svg" type="closedway,multipolygon" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=salt_pond"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=salt_pond"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=salt_pond"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:landuse=salt_pond"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=salt_pond"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=salt_pond"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=salt_pond"
+ pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:landuse=salt_pond"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=salt_pond" />
+ <space />
+ <key key="landuse" value="salt_pond" />
+ <reference ref="optional_name_operator" />
+ </item> <!-- Salt Pond -->
<item name="Aquaculture" icon="presets/landuse/aquaculture.svg" type="closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=aquaculture"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=aquaculture"
@@ -10784,6 +10897,7 @@
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=industrial"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=industrial"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:landuse=industrial"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=industrial"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=industrial"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:landuse=industrial"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=industrial"
@@ -11222,7 +11336,7 @@
<key key="type" value="route"/>
<key key="route" value="bicycle"/>
<text key="name" text="Name" />
- <combo key="network" text="Network" values="icn,ncn,rcn,lcn" display_values="international,national,regional,local" values_sort="false" />
+ <combo key="network" text="Network" values="icn,ncn,rcn,lcn" display_values="international,national,regional,local" values_context="network" values_sort="false" />
<optional>
<reference ref="route_hikebike_optionals" />
</optional>
@@ -11264,7 +11378,7 @@
<key key="type" value="route"/>
<key key="route" value="hiking"/>
<text key="name" text="Name" />
- <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" display_values="international,national,regional,local" values_sort="false"/>
+ <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" display_values="international,national,regional,local" values_context="network" values_sort="false"/>
<optional>
<reference ref="route_hikebike_optionals" />
</optional>
@@ -11282,7 +11396,7 @@
<key key="type" value="route"/>
<key key="route" value="foot"/>
<text key="name" text="Name" />
- <combo key="network" text="Network" values="rwn,lwn" display_values="regional,local" values_sort="false" />
+ <combo key="network" text="Network" values="rwn,lwn" display_values="regional,local" values_context="network" values_sort="false" />
<optional>
<reference ref="route_hikebike_optionals" />
</optional>
@@ -11301,7 +11415,7 @@
<key key="type" value="route"/>
<key key="route" value="horse"/>
<text key="name" text="Name" />
- <combo key="network" text="Network" values="ihn,nhn,rhn,lhn" display_values="international,national,regional,local" values_sort="false" />
+ <combo key="network" text="Network" values="ihn,nhn,rhn,lhn" display_values="international,national,regional,local" values_context="network" values_sort="false" />
<optional>
<reference ref="route_hikebike_optionals" />
</optional>
diff --git a/data/validator/combinations.mapcss b/data/validator/combinations.mapcss
index 3f00f31..2cfefaa 100644
--- a/data/validator/combinations.mapcss
+++ b/data/validator/combinations.mapcss
@@ -41,14 +41,11 @@ way[length_unit ][!waterway],
way[canal ][!waterway],
way[have_riverbank ][!waterway],
*[border_type ][!boundary],
-way[bridge:structure ][!bridge],
*[piste:difficulty ][!piste:type],
*[source:date ][!source],
*[source:name ][!name],
-*[source:maxspeed:forward ][!maxspeed:forward],
-*[source:maxspeed:backward ][!maxspeed:backward],
-*[source:maxspeed:forward ][!source:maxspeed:backward],
-*[source:maxspeed:backward ][!source:maxspeed:forward],
+*[source:maxspeed:forward ][!maxspeed:forward][!maxspeed],
+*[source:maxspeed:backward ][!maxspeed:backward][!maxspeed],
*[source:building ][!building],
*[source:ref ][!ref],
*[source:population ][!population],
@@ -144,6 +141,7 @@ way[power=cable ][!voltage],
*[power=generator ][!voltage][generator:output:electricity],
*[power=plant ][!voltage][plant:output:electricity],
*[power=substation ][!substation],
+*[power=switch ][!switch],
*[power=transformer ][!transformer],
*[amenity=parking ][!parking],
*[amenity=parking_entrance ][!parking] {
@@ -151,7 +149,7 @@ way[power=cable ][!voltage],
group: tr("missing tag");
assertMatch: "way power=line";
assertNoMatch: "way power=line voltage=1";
- assertNoMatch: "way power=switch";
+ assertMatch: "way power=switch";
assertMatch: "way power=substation";
assertMatch: "way power=substation transformer=foobar";
assertNoMatch: "way power=substation substation=foobar";
@@ -161,6 +159,7 @@ way[power=cable ][!voltage],
}
/* {0.key} without {1.key} or {2.tag} */
+way[bridge:structure ][!bridge][man_made!=bridge],
*[smoothness ][!highway][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking|bicycle_parking)$/],
*[segregated ][!highway][railway!=crossing] {
throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.key}", "{2.tag}");
diff --git a/data/validator/deprecated.mapcss b/data/validator/deprecated.mapcss
index 8ae969e..a5446fa 100644
--- a/data/validator/deprecated.mapcss
+++ b/data/validator/deprecated.mapcss
@@ -609,20 +609,6 @@ relation[/^..$/][!to] {
assertMatch: "node f=b";
}
-/* see #11344 */
-*[tower=air_to_ground] {
- throwWarning: tr("{0} is deprecated", "{0.tag}");
- suggestAlternative: "tower=transition";
- group: tr("deprecated tagging");
- fixAdd: "tower=transition";
-}
-*[pole=air_to_ground] {
- throwWarning: tr("{0} is deprecated", "{0.tag}");
- suggestAlternative: "pole=transition";
- group: tr("deprecated tagging");
- fixAdd: "pole=transition";
-}
-
/* see #11439 */
*[sport=hockey] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -810,13 +796,12 @@ node[type][pipeline=marker] {
fixChangeKey: "type => studio";
}
-/* #11507, #12297 */
+/* #11507, #12297, #15409 */
*[power=cable_distribution_cabinet] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
- suggestAlternative: "man_made=street_cabinet + street_cabinet=power";
+ suggestAlternative: "man_made=street_cabinet + street_cabinet=*";
group: tr("deprecated tagging");
fixAdd: "man_made=street_cabinet";
- fixAdd: "street_cabinet=power";
fixRemove: "power";
}
@@ -1004,7 +989,8 @@ way[waterway=canal][service][service !~ /^(irrigation|transportation|water_power
group: tr("deprecated tagging");
}
-/* #13101 */
+/* #11344, #13101, #15480 */
+node[pole=air_to_ground],
node[pole=transition] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "location:transition=yes";
@@ -1012,6 +998,7 @@ node[pole=transition] {
fixAdd: "location:transition=yes";
fixRemove: "pole";
}
+node[tower=air_to_ground],
node[tower=transition] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "location:transition=yes";
diff --git a/data/validator/geometry.mapcss b/data/validator/geometry.mapcss
index 7527dd5..d2328b5 100644
--- a/data/validator/geometry.mapcss
+++ b/data/validator/geometry.mapcss
@@ -112,6 +112,24 @@ way[route=bus] {
throwError: tr("{0} on a way. Should be used in a relation", "{0.tag}");
}
+/* #14395 */
+way >[index=1] node,
+way >[index=-1] node {
+ set first_last_node;
+}
+way[highway][area!=yes][!tunnel][!covered] > node {
+ set node_in_highway;
+}
+way[building][building!=no] > node.node_in_highway!.first_last_node {
+ throwWarning: tr("node connects highway and building");
+}
+
+/* #15035, must not warn for node 3815077900*/
+node[man_made!=monitoring_station][at(0.0,0.0)] {
+ throwError: tr("Object at Position 0.00E 0.00N. There is nothing at this position except an already mapped weather buoy.");
+ fixDeleteObject: this;
+}
+
/* #12502 */
node[leisure=park][natural=tree] {
throwWarning: tr("{0} together with {1} on a node. Remove {0}.", "{0.tag}", "{1.tag}");
@@ -246,7 +264,7 @@ way[waterway] > node.node_in_bridge {
throwWarning: tr("node connects waterway and bridge");
}
-/* #11128, #14812 */
+/* #11128, #14812, #15032 */
way[highway] > node[tourism=information][information=guidepost] {
set guidepost;
throwOther: tr("{0} node connected to a highway", "{1.tag}");
@@ -256,7 +274,8 @@ way[highway] > node[building][!entrance],
way[highway] > node[leisure][!entrance][leisure!=slipway],
way[highway] > node[office][!entrance],
way[highway] > node[shop][!entrance],
-way[highway] > node[tourism][!entrance][tourism!=viewpoint]!.guidepost {
+way[highway] > node[tourism][!entrance][tourism!=viewpoint]!.guidepost.first_last_node:connection,
+way[highway] > node[tourism][!entrance][tourism!=viewpoint]!.guidepost!.first_last_node {
throwWarning: tr("{0} node connected to a highway", "{0.key}");
}
@@ -320,24 +339,6 @@ area:closed[waterway = river][area!=no] {
throwWarning: tr("{0} is the tag for the linear waterway. To tag the water area use {1} + {2} instead.", "{1.tag}", "natural=water", "water=*");
}
-/* #14395 */
-way >[index=1] node,
-way >[index=-1] node {
- set first_last_node;
-}
-way[highway][area!=yes][!tunnel][!covered] > node {
- set node_in_highway;
-}
-way[building][building!=no] > node.node_in_highway!.first_last_node {
- throwWarning: tr("node connects highway and building");
-}
-
-/* #15035, must not warn for node 3815077900*/
-node[man_made!=monitoring_station][at(0.0,0.0)] {
- throwError: tr("Object at Position 0.00E 0.00N. There is nothing at this position except an already mapped weather buoy.");
- fixDeleteObject: this;
-}
-
/* #15097 */
way[highway][area!=yes] > node,
way[man_made=pier] > node {
diff --git a/data/validator/highway.mapcss b/data/validator/highway.mapcss
index c5daf4b..c5920a8 100644
--- a/data/validator/highway.mapcss
+++ b/data/validator/highway.mapcss
@@ -85,11 +85,11 @@ way[highway=cycleway][cycleway=lane] {
assertNoMatch: "way highway=footway";
}
-/* footway, see #10851, #10976 */
-way[footway=left][/footway:/],
-way[footway=right][/footway:/],
-way[footway=both][/footway:/],
-way[footway=no][/footway:/] {
+/* footway, see #10851, #10976, #15439 */
+way[footway=left][/^footway:/],
+way[footway=right][/^footway:/],
+way[footway=both][/^footway:/],
+way[footway=no][/^footway:/] {
throwWarning: tr("{0} is deprecated, use {1} instead. Also check similar tags like {2}", "{0.tag}", "sidewalk", "{1.key}");
group: tr("deprecated tagging");
set not_fixable_footway;
@@ -126,10 +126,10 @@ way[footway][footway!=sidewalk][footway!=crossing]!.fixable_footway!.not_fixable
assertMatch: "way footway=bar";
}
-/* #11270, #9297 */
+/* #11270, #9297, #15439 */
way[railway =~ /^(light_rail|miniature|narrow_gauge|preserved|rail)$/][!highway] > node { set .is_in_railway }
way[highway =~ /^(bridleway|cycleway|footway|path|steps)$/] > node { set .is_in_minor_road }
-way[highway =~ /^(bus_guideway|living_street|motorway|pedestrian|primary|raceway|residential|road|secondary|service|tertiary|track|trunk|unclassified)/] > node { set .is_in_major_road }
+way[highway =~ /^(bus_guideway|living_street|motorway|motorway_link|pedestrian|primary|primary_link|raceway|residential|road|secondary|secondary_link|service|tertiary|tertiary_link|track|trunk|trunk_link|unclassified)$/] > node { set .is_in_major_road }
node[railway!=crossing].is_in_railway.is_in_minor_road!.is_in_major_road {
throwWarning: tr("pedestrian railway crossing without {0}", "{0.tag}");
group: tr("missing tag");
diff --git a/data/validator/numeric.mapcss b/data/validator/numeric.mapcss
index 81339ee..95eb3c0 100644
--- a/data/validator/numeric.mapcss
+++ b/data/validator/numeric.mapcss
@@ -6,19 +6,22 @@
assertNoMatch: "way ref.1=foo";
}
-*[layer =~ /\+.*/] {
- throwWarning: tr("layer tag with + sign");
+*[layer =~ /^\+\d/] {
+ throwWarning: tr("{0} value with + sign", "{0.key}");
fixAdd: concat("layer=", replace(tag("layer"), "+", ""));
assertMatch: "node layer=+1";
assertNoMatch: "node layer=1";
assertNoMatch: "node layer=-1";
+ assertNoMatch: "node layer=+foo";
}
*[layer][layer !~ /^0$|^(-|\+)?[1-5]$/] {
- throwWarning: tr("layer should be between -5 and 5");
+ throwWarning: tr("{0} should be an integer value between -5 and 5", "{0.key}");
assertMatch: "node layer=-50";
assertMatch: "node layer=6";
- assertMatch: "node layer=+100";
+ assertMatch: "node layer=+10";
+ assertMatch: "node layer=0.5";
+ assertMatch: "node layer=0;1";
assertNoMatch: "node layer=-5";
assertNoMatch: "node layer=0";
assertNoMatch: "node layer=2";
@@ -123,7 +126,7 @@ way[maxspeed:backward][maxspeed:backward !~ /^(signals|none|unposted|variable|wa
assertNoMatch: "way maxspeed=variable";
}
-*[distance][distance !~ /^(([0-9]+\.?[0-9]*( (km|mi|nmi))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/] {
+*[distance][distance !~ /^(([0-9]+\.?[0-9]*( (m|km|mi|nmi))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/] {
throwWarning: tr("{0}: kilometers is default; period is separator; if units, put space then unit", "distance");
assertMatch: "way distance=something";
assertMatch: "way distance=-5";
diff --git a/data/validator/unnecessary.mapcss b/data/validator/unnecessary.mapcss
index b9df507..257c608 100644
--- a/data/validator/unnecessary.mapcss
+++ b/data/validator/unnecessary.mapcss
@@ -1,5 +1,5 @@
*[access][highway=proposed],
-*[motor_vehicle?][vehicle!=no][access!=no][bicycle_road!=yes][highway =~ /motorway|trunk|primary|secondary|tertiary|unclassified|residential|service|living_street/],
+*[motor_vehicle?][vehicle!=no][access!=no][bicycle_road!=yes][highway =~ /^(motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified|residential|service|living_street)$/],
*[bridge=no],
*[building=no],
*[elevation="0"],
diff --git a/data_nodist/mapcss/basic.mapcss b/data_nodist/mapcss/basic.mapcss
deleted file mode 100644
index 3455271..0000000
--- a/data_nodist/mapcss/basic.mapcss
+++ /dev/null
@@ -1,220 +0,0 @@
-meta {
- title: "Basic MapCSS tests";
-}
-
-/**
- * test different symbols
- */
-node[ test:fill ]
-{
- symbol-size: 50;
- symbol-fill-color: purple;
-}
-node[ test:fill = circle ] { symbol-shape : circle ; } /* whitespace at all possible places */
-node[test:fill=square]{symbol-shape:square;} /* no whitespace at all */
-node[ test:fill = triangle ] { symbol-shape: triangle; }
-node[ test:fill = pentagon ] { symbol-shape: pentagon }
-node[ test:fill = hexagon ] { symbol-shape: hexagon; }
-node[ test:fill = heptagon ] { symbol-shape: heptagon; }
-node[ test:fill = octagon ] { symbol-shape: octagon; }
-node[ test:fill = nonagon ] {symbol-shape: nonagon; }
-node[ test:fill = decagon ] { symbol-shape: decagon; }
-
-node[ test:stroke ]
-{
- symbol-size: 50;
- symbol-stroke-color: purple;
-}
-node[ test:stroke = circle ] { symbol-shape: circle; }
-node[ test:stroke = square ] { symbol-shape: square; }
-node[ test:stroke = triangle ] { symbol-shape: triangle; }
-node[ test:stroke = triangle ] { symbol-shape: triangle; }
-node[ test:stroke = pentagon ] { symbol-shape: pentagon; }
-node[ test:stroke = hexagon ] { symbol-shape: hexagon; }
-node[ test:stroke = heptagon ] { symbol-shape: heptagon; }
-node[ test:stroke = octagon ] { symbol-shape: octagon; }
-node[ test:stroke = nonagon ] { symbol-shape: nonagon; }
-node[ test:stroke = decagon ] { symbol-shape: decagon; }
-
-/**
- * Test default values.
- * This should display a circle although neither size nor color are specified
- */
-node[test=circle]
-{
- symbol-shape: circle;
-}
-
-/**
- * 3 Tests: relative symbol-stroke-width, alignment and stacking of stroke & fill for shapes
- */
-node[test=pentagon1]
-{
- symbol-shape: pentagon;
- symbol-size: 50;
- symbol-stroke-color: gold;
- symbol-stroke-opacity: 0.9;
- symbol-stroke-width: 10;
-}
-node[test=pentagon1]::stroke-casing
-{
- symbol-shape: pentagon;
- symbol-size: 50;
- symbol-stroke-color: #ddd;
- symbol-stroke-opacity: 0.6;
- symbol-stroke-width: +8;
- z-index: -10;
-}
-node[test=pentagon1]::fill
-{
- symbol-shape: pentagon;
- symbol-size: 50;
- symbol-fill-color: darkblue;
- symbol-fill-opacity: 1.0;
- z-index: -15;
-}
-node[test=pentagon2]
-{
- symbol-shape: pentagon;
- symbol-size: 50;
- symbol-stroke-color: blue;
- symbol-stroke-opacity: 0.9;
- symbol-stroke-width: 10;
-}
-node[test=pentagon2]::fill-above
-{
- symbol-shape: pentagon;
- symbol-size: 50;
- symbol-fill-color: white;
- symbol-fill-opacity: 0.3;
- z-index: 2;
-}
-node[test=pentagon3]
-{
- symbol-shape: pentagon;
- symbol-size: 50;
- symbol-fill-color: darkgreen;
-}
-node[test=pentagon3]::stroke-above
-{
- symbol-shape: pentagon;
- symbol-size: 50;
- symbol-stroke-color: yellow;
- symbol-stroke-width: 1.0;
- z-index: 1;
-}
-
-/**
- * Dashes Test
- * 1. Basic test - pattern should not be broken at way nodes
- * 2. Transparent and with background color. The foreground and background dashes must not overlap.
- * 3. Dashes offset - cuts off the first dash segment
- */
-way[test=dash1] {
- width: 10;
- color: blue;
- dashes: 30,4,17,14;
-}
-way[test=dash2] {
- width: 10;
- color: blue;
- opacity: 0.3;
- dashes: 30,4,17,14;
- dashes-background-color: gold;
- dashes-background-opacity: 0.3;
-}
-way[test=dash3] {
- width: 10;
- color: blue;
- dashes: 30,4,17,14;
- dashes-background-color: gold;
- dashes-offset:30;
-}
-
-/**
- * Casing test
- * Absolute and relative casing. Both should look the same.
- */
-way[test="casing1"] {
- width: 8;
- color: #0a0;
- casing-color: #bbb;
- casing-width: 12;
-}
-way[test="casing2"] {
- width: 8;
- color: #0a0;
- casing-color: #bbb;
- casing-width: +4;
-}
-
-/**
- * Text placement test
- */
-node[test=text-placement]::* {
- font-size: 10;
- text: auto;
- symbol-shape: square;
- symbol-size: 50;
- symbol-fill-opacity: 0.0;
-}
-node[test=text-placement]::above_center {
- text-anchor-vertical: above;
- text-anchor-horizontal: center;
- text-color: gold;
-}
-node[test=text-placement]::top_left {
- text-anchor-vertical: top;
- text-anchor-horizontal: left;
- text-color: yellow;
-}
-node[test=text-placement]::top_right {
- text-anchor-vertical: top;
- text-anchor-horizontal: right;
- text-color: green;
-}
-node[test=text-placement]::center_center {
- text-anchor-vertical: center;
- text-anchor-horizontal: center;
- text-color: white;
-}
-node[test=text-placement]::center_right {
- text-anchor-vertical: center;
- text-anchor-horizontal: right;
- text-color: magenta;
-}
-node[test=text-placement]::bottom_left {
- text-anchor-vertical: bottom;
- text-anchor-horizontal: left;
- text-color: blue;
-}
-node[test=text-placement]::bottom_right {
- text-anchor-vertical: bottom;
- text-anchor-horizontal: right;
- text-color: lime;
-}
-node[test=text-placement]::below_center {
- text-anchor-vertical: below;
- text-anchor-horizontal: center;
- text-color: red;
-}
-node[test=text-placement] {
- symbol-fill-color: blue;
- symbol-fill-opacity: 0.4;
-}
-way[test=text-along-path] {
- text: auto;
- text-position: line;
- width: 6;
- color: #00f;
-}
-way[test=text-along-path2] {
- text: auto;
- text-position: line;
- text-offset: 8;
- font-size: 12;
- width: 1;
- color: #f0f;
- dashes: 10;
-}
-
diff --git a/data_nodist/mapcss/basic.osm b/data_nodist/mapcss/basic.osm
deleted file mode 100644
index e7932fe..0000000
--- a/data_nodist/mapcss/basic.osm
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='never' generator='JOSM'>
- <node id='-200' action='modify' timestamp='2011-03-09T17:19:28Z' visible='true' lat='41.75673969416612' lon='-93.59863786848396' />
- <node id='-198' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.756221823885' lon='-93.60012838417869' />
- <node id='-196' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75650110784843' lon='-93.60038185479505' />
- <node id='-194' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.756367237331645' lon='-93.60203683128614' />
- <node id='-192' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75700941153873' lon='-93.59864520263791' />
- <node id='-190' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.756491543434045' lon='-93.60013571833265' />
- <node id='-188' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75677082622375' lon='-93.600389188949' />
- <node id='-186' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.756636956269524' lon='-93.60204416544008' />
- <node id='-184' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75734754669333' lon='-93.59860506846105' />
- <node id='-182' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75682968131706' lon='-93.60009558415578' />
- <node id='-180' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75710896263536' lon='-93.60034905477211' />
- <node id='-178' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75697509338646' lon='-93.60200403126323' />
- <node id='-176' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75379845463242' lon='-93.6099060462779'>
- <tag k='name' v='stroke and fill combined' />
- </node>
- <node id='-174' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.755315103205675' lon='-93.60998580418106'>
- <tag k='name' v='default values for symbol-shape' />
- </node>
- <node id='-172' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.7521708563324' lon='-93.61016273676123' />
- <node id='-170' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75222913646801' lon='-93.605792541412' />
- <node id='-168' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75372907940136' lon='-93.60582034800436' />
- <node id='-166' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75367080062762' lon='-93.61019054335362' />
- <node id='-164' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.754516818380715' lon='-93.61014818316117' />
- <node id='-162' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75452680825362' lon='-93.60855569333735' />
- <node id='-160' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75516675309058' lon='-93.60856755725737' />
- <node id='-158' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75515676331729' lon='-93.61016004708121' />
- <node id='-156' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.7576219697712' lon='-93.61021039502646'>
- <tag k='name' v='symbol-shape test' />
- </node>
- <node id='-154' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75601873272152' lon='-93.61036053636113' />
- <node id='-152' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.756077009363366' lon='-93.60471197171358' />
- <node id='-150' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.757576862377114' lon='-93.60473977830597' />
- <node id='-148' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75751858709716' lon='-93.61038834295353' />
- <node id='-146' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75295560550579' lon='-93.60675930399853'>
- <tag k='test' v='pentagon3' />
- </node>
- <node id='-144' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.753000540820594' lon='-93.60786289815331'>
- <tag k='test' v='pentagon2' />
- </node>
- <node id='-142' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.752962460047364' lon='-93.60917628749668'>
- <tag k='test' v='pentagon1' />
- </node>
- <node id='-140' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75486163967657' lon='-93.60957807590975'>
- <tag k='test' v='circle' />
- </node>
- <node id='-138' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.75639142040143' lon='-93.60911125340489'>
- <tag k='test:stroke' v='square' />
- </node>
- <node id='-136' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.756382415590416' lon='-93.60964855028186'>
- <tag k='test:stroke' v='circle' />
- </node>
- <node id='-134' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.7570116589474' lon='-93.60916394128061'>
- <tag k='test:fill' v='square' />
- </node>
- <node id='-132' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.757013557013295' lon='-93.60971846159339'>
- <tag k='test:fill' v='circle' />
- </node>
- <node id='-130' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.75644544924096' lon='-93.60588747214308'>
- <tag k='test:stroke' v='nonagon' />
- </node>
- <node id='-128' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.756400425211176' lon='-93.60857395652793'>
- <tag k='test:stroke' v='triangle' />
- </node>
- <node id='-126' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.756454454043116' lon='-93.60535017526608'>
- <tag k='test:stroke' v='decagon' />
- </node>
- <node id='-124' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.75640943001966' lon='-93.60803665965094'>
- <tag k='test:stroke' v='pentagon' />
- </node>
- <node id='-122' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.75642743963284' lon='-93.60696206589701'>
- <tag k='test:stroke' v='heptagon' />
- </node>
- <node id='-120' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.75641843482688' lon='-93.60749936277396'>
- <tag k='test:stroke' v='hexagon' />
- </node>
- <node id='-118' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.756436444437526' lon='-93.60642476902004'>
- <tag k='test:stroke' v='octagon' />
- </node>
- <node id='-116' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.75700976088145' lon='-93.60860942096781'>
- <tag k='test:fill' v='triangle' />
- </node>
- <node id='-114' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.75700786281543' lon='-93.60805490065505'>
- <tag k='test:fill' v='pentagon' />
- </node>
- <node id='-112' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.75700596474936' lon='-93.60750038034226'>
- <tag k='test:fill' v='hexagon' />
- </node>
- <node id='-110' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.757004066683244' lon='-93.60694586002947'>
- <tag k='test:fill' v='heptagon' />
- </node>
- <node id='-108' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.75700216861706' lon='-93.6063913397167'>
- <tag k='test:fill' v='octagon' />
- </node>
- <node id='-106' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.757000270550826' lon='-93.60583681940392'>
- <tag k='test:fill' v='nonagon' />
- </node>
- <node id='-104' action='modify' timestamp='2011-02-26T03:25:40Z' visible='true' lat='41.756998372484524' lon='-93.60528229909112'>
- <tag k='test:fill' v='decagon' />
- </node>
- <node id='-102' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75748513200883' lon='-93.60248049003869' />
- <node id='-100' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75754340731917' lon='-93.59807961382728' />
- <node id='-98' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.7560435535236' lon='-93.5980518072349' />
- <node id='-96' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75598527685133' lon='-93.60245268344629' />
- <node id='-94' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75761181723427' lon='-93.60228357493058'>
- <tag k='name' v='dashes test' />
- </node>
- <node id='-92' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75518927835799' lon='-93.60197443817707' />
- <node id='-90' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75506205347256' lon='-93.60130538391107' />
- <node id='-88' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75521863791116' lon='-93.60101677226692' />
- <node id='-86' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75484674924572' lon='-93.60080687288936' />
- <node id='-84' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75506205347256' lon='-93.6004657864008' />
- <node id='-82' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75502290730319' lon='-93.60017717475667' />
- <node id='-80' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75496960584064' lon='-93.6020061224881' />
- <node id='-78' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75484238051974' lon='-93.60133706822214' />
- <node id='-76' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.754998965494266' lon='-93.60104845657796' />
- <node id='-74' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75462707555605' lon='-93.60083855720039' />
- <node id='-72' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75484238051974' lon='-93.60049747071183' />
- <node id='-70' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.754803234216425' lon='-93.6002088590677' />
- <node id='-68' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75542998106946' lon='-93.60250846388558' />
- <node id='-66' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75547423237943' lon='-93.59950845497532' />
- <node id='-64' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75433532268658' lon='-93.59948734074023' />
- <node id='-62' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75429107059134' lon='-93.6024873496505' />
- <node id='-60' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.7555777375914' lon='-93.60234987832128'>
- <tag k='name' v='casing test' />
- </node>
- <node id='-58' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75314999444802' lon='-93.60127346600844'>
- <tag k='name' v='Hgmpf' />
- <tag k='test' v='text-placement' />
- </node>
- <node id='-56' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75362022684682' lon='-93.60024612291704' />
- <node id='-54' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.753761477985826' lon='-93.59862499519646' />
- <node id='-52' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.7533464737544' lon='-93.59830998536547' />
- <node id='-50' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75302146856717' lon='-93.59597086981198' />
- <node id='-48' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75292146664001' lon='-93.59577650204393' />
- <node id='-46' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.753557256638906' lon='-93.5973914351968' />
- <node id='-44' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.753426005173125' lon='-93.60024369841373' />
- <node id='-42' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75356725673958' lon='-93.59862257069315' />
- <node id='-40' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75315225125238' lon='-93.5983075608622' />
- <node id='-38' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75336303477468' lon='-93.5973890106935' />
- <node id='-36' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75282724508173' lon='-93.59596844530869' />
- <node id='-34' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75272724285197' lon='-93.59577407754065' />
- <node id='-32' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75388746192551' lon='-93.60259494407865' />
- <node id='-30' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75394574050254' lon='-93.5954736979983' />
- <node id='-28' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75244580263221' lon='-93.59544589140592' />
- <node id='-26' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.752387522693304' lon='-93.60256713748626' />
- <node id='-24' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75402785058148' lon='-93.60243212972769'>
- <tag k='name' v='text placement test - zoom in to see the text along the path' />
- </node>
- <node id='-22' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.752544834904576' lon='-93.5958836611246' />
- <node id='-20' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75264483741853' lon='-93.59607802889263' />
- <node id='-18' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.753180628634084' lon='-93.59749859427743' />
- <node id='-16' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75296984451274' lon='-93.59841714444613' />
- <node id='-14' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.753384851179334' lon='-93.59873215427709' />
- <node id='-12' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75324359921146' lon='-93.60035328199764' />
- <node id='-10' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.753559807316975' lon='-93.59775622667645' />
- <node id='-8' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true' lat='41.75335500492065' lon='-93.59780770062329' />
- <way id='-232' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true'>
- <nd ref='-194' />
- <nd ref='-196' />
- <nd ref='-198' />
- <nd ref='-200' />
- <tag k='test' v='dash3' />
- </way>
- <way id='-230' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true'>
- <nd ref='-186' />
- <nd ref='-188' />
- <nd ref='-190' />
- <nd ref='-192' />
- <tag k='test' v='dash2' />
- </way>
- <way id='-228' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true'>
- <nd ref='-178' />
- <nd ref='-180' />
- <nd ref='-182' />
- <nd ref='-184' />
- <tag k='test' v='dash1' />
- </way>
- <way id='-226' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true'>
- <nd ref='-166' />
- <nd ref='-168' />
- <nd ref='-170' />
- <nd ref='-172' />
- <nd ref='-166' />
- </way>
- <way id='-224' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true'>
- <nd ref='-158' />
- <nd ref='-160' />
- <nd ref='-162' />
- <nd ref='-164' />
- <nd ref='-158' />
- </way>
- <way id='-222' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true'>
- <nd ref='-148' />
- <nd ref='-150' />
- <nd ref='-152' />
- <nd ref='-154' />
- <nd ref='-148' />
- </way>
- <way id='-220' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true'>
- <nd ref='-136' />
- <nd ref='-138' />
- <nd ref='-128' />
- <nd ref='-124' />
- <nd ref='-120' />
- <nd ref='-122' />
- <nd ref='-118' />
- <nd ref='-130' />
- <nd ref='-126' />
- </way>
- <way id='-218' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true'>
- <nd ref='-132' />
- <nd ref='-134' />
- <nd ref='-116' />
- <nd ref='-114' />
- <nd ref='-112' />
- <nd ref='-110' />
- <nd ref='-108' />
- <nd ref='-106' />
- <nd ref='-104' />
- </way>
- <way id='-216' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true'>
- <nd ref='-102' />
- <nd ref='-100' />
- <nd ref='-98' />
- <nd ref='-96' />
- <nd ref='-102' />
- </way>
- <way id='-214' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true'>
- <nd ref='-92' />
- <nd ref='-90' />
- <nd ref='-88' />
- <nd ref='-86' />
- <nd ref='-84' />
- <nd ref='-82' />
- <tag k='test' v='casing1' />
- </way>
- <way id='-212' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true'>
- <nd ref='-80' />
- <nd ref='-78' />
- <nd ref='-76' />
- <nd ref='-74' />
- <nd ref='-72' />
- <nd ref='-70' />
- <tag k='test' v='casing2' />
- </way>
- <way id='-210' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true'>
- <nd ref='-68' />
- <nd ref='-66' />
- <nd ref='-64' />
- <nd ref='-62' />
- <nd ref='-68' />
- </way>
- <way id='-208' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true'>
- <nd ref='-56' />
- <nd ref='-54' />
- <nd ref='-52' />
- <nd ref='-10' />
- <nd ref='-46' />
- <nd ref='-50' />
- <nd ref='-48' />
- <tag k='name' v='Karl-Theodor-Maria-Nikolaus-Johann-Jacob-Philipp-Franz-Joseph-Sylvester-Freiherr-von-und-zu-Guttenberg-Straße' />
- <tag k='oneway' v='yes' />
- <tag k='test' v='text-along-path' />
- </way>
- <way id='-206' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true'>
- <nd ref='-34' />
- <nd ref='-36' />
- <nd ref='-38' />
- <nd ref='-8' />
- <nd ref='-40' />
- <nd ref='-42' />
- <nd ref='-44' />
- <tag k='name' v='Karl-Theodor-Maria-Nikolaus-Johann-Jacob-Philipp-Franz-Joseph-Sylvester-Freiherr-von-und-zu-Guttenberg-Straße' />
- <tag k='oneway' v='yes' />
- <tag k='test' v='text-along-path' />
- </way>
- <way id='-204' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true'>
- <nd ref='-32' />
- <nd ref='-30' />
- <nd ref='-28' />
- <nd ref='-26' />
- <nd ref='-32' />
- </way>
- <way id='-202' action='modify' timestamp='2011-03-09T22:22:56Z' visible='true'>
- <nd ref='-12' />
- <nd ref='-14' />
- <nd ref='-16' />
- <nd ref='-18' />
- <nd ref='-20' />
- <nd ref='-22' />
- <tag k='name' v='Karl-Theodor-Maria-Nikolaus-Johann-Jacob-Philipp-Franz-Joseph-Sylvester-Freiherr-von-und-zu-Guttenberg-Straße' />
- <tag k='test' v='text-along-path2' />
- </way>
-</osm>
diff --git a/data_nodist/mapcss/relation.mapcss b/data_nodist/mapcss/relation.mapcss
deleted file mode 100644
index ba45e55..0000000
--- a/data_nodist/mapcss/relation.mapcss
+++ /dev/null
@@ -1,12 +0,0 @@
-meta {
- title: "MapCSS tests for relations";
-}
-
-relation[test=role1] >[outer] way[test=role1_outer] { width: 4; color: navy; }
-
-relation[test=role1] >[role=inner][index=5] way { width: 4; color: lime; }
-
-area[landuse=quarry][test=parent] { fill-color : #aaa; }
-
-way[barrier=fence] < area[landuse=quarry][test=parent] { fill-color : #f70; }
-
diff --git a/data_nodist/mapcss/relation.osm b/data_nodist/mapcss/relation.osm
deleted file mode 100644
index 5c6c2b3..0000000
--- a/data_nodist/mapcss/relation.osm
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='never' generator='JOSM'>
- <node id='-473' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.7555767086837' lon='-93.6101935942561'>
- <tag k='name' v='parent selector test' />
- </node>
- <node id='-470' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.7576219697712' lon='-93.61021039502646'>
- <tag k='name' v='role test' />
- </node>
- <node id='-455' action='modify' visible='true' lat='41.75449259481888' lon='-93.60684960580662' />
- <node id='-454' action='modify' visible='true' lat='41.75444121700621' lon='-93.60735137701909' />
- <node id='-453' action='modify' visible='true' lat='41.75491829511318' lon='-93.60713492669213' />
- <node id='-452' action='modify' visible='true' lat='41.75430910244193' lon='-93.6062888026868' />
- <node id='-451' action='modify' visible='true' lat='41.75422836562984' lon='-93.6078433095803' />
- <node id='-450' action='modify' visible='true' lat='41.75530729463742' lon='-93.60710541073846' />
- <node id='-437' visible='true' lat='41.75449626466106' lon='-93.60896491581994' />
- <node id='-435' visible='true' lat='41.754444886851324' lon='-93.60946668703241' />
- <node id='-434' visible='true' lat='41.754921964931036' lon='-93.60925023670545' />
- <node id='-430' visible='true' lat='41.75431277229459' lon='-93.60840411270013' />
- <node id='-428' visible='true' lat='41.754232035487156' lon='-93.60995861959364' />
- <node id='-427' visible='true' lat='41.755310964433036' lon='-93.60922072075178' />
- <node id='-388' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75556159626758' lon='-93.60468857775984' />
- <node id='-384' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75400341768608' lon='-93.61030933581502' />
- <node id='-377' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75550331915773' lon='-93.61033714240742' />
- <node id='-372' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75406169615781' lon='-93.60466077116747' />
- <node id='-320' action='modify' visible='true' lat='41.75677444751439' lon='-93.60775757557353' />
- <node id='-315' action='modify' visible='true' lat='41.756833867460706' lon='-93.61006910764685' />
- <node id='-313' action='modify' visible='true' lat='41.75637001463961' lon='-93.60956536870414' />
- <node id='-294' visible='true' lat='41.75710047122399' lon='-93.60873191196228' />
- <node id='-291' visible='true' lat='41.75677019798795' lon='-93.60818094749371' />
- <node id='-289' visible='true' lat='41.75686561043072' lon='-93.60860400949636' />
- <node id='-287' visible='true' lat='41.75671148256805' lon='-93.60939110159434' />
- <node id='-285' visible='true' lat='41.756953683328916' lon='-93.6096075519213' />
- <node id='-284' visible='true' lat='41.75704175610625' lon='-93.60927303777963' />
- <node id='-280' visible='true' lat='41.75730597371307' lon='-93.60890900768433' />
- <node id='-278' visible='true' lat='41.757232580042505' lon='-93.60840723647188' />
- <node id='-276' visible='true' lat='41.75704175610625' lon='-93.60797433581799' />
- <node id='-274' visible='true' lat='41.756916986302684' lon='-93.60787594930574' />
- <node id='-272' visible='true' lat='41.75660873045396' lon='-93.60777756279349' />
- <node id='-270' visible='true' lat='41.756344509976664' lon='-93.60827933400596' />
- <node id='-268' visible='true' lat='41.7563591889206' lon='-93.60905658745268' />
- <node id='-266' visible='true' lat='41.75651331762931' lon='-93.60989287280681' />
- <node id='-264' visible='true' lat='41.7570931318372' lon='-93.60997158201661' />
- <node id='-263' visible='true' lat='41.75732065243712' lon='-93.60947964945538' />
- <node id='-260' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75601873272152' lon='-93.61036053636113' />
- <node id='-259' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.756077009363366' lon='-93.60471197171358' />
- <node id='-258' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.757576862377114' lon='-93.60473977830597' />
- <node id='-257' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75751858709716' lon='-93.61038834295353' />
- <way id='-449' action='modify' visible='true'>
- <nd ref='-453' />
- <nd ref='-454' />
- <nd ref='-455' />
- <nd ref='-453' />
- </way>
- <way id='-448' action='modify' visible='true'>
- <nd ref='-450' />
- <nd ref='-451' />
- <nd ref='-452' />
- <nd ref='-450' />
- <tag k='barrier' v='fence' />
- </way>
- <way id='-436' action='modify' visible='true'>
- <nd ref='-434' />
- <nd ref='-435' />
- <nd ref='-437' />
- <nd ref='-434' />
- </way>
- <way id='-429' action='modify' visible='true'>
- <nd ref='-427' />
- <nd ref='-428' />
- <nd ref='-430' />
- <nd ref='-427' />
- </way>
- <way id='-397' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true'>
- <nd ref='-377' />
- <nd ref='-388' />
- <nd ref='-372' />
- <nd ref='-384' />
- <nd ref='-377' />
- </way>
- <way id='-322' visible='true'>
- <nd ref='-320' />
- <nd ref='-274' />
- <nd ref='-276' />
- <nd ref='-278' />
- <nd ref='-280' />
- </way>
- <way id='-317' visible='true'>
- <nd ref='-315' />
- <nd ref='-266' />
- <nd ref='-313' />
- <nd ref='-268' />
- <tag k='test' v='role1_outer' />
- </way>
- <way id='-309' action='modify' visible='true'>
- <nd ref='-268' />
- <nd ref='-270' />
- <nd ref='-272' />
- <nd ref='-320' />
- </way>
- <way id='-295' action='modify' visible='true'>
- <nd ref='-291' />
- <nd ref='-294' />
- <nd ref='-284' />
- </way>
- <way id='-286' action='modify' visible='true'>
- <nd ref='-284' />
- <nd ref='-285' />
- <nd ref='-287' />
- <nd ref='-289' />
- <nd ref='-291' />
- </way>
- <way id='-265' action='modify' visible='true'>
- <nd ref='-280' />
- <nd ref='-263' />
- <nd ref='-264' />
- <nd ref='-315' />
- <tag k='test' v='role1_outer' />
- </way>
- <way id='-256' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true'>
- <nd ref='-257' />
- <nd ref='-258' />
- <nd ref='-259' />
- <nd ref='-260' />
- <nd ref='-257' />
- </way>
- <relation id='-457' action='modify' visible='true'>
- <member type='way' ref='-448' role='outer' />
- <member type='way' ref='-449' role='inner' />
- <tag k='landuse' v='quarry' />
- <tag k='test' v='parent' />
- <tag k='type' v='multipolygon' />
- </relation>
- <relation id='-456' action='modify' visible='true'>
- <member type='way' ref='-429' role='outer' />
- <member type='way' ref='-436' role='inner' />
- <tag k='landuse' v='quarry' />
- <tag k='test' v='parent' />
- <tag k='type' v='multipolygon' />
- </relation>
- <relation id='-297' action='modify' visible='true'>
- <member type='way' ref='-317' role='outer' />
- <member type='way' ref='-265' role='' />
- <member type='way' ref='-322' role='' />
- <member type='way' ref='-309' role='outer' />
- <member type='way' ref='-295' role='inner' />
- <member type='way' ref='-286' role='inner' />
- <tag k='landuse' v='meadow' />
- <tag k='test' v='role1' />
- <tag k='type' v='multipolygon' />
- </relation>
-</osm>
diff --git a/i18n/po/af.po b/i18n/po/af.po
index 0569e18..79fb877 100644
--- a/i18n/po/af.po
+++ b/i18n/po/af.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2011-10-13 02:39+0000\n"
"Last-Translator: Grant Slater <Unknown>\n"
"Language-Team: Afrikaans <af at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:31+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:33+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: af\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/am.po b/i18n/po/am.po
index d2299f2..1c613f5 100644
--- a/i18n/po/am.po
+++ b/i18n/po/am.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2010-03-30 12:09+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Amharic <am at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:31+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:34+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: am\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/ar.po b/i18n/po/ar.po
index 4e45606..18029eb 100644
--- a/i18n/po/ar.po
+++ b/i18n/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2017-06-05 02:55+0000\n"
"Last-Translator: Chdoula <chdoula at gmail.com>\n"
"Language-Team: Arabic <ar at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:32+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:34+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: ar\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2930,24 +2930,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3014,18 +2996,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "نوع الطلاء {0}:{1}"
-
msgid "Layer: {0}"
msgstr "الطبقة: {0}"
-msgid "Failed to persist preferences to ''{0}''"
-msgstr ""
+msgid "Paint style {0}: {1}"
+msgstr "نوع الطلاء {0}:{1}"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3555,6 +3532,24 @@ msgstr "النص"
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4223,6 +4218,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4909,6 +4907,25 @@ msgstr "تحميل تفضيلات الصور"
msgid "usage"
msgstr "الإستعمال"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "الخيارات"
@@ -5036,6 +5053,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr "جاري إنشاء واجهة المستخدم الرسومية الرئيسية"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5333,6 +5355,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8078,6 +8103,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10573,6 +10601,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10591,6 +10769,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14016,6 +14199,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15390,6 +15582,12 @@ msgstr "الدراجة النارية"
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -16033,6 +16231,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16081,6 +16283,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -17007,12 +17245,6 @@ msgstr "حواجز"
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -17025,9 +17257,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr "حاجز دراجة"
@@ -17799,6 +18028,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18508,9 +18743,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "حديقة حيوانات"
@@ -20706,24 +20938,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20749,9 +20963,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20769,6 +20980,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20870,9 +21100,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21035,18 +21262,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21159,6 +21389,52 @@ msgstr "ساحة معركة"
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "نصب تذكاري"
@@ -21936,6 +22212,9 @@ msgstr ""
msgid "Suburb"
msgstr "ضاحية"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22284,6 +22563,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22889,9 +23171,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23135,6 +23427,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23147,7 +23442,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23224,6 +23519,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23550,6 +23852,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23565,6 +23870,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23869,6 +24177,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24792,6 +25103,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24839,10 +25153,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24851,6 +25165,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24912,6 +25234,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25851,6 +26176,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25917,14 +26250,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25975,10 +26300,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28738,6 +29063,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30540,9 +30868,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31976,6 +32301,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33211,6 +33539,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/ast.po b/i18n/po/ast.po
index 52d761a..55a2dec 100644
--- a/i18n/po/ast.po
+++ b/i18n/po/ast.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2017-07-04 07:51+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Asturian <ast at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:33+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:35+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: ast\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3162,25 +3162,6 @@ msgstr "Valor de llatitú illegal \"{0}\""
msgid "Illegal longitude value ''{0}''"
msgstr "Valor de llonxitú illegal \"{0}\""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Erru al crear el directoriu de caxé faltante: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-"<html>Producióse un fallu al crear el directoriu pal caxé: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Nun pudo desaniciase''l ficheru temporal {0}"
@@ -3266,22 +3247,15 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "Estilu de representación {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Capa: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Estilu de representación {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Nun se pudieron caltener les preferencies pa ''{0}''"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Intenta activar la rede IPv6, prefiriendo IPv6 antes que IPv4 (solo funciona "
-"al principiu del aniciu)"
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr "La opción de configuración {0} foi desaniciada porque yá nun s`usa."
@@ -3847,6 +3821,25 @@ msgstr "testu"
msgid "areatext"
msgstr "área de testu"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Erru al crear el directoriu de caxé faltante: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+"<html>Producióse un fallu al crear el directoriu pal caxé: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4548,6 +4541,9 @@ msgstr "Estilu d''área en vía esterna"
msgid "Multipolygon is not closed"
msgstr "El multipolígonu non tá peslláu"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr "Aniellos de multipolígonu que comparten nodiu(os)"
@@ -5267,6 +5263,25 @@ msgstr "Cargando les preferencies d''imaxes"
msgid "usage"
msgstr "usu"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "Opciones"
@@ -5405,6 +5420,13 @@ msgstr "Axuste de predefiníos"
msgid "Creating main GUI"
msgstr "Creando la interfaz gráfica principal"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Intenta activar la rede IPv6, prefiriendo IPv6 antes que IPv4 (solo funciona "
+"al principiu del aniciu)"
+
msgid "Updating plugins"
msgstr "Actualizando componentes"
@@ -5728,6 +5750,9 @@ msgstr "Agrandar"
msgid "Shrink"
msgstr "Encoyer"
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8701,6 +8726,9 @@ msgstr ""
"<html>La capa \"{0}\" yá contien un conflictu pal oxetu<br>\"{1}\".<br>Por "
"favor resuelva esti conflictu primeru ya intente de nuevu.</html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr "Escoyer los oxetos pa los miembros de la relación indicaos"
@@ -11461,6 +11489,156 @@ msgstr "(La URL yera: "
msgid "Select the map painting styles"
msgstr "Seleciones Estilu de Mapa de imagenes"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11484,6 +11662,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Erru al analizar los estilos Mappaint dende ''{0}''. L´erru foi: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Non pudo alcontrase la imaxe ''{0}''"
@@ -15324,6 +15507,15 @@ msgstr "Saltar capa y siguir"
msgid "expected .jos file inside .joz archive"
msgstr "esperábase un arquivu .jos dientro del arquivu .joz"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Saltar descarga"
@@ -16904,6 +17096,12 @@ msgstr "Motocicleta"
msgid "Motorcar"
msgstr "Automóvil"
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Referencia"
@@ -17547,6 +17745,10 @@ msgid "platform"
msgstr "plataforma"
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr "gabinete"
@@ -17595,6 +17797,42 @@ msgstr "vapor"
msgid "vacuum"
msgstr "vacío"
+msgid "Material"
+msgstr "Material"
+
+msgid "plastic"
+msgstr "plásticu"
+
+msgid "steel"
+msgstr "aceru"
+
+msgid "stone"
+msgstr "piedra"
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Potencia nominal (kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Fases"
+
msgid "Max. weight (tonnes)"
msgstr "Pesu máximu (t)"
@@ -18537,12 +18775,6 @@ msgstr "Barreres"
msgid "Block"
msgstr "Bloques"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "piedra"
-
msgid "Bollard"
msgstr "Bolardu"
@@ -18555,9 +18787,6 @@ msgstr "n''ascensu"
msgid "removable"
msgstr "removible"
-msgid "plastic"
-msgstr "plásticu"
-
msgid "Cycle Barrier"
msgstr "Barrera pa bicicletes"
@@ -19335,6 +19564,12 @@ msgstr "entemez 1/25 (ciclomotor)"
msgid "1/50 mix (mofa/moped)"
msgstr "entemez 1/50 (ciclomotor)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -20046,9 +20281,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "Zoo"
@@ -22246,24 +22478,6 @@ msgctxt "power"
msgid "industrial"
msgstr "industrial"
-msgid "Power rating (kVA/MVA)"
-msgstr "Potencia nominal (kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "aisllada en gas"
@@ -22289,9 +22503,6 @@ msgctxt "power"
msgid "yes"
msgstr "sí"
-msgid "Phases"
-msgstr "Fases"
-
msgid "Power Switchgear"
msgstr "Celda de media tensión"
@@ -22311,6 +22522,25 @@ msgstr "Toma d''enerxía"
msgid "Power Switch"
msgstr "Interruptor de Corriente"
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr "Conversor d''enerxía"
@@ -22412,9 +22642,6 @@ msgstr "tubular"
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr "aceru"
-
msgctxt "color"
msgid "red/white"
msgstr "colloráu/blancu"
@@ -22577,18 +22804,21 @@ msgstr "Torre triple"
msgid "Incomplete tower"
msgstr "Torre incompleta"
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr "Poste"
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -22701,6 +22931,52 @@ msgstr "Campu de batalla"
msgid "Palaeontological Site"
msgstr "Sitiu paleontolóxicu"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monumentu"
@@ -23481,6 +23757,9 @@ msgstr ""
"Poblamientu compactu (grandes barrios, suburbios, polígonos de viviendes, "
"distritos, etc.)"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
"Vecinderu (área d''un llugar habitáu, urbanización, colonia, barriu, etc.)"
@@ -23845,6 +24124,9 @@ msgstr "Invernaderu hortofrutícola"
msgid "Plant Nursery"
msgstr "Viveru de plantes"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -24455,9 +24737,19 @@ msgstr "Rutes"
msgid "Bicycle Route"
msgstr "Ruta de ciclismu"
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -24701,6 +24993,9 @@ msgstr "OpenStreetMap GPS Traces"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr "Tresporte Públicu (ÖPNV)"
@@ -24713,7 +25008,7 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -24790,6 +25085,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -25116,6 +25418,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -25131,6 +25436,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -25435,6 +25743,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Catastru"
@@ -26361,6 +26672,9 @@ msgstr "Fiez Orthophoto 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -26408,10 +26722,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr "USGS Large Scale Imagery"
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -26420,6 +26734,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
@@ -26481,6 +26803,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -27424,6 +27749,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -27490,14 +27823,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -27548,11 +27873,11 @@ msgstr ""
msgid "numerical key"
msgstr "clave numbérica"
-msgid "layer tag with + sign"
-msgstr "etiqueta layer col signu +"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "la capa tien de tar ente -5 y 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr ""
@@ -30602,6 +30927,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -32529,9 +32857,6 @@ msgstr "Esaniciar esto"
msgid "Delete this&older"
msgstr "Esaniciar esti más&antiguu"
-msgid "km/h"
-msgstr "km/h"
-
msgid "Track name: "
msgstr "Nome de pista: "
@@ -34074,6 +34399,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr "km/h"
+
msgid "direction"
msgstr ""
@@ -35344,6 +35672,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/az.po b/i18n/po/az.po
index 71235eb..7185644 100644
--- a/i18n/po/az.po
+++ b/i18n/po/az.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2016-12-17 13:38+0000\n"
"Last-Translator: iAZISS <iss-sash at mail.ru>\n"
"Language-Team: Azerbaijani <az at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:33+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:36+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -2910,24 +2910,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2994,18 +2976,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3519,6 +3496,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4187,6 +4182,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4874,6 +4872,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5001,6 +5018,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5298,6 +5320,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8039,6 +8064,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10527,6 +10555,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10545,6 +10723,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13964,6 +14147,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15338,6 +15530,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15981,6 +16179,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16029,6 +16231,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16955,12 +17193,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16973,9 +17205,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17747,6 +17976,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18456,9 +18691,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20654,24 +20886,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20697,9 +20911,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20717,6 +20928,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20818,9 +21048,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20983,18 +21210,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21107,6 +21337,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21884,6 +22160,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22232,6 +22511,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22837,9 +23119,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23083,6 +23375,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23095,7 +23390,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23172,6 +23467,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23498,6 +23800,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23513,6 +23818,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23817,6 +24125,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24740,6 +25051,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24787,10 +25101,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24799,6 +25113,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24860,6 +25182,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25799,6 +26124,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25865,14 +26198,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25923,10 +26248,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28686,6 +29011,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30488,9 +30816,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31924,6 +32249,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33159,6 +33487,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/be.po b/i18n/po/be.po
index 5d26085..61b988c 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: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2017-02-19 15:59+0000\n"
"Last-Translator: Darafei Praliaskouski <komzpa 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: 2017-09-30 04:34+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:37+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: be\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3221,24 +3221,6 @@ msgstr "Няправільнае значэнне шыраты ''{0}''"
msgid "Illegal longitude value ''{0}''"
msgstr "Няправільнае значэнне даўгаты ''{0}''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Не атрымалася стварыць адсутны каталог кэша: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Немагчыма стварыць каталог для часовых дадзеных: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Не атрымалася выдаліць часовы файл {0}"
@@ -3319,22 +3301,15 @@ msgstr "Не атрымалася загрузіць файл кэша нала
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr "Не атрымалася выдаліць пашкоджаны файл кэша налад па змаўчанні: {0}"
-msgid "Paint style {0}: {1}"
-msgstr "Стыль малявання {0}:{1}"
-
msgid "Layer: {0}"
msgstr "Пласт: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Стыль малявання {0}:{1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Не атрымалася захаваць налады ў ''{0}''"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Спрабаваць выкарыстоўваць сетку IPv6, аддаючы перавагу IPv6 замест IPv4 "
-"(працуе толькі напачатку запуску)."
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr "Налада {0} была выдалена, бо яна больш не выкарыстоўваецца."
@@ -3889,6 +3864,24 @@ msgstr "тэкст"
msgid "areatext"
msgstr "для_тэксту"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Не атрымалася стварыць адсутны каталог кэша: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Немагчыма стварыць каталог для часовых дадзеных: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Чакаўся элемент ''{0}'', а атрыманы ''{1}''"
@@ -4586,6 +4579,9 @@ msgstr "Стыль вобласці на вонкавай лініі"
msgid "Multipolygon is not closed"
msgstr "Мультыпалігон не замкнёны"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr "Контуры мультыпалігона маюць агульныя пункты"
@@ -5296,6 +5292,25 @@ msgstr "Пампоўка ўсталёвак падкладак"
msgid "usage"
msgstr "выкарыстанне"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "опцыі"
@@ -5437,6 +5452,13 @@ msgstr "Налады па змаўчанні"
msgid "Creating main GUI"
msgstr "Стварэнне графічнага інтэрфейсу"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Спрабаваць выкарыстоўваць сетку IPv6, аддаючы перавагу IPv6 замест IPv4 "
+"(працуе толькі напачатку запуску)."
+
msgid "Updating plugins"
msgstr "Абнаўленне модуляў"
@@ -5760,6 +5782,9 @@ msgstr "Пашырыць"
msgid "Shrink"
msgstr "Сціснуць"
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8780,6 +8805,9 @@ msgstr ""
"<html>У пласце ''{0}'' ужо ёсць канфлікт для аб’екта <br>''{1}''.<br>Калі "
"ласка, спачатку ўладзьце гэты канфлікт, затым паспрабуйце зноў.</html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr "Вылучыць аб’екты для выбраных удзельнікаў дачынення"
@@ -11578,6 +11606,156 @@ msgstr "(па спасылцы: "
msgid "Select the map painting styles"
msgstr "Абярыце стылі адмалёўкі карты"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11604,6 +11782,11 @@ msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
"Не атрымалася выканаць разбор стыляў Mappaint з ''{0}''. Памылка: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Збой пошуку выявы ''{0}''"
@@ -15428,6 +15611,15 @@ msgstr "Прапусціць пласт і працягнуць"
msgid "expected .jos file inside .joz archive"
msgstr "чакаўся .jos файл у .joz архіве"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Прапусціць спампоўку"
@@ -17046,6 +17238,12 @@ msgstr "Матацыкл"
msgid "Motorcar"
msgstr "Аўтамабіль"
+msgid "Minimum age"
+msgstr "Мінімальны ўзрост"
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Пазначэнне (ref)"
@@ -17693,6 +17891,10 @@ msgid "platform"
msgstr "платформа"
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr "будка"
@@ -17741,6 +17943,42 @@ msgstr "пара"
msgid "vacuum"
msgstr "вакуум"
+msgid "Material"
+msgstr "Матэрыял"
+
+msgid "plastic"
+msgstr "пластык"
+
+msgid "steel"
+msgstr "сталь"
+
+msgid "stone"
+msgstr "камень"
+
+msgid "Location transition"
+msgstr "Змена размяшчэння"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Намінальная магутнасць (ква/МВА)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Колькасць фаз"
+
msgid "Max. weight (tonnes)"
msgstr "Макс. маса (у тонах)"
@@ -18689,12 +18927,6 @@ msgstr "Перашкоды"
msgid "Block"
msgstr "Бетонны блок"
-msgid "Material"
-msgstr "Матэрыял"
-
-msgid "stone"
-msgstr "камень"
-
msgid "Bollard"
msgstr "Слупок"
@@ -18707,9 +18939,6 @@ msgstr "узнімальны"
msgid "removable"
msgstr "выдаляемы"
-msgid "plastic"
-msgstr "пластык"
-
msgid "Cycle Barrier"
msgstr "Перашкода для ровараў"
@@ -19484,6 +19713,12 @@ msgstr "паліўная сумесь 1/25 (для мапедаў)"
msgid "1/50 mix (mofa/moped)"
msgstr "паліўная сумесь 1/50 (для мапедаў)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr "Паліўныя карты:"
@@ -20194,9 +20429,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Колькасць экранаў"
-msgid "Minimum age"
-msgstr "Мінімальны ўзрост"
-
msgid "Zoo"
msgstr "Заапарк"
@@ -22392,24 +22624,6 @@ msgctxt "power"
msgid "industrial"
msgstr "прамысловая"
-msgid "Power rating (kVA/MVA)"
-msgstr "Намінальная магутнасць (ква/МВА)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "Элегазавы"
@@ -22435,9 +22649,6 @@ msgctxt "power"
msgid "yes"
msgstr "так"
-msgid "Phases"
-msgstr "Колькасць фаз"
-
msgid "Power Switchgear"
msgstr "Размеркавальная прылада"
@@ -22457,6 +22668,25 @@ msgstr "Ячэйка"
msgid "Power Switch"
msgstr "Раз’яднальнік"
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr "Пераўтваральнік"
@@ -22558,9 +22788,6 @@ msgstr "трубчастая"
msgid "solid"
msgstr "суцэльная"
-msgid "steel"
-msgstr "сталь"
-
msgctxt "color"
msgid "red/white"
msgstr "чырвона-белая"
@@ -22723,18 +22950,21 @@ msgstr "Патройная апора"
msgid "Incomplete tower"
msgstr "Няпоўная апора"
-msgid "Location transition"
-msgstr "Змена размяшчэння"
-
msgid "Pole"
msgstr "Слуп"
-msgid "Pole with Transformer"
-msgstr "Слуп з трансфарматарам"
+msgid "Pole with Switch"
+msgstr ""
msgid "Pole Attributes:"
msgstr "Уласцівасці слупа:"
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr "Слуп з трансфарматарам"
+
msgid "Transformer Attributes:"
msgstr "Уласцівасці трансфарматара:"
@@ -22847,6 +23077,52 @@ msgstr "Поле бітвы"
msgid "Palaeontological Site"
msgstr "Палеанталагічныя раскопкі"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Манумент"
@@ -23624,6 +23900,9 @@ msgstr "Ізаляванае жыллё"
msgid "Suburb"
msgstr "Прыгарад"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "Мікрараён"
@@ -23987,6 +24266,9 @@ msgstr "Парніковае садоўніцтва"
msgid "Plant Nursery"
msgstr "Гадавальнік раслін"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr "Аквакультура"
@@ -24596,11 +24878,21 @@ msgstr "Маршруты"
msgid "Bicycle Route"
msgstr "Веласіпедны маршрут"
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
-msgstr "нацыянальная"
+msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
-msgstr "лакальная"
+msgstr ""
msgid "Mountain Biking Route"
msgstr "Маршрут горных ровараў"
@@ -24842,6 +25134,9 @@ msgstr "GPS-трэкі OpenStreetMap"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr "Грамадскі транспарт (ÖPNV)"
@@ -24854,8 +25149,8 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr "Рэльеф ад Stamen"
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
-msgstr "Камбоджа, Лаос, Тайланд, В''етнам, М''янма (двухмоўная)"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (аверлэй)"
@@ -24931,6 +25226,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr "Здымкі з imagico.de: «Паўднёвыя» Трансантарктычныя горы"
@@ -25258,6 +25560,9 @@ msgstr "URBIS 2015 - аэрафотаздымка"
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW (allonie) лічбавыя выявы PICC"
@@ -25273,6 +25578,9 @@ msgstr "SPW(allonie) 2012-2013 аэрафотаздымка"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 аэрафотаздымка"
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -25578,6 +25886,9 @@ msgstr "BDOrtho IGN"
msgid "Bordeaux - 2012"
msgstr "Бардо - 2012"
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Кадастр"
@@ -26510,6 +26821,9 @@ msgstr "Фіез - артафота 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr "Кантон Базель-Штадт 2015"
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr "Кантон Базель - ландшафт 10см (2015)"
@@ -26557,11 +26871,11 @@ msgstr "USGS Тапаграфічныя карты"
msgid "USGS Large Scale Imagery"
msgstr "USGS: буйнамаштабныя здымкі"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012 пласт дарог"
+msgid "TIGER Roads 2012"
+msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "Новыя ды неправераныя дарогі TIGER (2015)"
+msgid "TIGER Roads 2014"
+msgstr ""
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -26569,6 +26883,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
@@ -26630,6 +26952,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr "Метрапалітэнскі арэал Сан-Хуан: орта-здымка 2013 USACE"
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr "Акруга Сан-Хуан (Вашынгтон) - аэрафотаздымка 2013"
@@ -27596,6 +27921,14 @@ msgstr "{0} на лініі. Варта выкарыстоўваць на кро
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} на лініі. Павінен выкарыстоўвацца ў дачыненні"
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr "{0} сумесна з {1} на пункце. Выдаліце {0}."
@@ -27668,14 +28001,6 @@ msgstr ""
"{0} – тэг для лінейных водных аб''ектаў. Для пазначэння вулічных вадаёмаў "
"скарыстайце {1} + {2}."
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -27730,11 +28055,11 @@ msgstr "пустое значэнне ў радку з падзельнікам
msgid "numerical key"
msgstr "лікавы ключ"
-msgid "layer tag with + sign"
-msgstr "тэг layer са знакам +"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "узровень павінен быць ад -5 да 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr "значэнні {0} павінны быць толькі лікамі з неабавязковым крокам 0.5"
@@ -30826,6 +31151,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -32749,9 +33077,6 @@ msgstr "Выдаліць яго"
msgid "Delete this&older"
msgstr "Выдаліць яго і старэй"
-msgid "km/h"
-msgstr "км/г"
-
msgid "Track name: "
msgstr "Імя трэка: "
@@ -34282,6 +34607,9 @@ msgstr "дадатны лік ці пустое"
msgid "Speed:"
msgstr "Хуткасць:"
+msgid "km/h"
+msgstr "км/г"
+
msgid "direction"
msgstr "напрамак"
@@ -35559,6 +35887,12 @@ msgstr "Вылучыце толькі адзін аб’ект"
msgid "Select a map object"
msgstr "Вылучыце аб’ект карты"
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr "Панэль дзеянняў з формамі"
diff --git a/i18n/po/bg.po b/i18n/po/bg.po
index d33c4ea..b7b82ca 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: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2017-07-15 21:07+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: 2017-09-30 04:36+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:38+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: bg\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3032,24 +3032,6 @@ msgstr "Невалидна стойност на географска ширин
msgid "Illegal longitude value ''{0}''"
msgstr "Невалидна стойност на географска дължина ''{0}''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3120,18 +3102,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "Стил на изобразяване {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Слой: {0}"
-msgid "Failed to persist preferences to ''{0}''"
-msgstr ""
+msgid "Paint style {0}: {1}"
+msgstr "Стил на изобразяване {0}: {1}"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3653,6 +3630,24 @@ msgstr "текст"
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4326,6 +4321,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "Мултиполигонът не е затворен."
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -5026,6 +5024,25 @@ msgstr "Зареждане на предпочитанията за сатели
msgid "usage"
msgstr "използване"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "опции"
@@ -5153,6 +5170,11 @@ msgstr "Настройки по подразбиране"
msgid "Creating main GUI"
msgstr "Създаване на интерфейса"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr "Обновяване на добавките"
@@ -5450,6 +5472,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8197,6 +8222,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10754,6 +10782,156 @@ msgstr "(URL беше: "
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10772,6 +10950,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14231,6 +14414,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Пропускане на свалянето"
@@ -15618,6 +15810,12 @@ msgstr "Мотоциклет"
msgid "Motorcar"
msgstr "Автомобил"
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Означение"
@@ -16261,6 +16459,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16309,6 +16511,42 @@ msgstr "парна"
msgid "vacuum"
msgstr "вакуумна"
+msgid "Material"
+msgstr "Материал"
+
+msgid "plastic"
+msgstr "пластмаса"
+
+msgid "steel"
+msgstr "стоманен"
+
+msgid "stone"
+msgstr "камък"
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Мощност (kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Фази"
+
msgid "Max. weight (tonnes)"
msgstr "Макс. маса (т)"
@@ -17235,12 +17473,6 @@ msgstr "Прегради"
msgid "Block"
msgstr "Бетонен блок"
-msgid "Material"
-msgstr "Материал"
-
-msgid "stone"
-msgstr "камък"
-
msgid "Bollard"
msgstr "колчета"
@@ -17253,9 +17485,6 @@ msgstr "излизащ"
msgid "removable"
msgstr "премахвани"
-msgid "plastic"
-msgstr "пластмаса"
-
msgid "Cycle Barrier"
msgstr "Вело бариера"
@@ -18027,6 +18256,12 @@ msgstr "1/25 mix (mofa/moped)"
msgid "1/50 mix (mofa/moped)"
msgstr "1/50 mix (mofa/moped)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18736,9 +18971,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "Зоопарк"
@@ -20934,24 +21166,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr "Мощност (kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr ""
@@ -20977,9 +21191,6 @@ msgctxt "power"
msgid "yes"
msgstr "да"
-msgid "Phases"
-msgstr "Фази"
-
msgid "Power Switchgear"
msgstr ""
@@ -20997,6 +21208,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -21098,9 +21328,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr "стоманен"
-
msgctxt "color"
msgid "red/white"
msgstr "червен/бял"
@@ -21263,18 +21490,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr "Стълб"
-msgid "Pole with Transformer"
-msgstr "Стълб с трансформатор"
+msgid "Pole with Switch"
+msgstr ""
msgid "Pole Attributes:"
msgstr "Описание на стълб:"
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr "Стълб с трансформатор"
+
msgid "Transformer Attributes:"
msgstr "Описание на трансформатор:"
@@ -21387,6 +21617,52 @@ msgstr "Поле на битка"
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Забележителност"
@@ -22164,6 +22440,9 @@ msgstr ""
msgid "Suburb"
msgstr "Квартал/предградие"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22514,6 +22793,9 @@ msgstr "Оранжерии"
msgid "Plant Nursery"
msgstr "Посадъчен материал"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -23119,9 +23401,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23365,6 +23657,9 @@ msgstr "OpenStreetMap GPS Traces"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr "Public Transport (ÖPNV)"
@@ -23377,7 +23672,7 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23454,6 +23749,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23780,6 +24082,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23795,6 +24100,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -24099,6 +24407,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Кадастър"
@@ -25024,6 +25335,9 @@ msgstr "Fiez Orthophoto 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -25071,10 +25385,10 @@ msgstr "USGS Topographic Maps"
msgid "USGS Large Scale Imagery"
msgstr "USGS Large Scale Imagery"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
+msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -25083,6 +25397,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
@@ -25144,6 +25466,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -26083,6 +26408,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -26149,14 +26482,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -26207,10 +26532,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28991,6 +29316,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30813,9 +31141,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -32271,6 +32596,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33506,6 +33834,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/bn.po b/i18n/po/bn.po
index f874766..72de073 100644
--- a/i18n/po/bn.po
+++ b/i18n/po/bn.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2015-04-03 09:24+0000\n"
"Last-Translator: Md Alamgir <alamgircu at hotmail.com>\n"
"Language-Team: Bengali <bn at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:35+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:37+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: bn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2914,24 +2914,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2998,18 +2980,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3523,6 +3500,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4191,6 +4186,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4878,6 +4876,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5005,6 +5022,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr "প্রধান জিইউআই তৈরি করছে"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5302,6 +5324,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8043,6 +8068,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10531,6 +10559,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10549,6 +10727,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13968,6 +14151,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15342,6 +15534,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15985,6 +16183,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16033,6 +16235,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16959,12 +17197,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16977,9 +17209,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17751,6 +17980,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18460,9 +18695,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20658,24 +20890,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20701,9 +20915,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20721,6 +20932,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20822,9 +21052,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20987,18 +21214,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21111,6 +21341,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21888,6 +22164,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22236,6 +22515,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22841,9 +23123,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23087,6 +23379,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23099,7 +23394,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23176,6 +23471,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23502,6 +23804,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23517,6 +23822,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23821,6 +24129,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24744,6 +25055,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24791,10 +25105,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24803,6 +25117,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24864,6 +25186,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25803,6 +26128,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25869,14 +26202,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25927,10 +26252,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28690,6 +29015,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30492,9 +30820,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31928,6 +32253,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33163,6 +33491,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/br.po b/i18n/po/br.po
index 2600be8..bf3d380 100644
--- a/i18n/po/br.po
+++ b/i18n/po/br.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2011-10-17 12:11+0000\n"
"Last-Translator: Fulup <Unknown>\n"
"Language-Team: Breton <br at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:35+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:38+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: br\n"
msgid "License"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr "O krouiñ GUI pennañ"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/bs.po b/i18n/po/bs.po
index 56a989b..34f66da 100644
--- a/i18n/po/bs.po
+++ b/i18n/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2012-11-03 23:07+0000\n"
"Last-Translator: Alen Mahovic <eyeofthestorm at windowslive.com>\n"
"Language-Team: Bosnian <bs at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:35+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:38+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: bs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2914,24 +2914,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2998,18 +2980,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3523,6 +3500,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4191,6 +4186,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4878,6 +4876,25 @@ msgstr "Učitavanje postavki slika"
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5005,6 +5022,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5302,6 +5324,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8043,6 +8068,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10531,6 +10559,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10549,6 +10727,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13968,6 +14151,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15342,6 +15534,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15985,6 +16183,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16033,6 +16235,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16959,12 +17197,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16977,9 +17209,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17751,6 +17980,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18460,9 +18695,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20658,24 +20890,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20701,9 +20915,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20721,6 +20932,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20822,9 +21052,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20987,18 +21214,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21111,6 +21341,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21888,6 +22164,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22236,6 +22515,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22841,9 +23123,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23087,6 +23379,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23099,7 +23394,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23176,6 +23471,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23502,6 +23804,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23517,6 +23822,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23821,6 +24129,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24744,6 +25055,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24791,10 +25105,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24803,6 +25117,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24864,6 +25186,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25803,6 +26128,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25869,14 +26202,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25927,10 +26252,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28690,6 +29015,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30492,9 +30820,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31928,6 +32253,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33163,6 +33491,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/ca.po b/i18n/po/ca.po
index ba6672b..47cd3c6 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: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-03-14 22:52+0000\n"
-"Last-Translator: Don-vip <Unknown>\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-16 08:35+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: el_libre - - www.catmidia.cat\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:36+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:39+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: ca\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -476,7 +476,7 @@ msgid "Download data"
msgstr "Baixa dades"
msgid "Download map data from a server of your choice"
-msgstr ""
+msgstr "Descarregar dades del mapa d’un servidor de la teva elecció"
msgid ""
"<html>This action will require {0} individual<br>download requests. Do you "
@@ -492,7 +492,7 @@ msgid "Download in current view"
msgstr "Baixa en la visualització actual"
msgid "Download map data from the OSM server in current view"
-msgstr ""
+msgstr "Descarregarr dades del mapa del servidor OSM en la vista actual"
msgid "Download object..."
msgstr "Baixa l''objecte..."
@@ -2536,7 +2536,7 @@ msgid "Selection settings"
msgstr ""
msgid "Additional settings"
-msgstr ""
+msgstr "Configuració addicional"
msgid "Search syntax"
msgstr ""
@@ -3179,24 +3179,6 @@ msgstr "El valor de latitud ''{0}'' és erroni"
msgid "Illegal longitude value ''{0}''"
msgstr "El valor de longitud ''{0}'' és erroni"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Ha fallat la creació del directori mancant per la memòria cau: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Ha fallat la creació del directori de memòria cau: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "No ha estat possible d''esborrar el fitxer temporal {0}"
@@ -3282,22 +3264,15 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "Model de renderització {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Capa: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Model de renderització {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Ha fallat la persistència de les preferències sobre \"{0}\""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Prova d''activar la xarxa IPV6, es prefereix IPV6 en comptes de IPV4 (només "
-"en cas de l''arrencada inicial)"
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr "La preferència {0} ha estat suprimida perquè ja no s''utilitza."
@@ -3861,6 +3836,24 @@ msgstr "text"
msgid "areatext"
msgstr "àrea de text"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Ha fallat la creació del directori mancant per la memòria cau: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Ha fallat la creació del directori de memòria cau: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "S''esperava l''element ''{0}'', però s''ha obtingut ''{1}''"
@@ -4082,7 +4075,7 @@ msgid "Converts coordinates from one coordinate reference system to another."
msgstr ""
msgid "Options"
-msgstr ""
+msgstr "Opcions"
msgid "Show this help"
msgstr "Mostrar aquesta ajuda"
@@ -4571,6 +4564,9 @@ msgstr "Estil d''àrea a la via externa"
msgid "Multipolygon is not closed"
msgstr "El multipolígon no està tancat"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -5295,6 +5291,25 @@ msgstr "S''estan carregant les preferències de les imatges"
msgid "usage"
msgstr "ús"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "opcions"
@@ -5431,6 +5446,13 @@ msgstr "Ajustant els valors per defecte"
msgid "Creating main GUI"
msgstr "S''està creant la interfície principal"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Prova d''activar la xarxa IPV6, es prefereix IPV6 en comptes de IPV4 (només "
+"en cas de l''arrencada inicial)"
+
msgid "Updating plugins"
msgstr "Actualitzant els connectors"
@@ -5755,6 +5777,9 @@ msgstr "Engrandeix"
msgid "Shrink"
msgstr "Enpetiteix"
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8760,6 +8785,9 @@ msgstr ""
"<html>La capa ''{0}'' té un conflicte per l''objecte<br>''{1}''.<br>Si us "
"plau resolgueu primer aquest conflicte i llavors toneu a provar.</html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr "Escull objectes pels membres de la relació seleccionats"
@@ -11520,6 +11548,156 @@ msgstr "(l''URL era: "
msgid "Select the map painting styles"
msgstr "Seleccionar els estils per dibuixar el mapa"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11546,6 +11724,11 @@ msgstr ""
"Ha fallat l''anàlisi dels estils de Mappaint de ''{0}''. L''excepció ha "
"estat: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Ha fallat la localització la imatge ''{0}''"
@@ -15418,6 +15601,15 @@ msgstr "Ignorar la capa i continuar"
msgid "expected .jos file inside .joz archive"
msgstr "s''esperava un fitxer .jos dins del fitxer .joz"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Ignorar la baixada"
@@ -17015,6 +17207,12 @@ msgstr "Motocicleta"
msgid "Motorcar"
msgstr "Automòbil"
+msgid "Minimum age"
+msgstr "Edat mínima"
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Referència"
@@ -17662,6 +17860,10 @@ msgid "platform"
msgstr "plataforma"
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr "quiosc"
@@ -17710,6 +17912,42 @@ msgstr "de vapor"
msgid "vacuum"
msgstr "buit"
+msgid "Material"
+msgstr "Material"
+
+msgid "plastic"
+msgstr "plàstic"
+
+msgid "steel"
+msgstr "acer"
+
+msgid "stone"
+msgstr "pedra"
+
+msgid "Location transition"
+msgstr "Punt de transició"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Potència (kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Fases"
+
msgid "Max. weight (tonnes)"
msgstr "Màx. pes (tones)"
@@ -18657,12 +18895,6 @@ msgstr "Barreres"
msgid "Block"
msgstr "Bloc"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "pedra"
-
msgid "Bollard"
msgstr "Bol·lard"
@@ -18675,9 +18907,6 @@ msgstr "ascendent"
msgid "removable"
msgstr "suprimible"
-msgid "plastic"
-msgstr "plàstic"
-
msgid "Cycle Barrier"
msgstr "Barrera ciclista"
@@ -19455,6 +19684,12 @@ msgstr "barreja 1/25 (ciclomotor)"
msgid "1/50 mix (mofa/moped)"
msgstr "barreja 1/50 (ciclomotor)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr "Targeta de combustible:"
@@ -20168,9 +20403,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Nombre de pantalles"
-msgid "Minimum age"
-msgstr "Edat mínima"
-
msgid "Zoo"
msgstr "Zoo"
@@ -22366,24 +22598,6 @@ msgctxt "power"
msgid "industrial"
msgstr "industrial"
-msgid "Power rating (kVA/MVA)"
-msgstr "Potència (kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "D''aïllament per gas (gas dielèctric)"
@@ -22409,9 +22623,6 @@ msgctxt "power"
msgid "yes"
msgstr "si"
-msgid "Phases"
-msgstr "Fases"
-
msgid "Power Switchgear"
msgstr "Quadre elèctric"
@@ -22431,6 +22642,25 @@ msgstr "Badia d''alimentació"
msgid "Power Switch"
msgstr "Commutador"
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr "Convertidor"
@@ -22532,9 +22762,6 @@ msgstr "tubular"
msgid "solid"
msgstr "sòlida"
-msgid "steel"
-msgstr "acer"
-
msgctxt "color"
msgid "red/white"
msgstr "vermell/blanc"
@@ -22697,18 +22924,21 @@ msgstr "Torre triple"
msgid "Incomplete tower"
msgstr "Torre incompleta"
-msgid "Location transition"
-msgstr "Punt de transició"
-
msgid "Pole"
msgstr "Pal"
-msgid "Pole with Transformer"
-msgstr "Pal amb transformador"
+msgid "Pole with Switch"
+msgstr ""
msgid "Pole Attributes:"
msgstr "Atributs del pal:"
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr "Pal amb transformador"
+
msgid "Transformer Attributes:"
msgstr "Atributs del transformador:"
@@ -22821,6 +23051,52 @@ msgstr "Camp de batalla"
msgid "Palaeontological Site"
msgstr "Lloc Paleontològic"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monument"
@@ -23598,6 +23874,9 @@ msgstr "Masia/Habitatge aïllat"
msgid "Suburb"
msgstr "Districte"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "Barri/Urbanització"
@@ -23962,6 +24241,9 @@ msgstr "Horticultura en hivernacle"
msgid "Plant Nursery"
msgstr "Viver"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -24572,9 +24854,19 @@ msgstr "Rutes"
msgid "Bicycle Route"
msgstr "Ruta cliclista"
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -24818,6 +25110,9 @@ msgstr "OpenStreetMap Tracks GPS"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr "Transport públic (ÖPNV)"
@@ -24830,7 +25125,7 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -24907,6 +25202,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -25233,6 +25535,9 @@ msgstr "URBIS 2015 imatgeria aèria"
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW (Valònia) PICC imatgeria digital"
@@ -25248,6 +25553,9 @@ msgstr "SPW (Valònia) 2012-2013 imatgeria aèria"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW (Valònia) 2009-2010 imatgeria aèria"
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -25552,6 +25860,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr "Bordeus - 2012"
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Cadastre"
@@ -26478,6 +26789,9 @@ msgstr "Fiez Orthofoto 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -26525,11 +26839,11 @@ msgstr "USGS mapes topogràfics"
msgid "USGS Large Scale Imagery"
msgstr "USGS Imatgeria a escala gran"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "Carreteres TIGER 2012"
+msgid "TIGER Roads 2012"
+msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "Noves carreteres de TIGER desalineades (2015)"
+msgid "TIGER Roads 2014"
+msgstr ""
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -26537,6 +26851,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
@@ -26598,6 +26920,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -27555,6 +27880,14 @@ msgstr "{0} a una via. Ha de ser utilitzat a un node."
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} a una via. S''ha d''utilitzar a una relació"
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr "{0} conjuntament amb {1} a un node. Suprimeix {0}."
@@ -27621,14 +27954,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -27681,11 +28006,11 @@ msgstr "valor buit en ''{0}'' separat per punt i coma"
msgid "numerical key"
msgstr "clau numèrica"
-msgid "layer tag with + sign"
-msgstr "etiqueta de capa amb el signe +"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "la capa ha d''estar entre -5 i 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr ""
@@ -30768,6 +31093,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -32713,9 +33041,6 @@ msgstr "Esborra això"
msgid "Delete this&older"
msgstr "Suprimeix aquest i els més vells"
-msgid "km/h"
-msgstr "km/h"
-
msgid "Track name: "
msgstr "Nom de la pista: "
@@ -34280,6 +34605,9 @@ msgstr "nombre positiu o deixar buit"
msgid "Speed:"
msgstr "Velocitat:"
+msgid "km/h"
+msgstr "km/h"
+
msgid "direction"
msgstr "direcció"
@@ -35555,6 +35883,12 @@ msgstr "Seleccioneu nomé un objecte"
msgid "Select a map object"
msgstr "Seleccioneu un objecte del mapa"
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/ca at valencia.po b/i18n/po/ca at valencia.po
index d70c399..32d4ed4 100644
--- a/i18n/po/ca at valencia.po
+++ b/i18n/po/ca at valencia.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2015-04-25 18:52+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: el_libre - - www.catmidia.cat\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 05:08+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: ca at valencia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3143,24 +3143,6 @@ msgstr "El valor de latitud ''{0}'' és erroni"
msgid "Illegal longitude value ''{0}''"
msgstr "El valor de longitud ''{0}'' és erroni"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Ha fallat la creació del directori mancant per la memòria cau: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Ha fallat la creació del directori de memòria cau: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3246,20 +3228,15 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "Model de renderització {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Capa: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Model de renderització {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Ha fallat la persistència de les preferències sobre \"{0}\""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr "La preferència {0} ha estat suprimida perquè ja no s''utilitza."
@@ -3815,6 +3792,24 @@ msgstr "text"
msgid "areatext"
msgstr "àrea de text"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Ha fallat la creació del directori mancant per la memòria cau: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Ha fallat la creació del directori de memòria cau: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4506,6 +4501,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "El multipolígon no està tancat"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -5218,6 +5216,25 @@ msgstr "S''estan carregant les preferències de les imatges"
msgid "usage"
msgstr "ús"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "opcions"
@@ -5352,6 +5369,11 @@ msgstr "Ajustant els valors per defecte"
msgid "Creating main GUI"
msgstr "S''està creant la interfície principal"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr "Actualitzant els connectors"
@@ -5655,6 +5677,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8594,6 +8619,9 @@ msgstr ""
"<html>La capa ''{0}'' té un conflicte per l''objecte<br>''{1}''.<br>Si vos "
"plau resolgueu primer este conflicte i llavors toneu a provar.</html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr "Trieu objectes pels membres de la relació seleccionats"
@@ -11350,6 +11378,156 @@ msgstr "(La URL era: "
msgid "Select the map painting styles"
msgstr "Seleccionar els estils per dibuixar el mapa"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11376,6 +11554,11 @@ msgstr ""
"Ha fallat l''anàlisi dels estils de Mappaint de ''{0}''. L''excepció ha "
"estat: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Ha fallat la localització la imatge ''{0}''"
@@ -15222,6 +15405,15 @@ msgstr "Ignorar la capa i continuar"
msgid "expected .jos file inside .joz archive"
msgstr "s''esperava un fitxer .jos dins del fitxer .joz"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Ignorar la descàrrega"
@@ -16809,6 +17001,12 @@ msgstr "Motocicleta"
msgid "Motorcar"
msgstr "Automòbil"
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Referència"
@@ -17452,6 +17650,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -17500,6 +17702,42 @@ msgstr "de vapor"
msgid "vacuum"
msgstr "buit"
+msgid "Material"
+msgstr "Material"
+
+msgid "plastic"
+msgstr "plàstic"
+
+msgid "steel"
+msgstr "acer"
+
+msgid "stone"
+msgstr "pedra"
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr "Màx. pes (tones)"
@@ -18440,12 +18678,6 @@ msgstr "Barreres"
msgid "Block"
msgstr "Bloc"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "pedra"
-
msgid "Bollard"
msgstr "Bol·lard"
@@ -18458,9 +18690,6 @@ msgstr "ascendent"
msgid "removable"
msgstr "suprimible"
-msgid "plastic"
-msgstr "plàstic"
-
msgid "Cycle Barrier"
msgstr "Barrera ciclista"
@@ -19233,6 +19462,12 @@ msgstr "barreja 1/25 (ciclomotor)"
msgid "1/50 mix (mofa/moped)"
msgstr "barreja 1/50 (ciclomotor)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -19944,9 +20179,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "Zoo"
@@ -22142,24 +22374,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -22185,9 +22399,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -22205,6 +22416,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -22306,9 +22536,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr "acer"
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -22471,18 +22698,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr "Pal"
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -22595,6 +22825,52 @@ msgstr "Camp de batalla"
msgid "Palaeontological Site"
msgstr "Lloc Paleontològic"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monument"
@@ -23372,6 +23648,9 @@ msgstr "Masia/Habitatge aïllat"
msgid "Suburb"
msgstr "Barri/Districte"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "Veïnatge/Urbanització"
@@ -23720,6 +23999,9 @@ msgstr "Horticultura en hivernacle"
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -24325,9 +24607,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -24571,6 +24863,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -24583,7 +24878,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -24660,6 +24955,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -24986,6 +25288,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -25001,6 +25306,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -25305,6 +25613,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Cadastre"
@@ -26228,6 +26539,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -26275,10 +26589,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -26287,6 +26601,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -26348,6 +26670,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -27287,6 +27612,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -27353,14 +27686,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -27411,11 +27736,11 @@ msgstr ""
msgid "numerical key"
msgstr "clau numèrica"
-msgid "layer tag with + sign"
-msgstr "etiqueta de capa amb el signe +"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "la capa ha d''estar entre -5 i 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr ""
@@ -30426,6 +30751,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -32355,9 +32683,6 @@ msgstr "Esborra això"
msgid "Delete this&older"
msgstr "Suprimeix este i els més vells"
-msgid "km/h"
-msgstr "km/h"
-
msgid "Track name: "
msgstr "Nom de la pista: "
@@ -33922,6 +34247,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr "km/h"
+
msgid "direction"
msgstr ""
@@ -35192,6 +35520,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/cs.po b/i18n/po/cs.po
index 3ffcd2b..016ba4a 100644
--- a/i18n/po/cs.po
+++ b/i18n/po/cs.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-09-27 06:04+0000\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-25 11:01+0000\n"
"Last-Translator: Dalibor Jelínek <launchpad.net at dalibor.cz>\n"
"Language-Team: Czech <kde-i18n-doc at kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:37+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:39+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: cs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3197,26 +3197,6 @@ msgstr "Neplatná zeměpisná šířka ''{0}''"
msgid "Illegal longitude value ''{0}''"
msgstr "Neplatná zeměpisná délka ''{0}''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr "Nepodařilo se vytvořit chybějící složku konfigurace: {0}"
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-"<html>Nepodařilo se vytvořit chybějící složku konfigurace: {0}</html>"
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr "Nepodařilo se vytvořit chybějící složku uživatelských dat: {0}"
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-"Nepodařilo se vytvořit chybějící složku uživatelských dat: {0}</html>"
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Chybějící adresář keše se nepodařilo vytvořit: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Nepodařilo se vytvořit chybějící adresář keše: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Nemohu smazat dočasný soubor {0}"
@@ -3301,22 +3281,15 @@ msgstr "Selhalo načtení výchozího souboru keše: {0}"
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr "Selhalo vymazání špatného výchozího souboru keše: {0}"
-msgid "Paint style {0}: {1}"
-msgstr "Styl kreslení {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Vrstva: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Styl kreslení {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Nelze uložit předvolby do \"{0}\""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Zkuste povolit síť IPv6, upřednostňujíc IPv6 před IPv4 (funguje pouze při "
-"brzkém spuštění)"
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr "Nastavení {0} bylo odstraněno, protože se již nepoužívá."
@@ -3875,6 +3848,26 @@ msgstr "text"
msgid "areatext"
msgstr "popisek ploch"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr "Nepodařilo se vytvořit chybějící složku konfigurace: {0}"
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+"<html>Nepodařilo se vytvořit chybějící složku konfigurace: {0}</html>"
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr "Nepodařilo se vytvořit chybějící složku uživatelských dat: {0}"
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+"Nepodařilo se vytvořit chybějící složku uživatelských dat: {0}</html>"
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Chybějící adresář keše se nepodařilo vytvořit: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Nepodařilo se vytvořit chybějící adresář keše: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Očekáván prvek ''{0}'', ale obdržen ''{1}''"
@@ -4574,6 +4567,9 @@ msgstr "Styl plochy na vnější cestě"
msgid "Multipolygon is not closed"
msgstr "Multipolygon není uzavřený"
+msgid "Self-intersecting polygon ring"
+msgstr "Kruh polygonu protínající sám sebe"
+
msgid "Multipolygon rings share node(s)"
msgstr "Kruhy multipolygonu sdílejí uzel/uzly"
@@ -5284,6 +5280,25 @@ msgstr "Načítání nastavení mapových podkladů"
msgid "usage"
msgstr "použití"
+msgid "commands"
+msgstr "příkazy"
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr "spustit JOSM (výchozí, provede se, pokud není zadán žádný příkaz)"
+
+msgid "render data and save the result to an image file"
+msgstr "vykreslit data a výsledek uložit do obrázkového souboru"
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr "převést souřadnice z jednoho systému souřadnic do jiného"
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr "Podrobnosti příkazů {0} a {1} získáte jejich spuštěním s volbou {2}."
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr "Zbytek této stránky nápovědy popisuje příkaz {0}."
+
msgid "options"
msgstr "Možnosti"
@@ -5424,6 +5439,13 @@ msgstr "Nastavuji výchozí hodnoty"
msgid "Creating main GUI"
msgstr "Vytváří se grafické rozhraní programu (GUI)"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Zkuste povolit síť IPv6, upřednostňujíc IPv6 před IPv4 (funguje pouze při "
+"brzkém spuštění)"
+
msgid "Updating plugins"
msgstr "Aktualizace doplňků"
@@ -5744,6 +5766,9 @@ msgstr "Zvětšit"
msgid "Shrink"
msgstr "Zmenšit"
+msgid "Show downloaded area"
+msgstr "Zobrazit staženou oblast"
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8721,6 +8746,9 @@ msgstr ""
"<html>Vrstva ''{0}'' už má konflikt na objektu <br>''{1}''.<br> Prosím, "
"vyřešte nejprve tento konflikt a potom to zkuste znova.</html>"
+msgid "Select the currently edited relation"
+msgstr "Vybrat momentálně upravovanou relaci"
+
msgid "Select objects for selected relation members"
msgstr "Vybrat objekty vybraných členů relace"
@@ -11507,6 +11535,182 @@ msgstr "(URL bylo: "
msgid "Select the map painting styles"
msgstr "Vybrat styl kreslení mapy"
+msgid "Error - file not found: ''{0}''"
+msgstr "Chyba - soubor nenalezen: ''{0}''"
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr "U volby {0} očekáváno celé číslo, ale nalezeno ''{1}''"
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr "U volby {0} očekáváno celé číslo >=0, ale nalezeno ''{1}''"
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr "Nelze zpracovat {0} parametr: {1}"
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+"U parametru {0} očekávány klíč a hodnota oddělené znakem '':'', ale nalezeno "
+"''{1}''"
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr "U parametru {0} očekáváno desetinné číslo, ale nalezeno ''{1}''"
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+"U parametru {0} očekávány dvě souřadnice oddělené čárkou, ale nalezeno "
+"''{1}''"
+
+msgid "In option {0}: {1}"
+msgstr "U paramatru {0}: {1}"
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr "U parametru {0} očekáváno desetinné číslo > 0, ale nalezeno ''{1}''"
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr "U parametru {0} očekáváno celé číslo > 0, ale nalezeno ''{1}''"
+
+msgid "JOSM rendering command line interface"
+msgstr "Rozhraní příkazové řádky vykreslování JOSM"
+
+msgid "Renders data and saves the result to an image file."
+msgstr "Vykreslí data a výsledek uloží do obrázkového souboru."
+
+msgid "Input data file name (.osm)"
+msgstr "Název vstupního datového souboru (.osm)"
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+"Název výstupního obrázkového souboru (.png); výchozí název je ''{0}''"
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr "Soubor stylu, který se má použít pro vykreslení (.mapcss nebo .zip)"
+
+msgid "This option can be repeated to load multiple styles."
+msgstr "Tento parametr lze opakovat, aby se načetlo několik stylů."
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+"Nastavení stylu (dostupné v JOSM pomocí kliknutí pravým tlačítkem na dialog "
+"seznamu stylů)"
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr "Vztahuje se k poslednímu stylu zadanému parametrem {0}."
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+"Zvolte úroveň zvětšení, která se má vykreslit. (celé číslo, 0=celá Země, "
+"18=úroveň ulic)"
+
+msgid "Select the map scale"
+msgstr "Zvolte měřítko mapy"
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+"Hodnota 10000 znamená měřítko 1:10000 (1 cm mapy odpovídá 100 m v terénu; "
+"rozlišení zobrazení: 96 DPI)"
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr "Parametry {0} a {1} se vzájemně vylučují."
+
+msgid "Area to render, default value is ''{0}''"
+msgstr "Oblast, která se má vykreslit, výchozí hodnota je ''{0}''"
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+"S klíčovým slovem ''{0}'' se použije stažená oblast zapsaná ve vstupním "
+"souboru (pokud tam je)."
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr "Zadejte levý spodní roh vykreslované oblasti"
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+"Používá se v kombinaci s parametry šířka a výška, které určují vykreslovanou "
+"oblast."
+
+msgid "Width of the rendered area, in meter"
+msgstr "Šířka vykreslované oblasti v metrech"
+
+msgid "Height of the rendered area, in meter"
+msgstr "Výška vykreslované oblasti v metrech"
+
+msgid "Width of the target image, in pixel"
+msgstr "Šířka vytvářeného obrázku v pixlech"
+
+msgid "Height of the target image, in pixel"
+msgstr "Výška vytvářeného obrázku v pixlech"
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+"Projekce, která se má použít, výchozí hodnota je ''{0}'' (web-Mercator)"
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+"Maximální šířka/výška obrázku v pixelech (''{0}'' znamená bez omezení), "
+"výchozí hodnota: {1}"
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+"Určit vykreslovanou oblast a její měřítko lze různými kombinacemi parametrů"
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+"Není-li zadáno ''{0}'' ani ''{1}'', pak se uplatní výchozí hodnota {2} a "
+"použijí se hranice stažené oblasti zapsané ve vstupním souboru .osm."
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+"Byl zadán parametr {0}, ale měřítko nelze ze zbývajících parametrů určit"
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr "Zadán parametr {0}, očekáváno {1} nebo {2}"
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+"Režim {0}, ale ve vstupním .osm souboru nebyly nalezeny žádné hranice"
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+"Nelze určit měřítko, očekáván jeden z parametrů {0}, {1}, {2} nebo {3}"
+
+msgid "Missing argument - input data file ({0})"
+msgstr "Parametr chybí - vstupní datový soubor ({0})"
+
+msgid "In .osm data file ''{0}'' - "
+msgstr "V datovém souboru .osm ''{0}'' - "
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr "Chybějící parametr - je očekáván alespoň jeden styl ({0})"
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+"Rozměry obrázku ({0}x{1}) přkračují maximální povolenou velikost obrázku {2} "
+"(pomocí parametru {3} změňte limit)"
+
+msgid "Style setting not found: ''{0}''"
+msgstr "Nastavení stylu nenalezeno: ''{0}''"
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11532,6 +11736,11 @@ msgstr "Selhalo nahrání stylů kreslení mapy z ''{0}''. Došlo k výjimce: {1
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Selhalo zpracování stylů kreslení mapy z ''{0}''. Došlo k chybě: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Nepodařilo se nalézt obrázek ''{0}''"
@@ -15299,6 +15508,16 @@ msgstr "Přeskočit vrstvu a pokračovat"
msgid "expected .jos file inside .joz archive"
msgstr "v .joz archivu chybí soubor .jos"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr "Nepodařilo se vytvořit chybějící adresář předvoleb doplňků: {0}"
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+"Nepodařilo se vytvořit chybějící adresář uživalteských dat doplňků: {0}"
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr "Nepodařilo se vytvořit chybějící adresář keše doplňků: {0}"
+
msgid "Skip download"
msgstr "Přeskočit stahování"
@@ -16919,6 +17138,12 @@ msgstr "Motocykly"
msgid "Motorcar"
msgstr "Osobní automobily"
+msgid "Minimum age"
+msgstr "Minimální věk"
+
+msgid "Maximum age"
+msgstr "Maximální věk"
+
msgid "Reference"
msgstr "Číslo"
@@ -17566,6 +17791,10 @@ msgid "platform"
msgstr "na plošině nad vodou"
msgctxt "power"
+msgid "rooftop"
+msgstr "na střeše"
+
+msgctxt "power"
msgid "kiosk"
msgstr "v budce"
@@ -17614,6 +17843,42 @@ msgstr "pára"
msgid "vacuum"
msgstr "vakuum"
+msgid "Material"
+msgstr "Materiál"
+
+msgid "plastic"
+msgstr "plast"
+
+msgid "steel"
+msgstr "ocel"
+
+msgid "stone"
+msgstr "kámen"
+
+msgid "Location transition"
+msgstr "Místo přechodu vedení pod zem"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Nominální výkon (kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Fáze"
+
msgid "Max. weight (tonnes)"
msgstr "Max. hmotnost (tun)"
@@ -18560,12 +18825,6 @@ msgstr "Překážky"
msgid "Block"
msgstr "Blok"
-msgid "Material"
-msgstr "Materiál"
-
-msgid "stone"
-msgstr "kámen"
-
msgid "Bollard"
msgstr "Sloupek"
@@ -18578,9 +18837,6 @@ msgstr "vysouvatelný"
msgid "removable"
msgstr "odstranitelný"
-msgid "plastic"
-msgstr "plast"
-
msgid "Cycle Barrier"
msgstr "Překážka pro cyklisty"
@@ -19356,6 +19612,12 @@ msgstr "1/25 mix (motorové kolo/moped)"
msgid "1/50 mix (mofa/moped)"
msgstr "1/50 mix (motorové kolo/moped)"
+msgid "Additives:"
+msgstr "Aditiva:"
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr "Aditivum do nafty (AdBlue/AUS32)"
+
msgid "Fuel cards:"
msgstr "Tankovací karty:"
@@ -20065,9 +20327,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Počet pláten"
-msgid "Minimum age"
-msgstr "Minimální věk"
-
msgid "Zoo"
msgstr "Zoo"
@@ -22263,24 +22522,6 @@ msgctxt "power"
msgid "industrial"
msgstr "průmyslová"
-msgid "Power rating (kVA/MVA)"
-msgstr "Nominální výkon (kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "Plynová izolace"
@@ -22306,9 +22547,6 @@ msgctxt "power"
msgid "yes"
msgstr "ano"
-msgid "Phases"
-msgstr "Fáze"
-
msgid "Power Switchgear"
msgstr "Rozvodna"
@@ -22328,6 +22566,25 @@ msgstr "Přípojné místo (bay)"
msgid "Power Switch"
msgstr "Vypínač"
+msgid "Type of switch"
+msgstr "Typ vypínače"
+
+msgctxt "power"
+msgid "mechanical"
+msgstr "mechanický"
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr "jistič"
+
+msgctxt "power"
+msgid "disconnector"
+msgstr "odpojovač"
+
+msgctxt "power"
+msgid "earthing"
+msgstr "zemnící"
+
msgid "Power Converter"
msgstr "Elektrická měnírna"
@@ -22429,9 +22686,6 @@ msgstr "trubicová"
msgid "solid"
msgstr "plná"
-msgid "steel"
-msgstr "ocel"
-
msgctxt "color"
msgid "red/white"
msgstr "červená/bílá"
@@ -22594,18 +22848,21 @@ msgstr "Třídřík"
msgid "Incomplete tower"
msgstr "Neúplný"
-msgid "Location transition"
-msgstr "Místo přechodu vedení pod zem"
-
msgid "Pole"
msgstr "Sloup"
-msgid "Pole with Transformer"
-msgstr "Sloup s transformátorem"
+msgid "Pole with Switch"
+msgstr "Sloup s vypínačem"
msgid "Pole Attributes:"
msgstr "Vlastnosti sloupu:"
+msgid "Switch Attributes:"
+msgstr "Vlastnosti vypínače:"
+
+msgid "Pole with Transformer"
+msgstr "Sloup s transformátorem"
+
msgid "Transformer Attributes:"
msgstr "Vlastnosti transformátoru:"
@@ -22718,6 +22975,52 @@ msgstr "Bojiště"
msgid "Palaeontological Site"
msgstr "Paleontologické naleziště"
+msgid "Grave"
+msgstr "Hrob"
+
+msgid "Tomb"
+msgstr "Hrobka"
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr "mohyla"
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr "hrob ve skále"
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr "hypogeum"
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr "válečný hrob"
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr "mauzoleum"
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr "kolumbárium"
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr "krypta"
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr "pyramida"
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr "sarkofág"
+
+msgctxt "tomb"
+msgid "vault"
+msgstr "hrobka"
+
msgid "Monument"
msgstr "Monument"
@@ -23495,6 +23798,9 @@ msgstr "Samota"
msgid "Suburb"
msgstr "Městská část/obvod"
+msgid "Quarter"
+msgstr "Městská čtvrť"
+
msgid "Neighbourhood"
msgstr "Část městské čtvrti, obce"
@@ -23857,6 +24163,9 @@ msgstr "Skleníkové zahradnictví"
msgid "Plant Nursery"
msgstr "Pěstitelská školka"
+msgid "Salt Pond"
+msgstr "Salina"
+
msgid "Aquaculture"
msgstr "Akvakultura"
@@ -24466,9 +24775,19 @@ msgstr "Trasy"
msgid "Bicycle Route"
msgstr "Cyklotrasa"
+msgctxt "network"
+msgid "international"
+msgstr "mezinárodní"
+
+msgctxt "network"
msgid "national"
msgstr "národní"
+msgctxt "network"
+msgid "regional"
+msgstr "regionální"
+
+msgctxt "network"
msgid "local"
msgstr "místní"
@@ -24718,6 +25037,9 @@ msgstr "OpenStreetMap trasy GPS"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr "Veřejné stopy GPS nahrané na OpenStreetMap."
+msgid "OpenTopoMap"
+msgstr "OpenTopoMap"
+
msgid "Public Transport (ÖPNV)"
msgstr "Veřejná doprava (ÖPNV)"
@@ -24730,8 +25052,8 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr "Stamen Terrain"
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
-msgstr "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
+msgstr "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (překryv)"
@@ -24809,6 +25131,14 @@ msgstr ""
"Snímky z pozdního léta míst, která jsou na obvyklých zdrojích silně "
"znehodnocena mraky a sněhem (pravé barvy)"
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr "Municipality of Tirana (Open Labs GeoPortal)"
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
@@ -25141,6 +25471,9 @@ msgstr "URBIS 2015 aerial imagery"
msgid "URBIS 2016 aerial imagery"
msgstr "URBIS 2016 aerial imagery"
+msgid "URBIS 2017 aerial imagery"
+msgstr "URBIS 2017 aerial imagery"
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW(allonie) PICC numerical imagery"
@@ -25156,6 +25489,9 @@ msgstr "SPW(allonie) 2012-2013 aerial imagery"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 aerial imagery"
+msgid "SPW(allonie) shaded relief"
+msgstr "SPW(allonie) shaded relief"
+
msgid "TEC bus lines"
msgstr "TEC bus lines"
@@ -25472,6 +25808,9 @@ msgstr "BDOrtho IGN"
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
+msgid "Bordeaux - 2016"
+msgstr "Bordeaux - 2016"
+
msgid "Cadastre"
msgstr "Katastr"
@@ -26443,6 +26782,9 @@ msgstr "Fiez Orthophoto 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr "Kanton Basel-Stadt 2015"
+msgid "Kanton Basel-Stadt 2017"
+msgstr "Kanton Basel-Stadt 2017"
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr "Kanton Basel-Landschaft 10cm (2015)"
@@ -26493,11 +26835,11 @@ msgstr "USGS Topographic Maps"
msgid "USGS Large Scale Imagery"
msgstr "USGS Large Scale Imagery"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
+msgstr "TIGER Roads 2012"
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
+msgstr "TIGER Roads 2014"
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -26508,6 +26850,16 @@ msgstr ""
"zooms, only changes since 2006 minus changes already incorporated into "
"OpenStreetMap"
+msgid "TIGER Roads 2017"
+msgstr "TIGER Roads 2017"
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
@@ -26579,6 +26931,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr "San Juan Metro Area: 2013 USACE Orthophotos"
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr "PR/USVI 2017 NOAA Hurricane Maria imagery"
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr "WA 2013 aerial imagery for San Juan County"
@@ -27692,6 +28047,16 @@ msgstr "{0} na cestě. Mělo by být použito na uzlu."
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} na cestě. Mělo by být použito v relaci"
+msgid "node connects highway and building"
+msgstr "uzel spojuje silnici s budovou"
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+"Objekt na pozici 0.00E 0.00N. Na tomto místě ale nic není, kromě "
+"meteorologické bóje, který již byla zmapována dříve."
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr "{0} spolu s {1} na uzlu. Ostraňte {0}."
@@ -27764,16 +28129,6 @@ msgstr ""
"{0} je značka používaná pro vodní toky. Pro označení plochy použijte spíše "
"{1} + {2}."
-msgid "node connects highway and building"
-msgstr "uzel spojuje silnici s budovou"
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-"Objekt na pozici 0.00E 0.00N. Na tomto místě ale nic není, kromě "
-"meteorologické bóje, který již byla zmapována dříve."
-
msgid "Ferry route is not connected to the road network or branches."
msgstr "Trasa trajektu není připojená k silniční síti, ani k odbočce trasy."
@@ -27829,11 +28184,11 @@ msgstr "prázdná hodnota ve středníkem odděleném ''{0}''"
msgid "numerical key"
msgstr "číselný klíč"
-msgid "layer tag with + sign"
-msgstr "hodnota značky \"layer\" se znamínkem +"
+msgid "{0} value with + sign"
+msgstr "{0} hodnota se znaménkem +"
-msgid "layer should be between -5 and 5"
-msgstr "hodnota layer by měla být od -5 do 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr "{0} by měla být celočíselná hodnota mezi -5 a 5"
msgid "{0} should have numbers only with optional .5 increments"
msgstr "{0} by měla mít jen čísla s volitelným přírůstkem o 0.5"
@@ -30942,6 +31297,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr "<html>Nic není povoleno.<br>Vyberte, prosím, něco ke stažení.</html>"
+msgid "Download cadastre data"
+msgstr "Stáhnout katastrální data"
+
msgid "Recipient"
msgstr "Příjemce"
@@ -32882,9 +33240,6 @@ msgstr "Smazat tuto"
msgid "Delete this&older"
msgstr "Smazat tuto i starší"
-msgid "km/h"
-msgstr "km/h"
-
msgid "Track name: "
msgstr "Název trasy: "
@@ -34416,6 +34771,9 @@ msgstr "kladné číslo nebo prázdné"
msgid "Speed:"
msgstr "Rychlost:"
+msgid "km/h"
+msgstr "km/h"
+
msgid "direction"
msgstr "směr"
@@ -35694,6 +36052,12 @@ msgstr "Vyberte pouze jeden objekt"
msgid "Select a map object"
msgstr "Vyberte objekt na mapě"
+msgid "Please enter minimal distance in metres"
+msgstr "Zadejte, prosím, minimální vzdálenost v metrech"
+
+msgid "Please enter numeric angle in degrees"
+msgstr "Zadejte, prosím, úhel ve stupních"
+
msgid "Shape actions panel"
msgstr "Panel akcí tvaru"
diff --git a/i18n/po/cy.po b/i18n/po/cy.po
index 1f7e40e..a3f6271 100644
--- a/i18n/po/cy.po
+++ b/i18n/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2009-07-17 21:45+0000\n"
"Last-Translator: iggy23 <Unknown>\n"
"Language-Team: Welsh <cy at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
"2 : 3;\n"
-"X-Launchpad-Export-Date: 2017-09-30 05:03+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:06+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: cy\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2912,24 +2912,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2996,18 +2978,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3521,6 +3498,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4189,6 +4184,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4876,6 +4874,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5003,6 +5020,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5300,6 +5322,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8041,6 +8066,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10529,6 +10557,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10547,6 +10725,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13966,6 +14149,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15340,6 +15532,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15983,6 +16181,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16031,6 +16233,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16957,12 +17195,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16975,9 +17207,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17749,6 +17978,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18458,9 +18693,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20656,24 +20888,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20699,9 +20913,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20719,6 +20930,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20820,9 +21050,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20985,18 +21212,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21109,6 +21339,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21886,6 +22162,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22234,6 +22513,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22839,9 +23121,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23085,6 +23377,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23097,7 +23392,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23174,6 +23469,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23500,6 +23802,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23515,6 +23820,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23819,6 +24127,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24742,6 +25053,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24789,10 +25103,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24801,6 +25115,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24862,6 +25184,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25801,6 +26126,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25867,14 +26200,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25925,10 +26250,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28688,6 +29013,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30490,9 +30818,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31926,6 +32251,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33161,6 +33489,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/da.po b/i18n/po/da.po
index 2d8d73f..62027ae 100644
--- a/i18n/po/da.po
+++ b/i18n/po/da.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-09-26 22:38+0000\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-28 08:17+0000\n"
"Last-Translator: Jørn <joern.map at gmail.com>\n"
"Language-Team: Dansk <kde-i18n-doc at kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:37+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:40+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: da_DK\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -3138,24 +3138,6 @@ msgstr "Ulovlig breddegradsværdi \"{0}\""
msgid "Illegal longitude value ''{0}''"
msgstr "Ulovlig længdegradsværdi ''{0}''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr "Kunne ikke oprette manglende indstillingsmappe: {0}"
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr "<html>Kunne ikke oprette manglende indstillingsmappe: {0}</html>"
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr "Kunne ikke oprette manglende brugerdatamappe: {0}"
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr "<html>Kunne ikke oprette manglende brugerdatamappe: {0}</html>"
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Kunne ikke oprette manglende cachemappe: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Advarsel: Kunne ikke oprette manglende cache mappe: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Kan ikke slette midlertidig fil {0}"
@@ -3238,22 +3220,15 @@ msgstr "Kunne ikke indlæse cache fil med standardindstillingerne: {0}"
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr "Kunne ikke slette cache fil med defekte standardindstillinger: {0}"
-msgid "Paint style {0}: {1}"
-msgstr "Tegnestil {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Lag: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Tegnestil {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Kunne ikke gemme indstillinger i ''{0}''"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Prøv at aktivere IPv6-netværk, foretrækker IPv6 fremfor IPv4 (virker kun ved "
-"tidlig opstart)."
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr ""
"Indstilling {0} er blevet fjernet eftersom den ikke længere er i brug."
@@ -3810,6 +3785,24 @@ msgstr "tekst"
msgid "areatext"
msgstr "Områdetekst"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr "Kunne ikke oprette manglende indstillingsmappe: {0}"
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr "<html>Kunne ikke oprette manglende indstillingsmappe: {0}</html>"
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr "Kunne ikke oprette manglende brugerdatamappe: {0}"
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr "<html>Kunne ikke oprette manglende brugerdatamappe: {0}</html>"
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Kunne ikke oprette manglende cachemappe: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Advarsel: Kunne ikke oprette manglende cache mappe: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Forventet element ''{0}'', men fik ''{1}''"
@@ -4507,6 +4500,9 @@ msgstr "Område-stil på ydre vej"
msgid "Multipolygon is not closed"
msgstr "Multipolygon er ikke lukket"
+msgid "Self-intersecting polygon ring"
+msgstr "Selvkrydsende polygon ring"
+
msgid "Multipolygon rings share node(s)"
msgstr "Multipolygon ringe deler node(r)"
@@ -5222,6 +5218,26 @@ msgstr "Indlæser billedlags-indstillinger"
msgid "usage"
msgstr "brug"
+msgid "commands"
+msgstr "kommandoer"
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr "start JOSM (standard, udføres når ingen kommando er angivet)"
+
+msgid "render data and save the result to an image file"
+msgstr "tegn data og gem resultatet i en billedfil"
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr "konverter koordinater fra et koordinatreferencesystem til et andet"
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+"For detaljer om kommandoerne {0} og {1} skal de køres med indstillingen {2}."
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr "Resten af denne hjælpside dokumenterer kommandoen {0}."
+
msgid "options"
msgstr "valgmuligheder"
@@ -5271,7 +5287,7 @@ msgid "Skip loading plugins"
msgstr "Spring over indlæsning af udvidelser"
msgid "Disable access to the given resource(s), separated by comma"
-msgstr "Hindre adgangen til den givne ressource (er), adskilt af komma"
+msgstr "Hindre adgangen til den givne ressource(r), adskilt af komma"
msgid "options provided as Java system properties"
msgstr "options givet som Java systemegenskaber"
@@ -5358,6 +5374,13 @@ msgstr "Sætter standardværdier"
msgid "Creating main GUI"
msgstr "Opretter hovedgrænseflade"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Prøv at aktivere IPv6-netværk, foretrækker IPv6 fremfor IPv4 (virker kun ved "
+"tidlig opstart)."
+
msgid "Updating plugins"
msgstr "Opdaterer udvidelser"
@@ -5676,6 +5699,9 @@ msgstr "Forstør"
msgid "Shrink"
msgstr "Formindsk"
+msgid "Show downloaded area"
+msgstr "Vis det downloadede område"
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -7401,7 +7427,7 @@ msgid "Select objects submitted by this user"
msgstr "Vælg objekter indsendt af denne bruger"
msgid "Launches a browser with information about the user"
-msgstr "starter en browser med information om brugeren"
+msgstr "Starter en browser med information om brugeren"
msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr "Starter kun info-browsere for de første {0} af {1} valgte brugere"
@@ -8644,6 +8670,9 @@ msgstr ""
"<html>Laget ''{0}'' har allerede en konflikt for objektet<br>''{1}''.<br>Løs "
"først denne konflikt og prøv så igen</html>"
+msgid "Select the currently edited relation"
+msgstr "Vælg den redigerede relation"
+
msgid "Select objects for selected relation members"
msgstr "Vælg objekter for valgte relationsmedlemmer"
@@ -11383,6 +11412,179 @@ msgstr "(URL var: "
msgid "Select the map painting styles"
msgstr "Vælg korttegningsstilene"
+msgid "Error - file not found: ''{0}''"
+msgstr "Fejl - fil ikke fundet: ''{0}''"
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr "Forventede heltal for mulighed {0}, men fik ''{1}''"
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr "Forventede heltal >= 0 for mulighed {0}, men fik ''{1}''"
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr "Kan ikke fortolke {0} parameter: {1}"
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+"Forventede nøgle og værdi, adskilt af '':'' tegn for mulighed {0}, men fik "
+"''{1}''"
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr "Forventede flydende komma tal for mulighed {0}, men fik ''{1}''"
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+"Forventede to koordinater, adskilt af komma, for mulighed {0}, men fik "
+"''{1}''"
+
+msgid "In option {0}: {1}"
+msgstr "I mulighed {0}: {1}"
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr "Forventede flydende komma tal > 0 for mulighed {0}, men fik ''{1}''"
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr "Forventede heltal > 0 for mulighed {0}, men fik ''{1}''"
+
+msgid "JOSM rendering command line interface"
+msgstr "JOSM tegnings kommandolinje brugerflade"
+
+msgid "Renders data and saves the result to an image file."
+msgstr "Tegner data og gemmer resultatet til en billedfil."
+
+msgid "Input data file name (.osm)"
+msgstr "Input datafilnavn (.osm)"
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr "Output billedfilnavn (.png); standard til ''{0}''"
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr "Style-fil der skal bruges til gengivelse (.mapcss eller .zip)"
+
+msgid "This option can be repeated to load multiple styles."
+msgstr "Denne mulighed kan gentages for at indlæse flere stilarter."
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+"Stil indstilling (i JOSM tilgængelig i stilliste dialog højre kliks menu)"
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr "Gælder for den sidste stil indlæst med indstillingen {0}."
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+"Vælg zoomniveau for at gengive. (heltal værdi, 0=hele jorden, 18=gadeplan)"
+
+msgid "Select the map scale"
+msgstr "Vælg kortskalaen"
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+"En værdi på 10000 betegner en skala på 1: 10000 (1 cm på kortet er lig med "
+"100 m på jorden; skærmopløsning: 96 dpi)"
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr "Mulighed {0} og {1} er gensidigt eksklusive."
+
+msgid "Area to render, default value is ''{0}''"
+msgstr "Område der skal gengives, standardværdien er ''{0}''"
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+"Med søgeordet ''{0}'' bliver det downloadede område i .osm inputfilen brugt "
+"(hvis det er optaget)."
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr "Angiv nederste venstre hjørne af tegningsområdet"
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+"Bruges i kombination med bredde og højde muligheder for at bestemme området "
+"der skal tegnes."
+
+msgid "Width of the rendered area, in meter"
+msgstr "Bredden af det tegnede område, i meter"
+
+msgid "Height of the rendered area, in meter"
+msgstr "Højde af det tegnede område, i meter"
+
+msgid "Width of the target image, in pixel"
+msgstr "Bredden af slutbilledet, i pixel"
+
+msgid "Height of the target image, in pixel"
+msgstr "Højde af slutbilledet, i pixel"
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr "Projektion til brug, standardværdi ''{0}'' (web-Mercator)"
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+"Maksimal billedbredde/højde i pixel (''{0}'' betyder ingen grænse), "
+"standardværdi: {1}"
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+"For at angive det tegnede område og skalaen kan mulighederne kombineres på "
+"forskellige måder"
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+"Hvis der ikke gives ''{0}'' eller ''{1}'', træder standardværdien {2} i "
+"kraft, og grænserne for downloadområdet i .osm-inputfilen bruges."
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+"Argument {0} givet, men skalaen kan ikke bestemmes fra resterende argumenter"
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr "Argument {0} givet, forventede {1} eller {2}"
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr "{0} mode, men ingen grænser fundet i osm data input fil"
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+"Kan ikke bestemme skalaen, en af mulighederne {0}, {1}, {2} eller {3} "
+"forventet"
+
+msgid "Missing argument - input data file ({0})"
+msgstr "Manglende argument - input datafil ({0})"
+
+msgid "In .osm data file ''{0}'' - "
+msgstr "I .osm datafil ''{0}'' - "
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr "Manglende argument - mindst en forventet stil ({0})"
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+"Billedmålene ({0}x{1}) overstiger den maksimale billedstørrelse {2} (brug "
+"mulighed {3} for at ændre grænsen)"
+
+msgid "Style setting not found: ''{0}''"
+msgstr "Stilindstilling ikke fundet: ''{0}''"
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11405,6 +11607,11 @@ msgstr "Kunne ikke indlæse korttegningsstile fra ''{0}''. Hændelse var: {1}"
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Kunne ikke fortolke korttegningsstile fra ''{0}''. Fejlen var: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Kunne ikke finde billedet \"{0}\""
@@ -15165,6 +15372,15 @@ msgstr "Spring laget over og fortsæt"
msgid "expected .jos file inside .joz archive"
msgstr "forventede .jos-fil inde i .joz-arkiv"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr "Kunne ikke oprette manglende udvidelses præference mappe: {0}"
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr "Kunne ikke oprette manglende udvidelses brugerdata mappe: {0}"
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr "Kunne ikke oprette manglende udvidelses cache mappe: {0}"
+
msgid "Skip download"
msgstr "Spring over download"
@@ -16743,6 +16959,12 @@ msgstr "Motorcykel"
msgid "Motorcar"
msgstr "Bil"
+msgid "Minimum age"
+msgstr "Minimumsalder"
+
+msgid "Maximum age"
+msgstr "Maksimumsalder"
+
msgid "Reference"
msgstr "Reference"
@@ -17390,6 +17612,10 @@ msgid "platform"
msgstr "platform"
msgctxt "power"
+msgid "rooftop"
+msgstr "hustag"
+
+msgctxt "power"
msgid "kiosk"
msgstr "kabinet"
@@ -17438,6 +17664,42 @@ msgstr "damp"
msgid "vacuum"
msgstr "vakuum"
+msgid "Material"
+msgstr "Materiale"
+
+msgid "plastic"
+msgstr "plastik"
+
+msgid "steel"
+msgstr "stål"
+
+msgid "stone"
+msgstr "sten"
+
+msgid "Location transition"
+msgstr "Overgangssted"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Effekt (kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Faser"
+
msgid "Max. weight (tonnes)"
msgstr "Maks. vægt (ton)"
@@ -18381,12 +18643,6 @@ msgstr "Barrierer"
msgid "Block"
msgstr "Betonblok/stor sten"
-msgid "Material"
-msgstr "Materiale"
-
-msgid "stone"
-msgstr "sten"
-
msgid "Bollard"
msgstr "Pæl"
@@ -18399,9 +18655,6 @@ msgstr "opstigende"
msgid "removable"
msgstr "flytbar"
-msgid "plastic"
-msgstr "plastik"
-
msgid "Cycle Barrier"
msgstr "Cykelhindring"
@@ -19180,6 +19433,12 @@ msgstr "1/25 blanding (knallert)"
msgid "1/50 mix (mofa/moped)"
msgstr "1/50 blanding (knallert)"
+msgid "Additives:"
+msgstr "Tilsætningsstoffer:"
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr "Diesel udstødningsvæske (AdBlue/AUS32)"
+
msgid "Fuel cards:"
msgstr "Benzinkort:"
@@ -19891,9 +20150,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Antal skærme"
-msgid "Minimum age"
-msgstr "Minimumsalder"
-
msgid "Zoo"
msgstr "Zoo"
@@ -22089,24 +22345,6 @@ msgctxt "power"
msgid "industrial"
msgstr "industri"
-msgid "Power rating (kVA/MVA)"
-msgstr "Effekt (kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "Gas isolerede"
@@ -22132,9 +22370,6 @@ msgctxt "power"
msgid "yes"
msgstr "ja"
-msgid "Phases"
-msgstr "Faser"
-
msgid "Power Switchgear"
msgstr "Koblingsanlæg"
@@ -22154,6 +22389,25 @@ msgstr "Bugter"
msgid "Power Switch"
msgstr "Afbryder"
+msgid "Type of switch"
+msgstr "Omskiftertype"
+
+msgctxt "power"
+msgid "mechanical"
+msgstr "mekanisk"
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr "kredsløbsafbryder"
+
+msgctxt "power"
+msgid "disconnector"
+msgstr "adskiller"
+
+msgctxt "power"
+msgid "earthing"
+msgstr "jording"
+
msgid "Power Converter"
msgstr "Omformer"
@@ -22255,9 +22509,6 @@ msgstr "rørformet"
msgid "solid"
msgstr "massiv"
-msgid "steel"
-msgstr "stål"
-
msgctxt "color"
msgid "red/white"
msgstr "rød/hvid"
@@ -22420,18 +22671,21 @@ msgstr "Tredobbelt mast"
msgid "Incomplete tower"
msgstr "Ufuldstændig mast"
-msgid "Location transition"
-msgstr "Overgangssted"
-
msgid "Pole"
msgstr "Pæl"
-msgid "Pole with Transformer"
-msgstr "Pæl med transformer"
+msgid "Pole with Switch"
+msgstr "Pæl med omskifter"
msgid "Pole Attributes:"
msgstr "Pæle attributter:"
+msgid "Switch Attributes:"
+msgstr "Omskifter attributter:"
+
+msgid "Pole with Transformer"
+msgstr "Pæl med transformer"
+
msgid "Transformer Attributes:"
msgstr "Transformer attributter:"
@@ -22544,6 +22798,52 @@ msgstr "Slagmark"
msgid "Palaeontological Site"
msgstr "Palæontologisk sted"
+msgid "Grave"
+msgstr "Grav"
+
+msgid "Tomb"
+msgstr "Gravmonument"
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr "gravhøj"
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr "sten gravkammer"
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr "underjordisk gravkammer"
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr "soldatergrav"
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr "mausoleum"
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr "urnehal"
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr "krypt"
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr "pyramide"
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr "sarkofag"
+
+msgctxt "tomb"
+msgid "vault"
+msgstr "beholder"
+
msgid "Monument"
msgstr "Monument"
@@ -23321,6 +23621,9 @@ msgstr "Isoleret beboelse"
msgid "Suburb"
msgstr "Forstad"
+msgid "Quarter"
+msgstr "Kvarter"
+
msgid "Neighbourhood"
msgstr "Nabolag"
@@ -23686,6 +23989,9 @@ msgstr "Drivhusområde"
msgid "Plant Nursery"
msgstr "Planteskole"
+msgid "Salt Pond"
+msgstr "Saltdam"
+
msgid "Aquaculture"
msgstr "Akvakultur"
@@ -24295,9 +24601,19 @@ msgstr "Ruter"
msgid "Bicycle Route"
msgstr "Cykelrute"
+msgctxt "network"
+msgid "international"
+msgstr "international"
+
+msgctxt "network"
msgid "national"
msgstr "national"
+msgctxt "network"
+msgid "regional"
+msgstr "regional"
+
+msgctxt "network"
msgid "local"
msgstr "lokal"
@@ -24547,6 +24863,9 @@ msgstr "OpenStreetMap GPS Traces"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr "Offentlige GPS-spor uploadet til OpenStreetMap."
+msgid "OpenTopoMap"
+msgstr "OpenTopoMap"
+
msgid "Public Transport (ÖPNV)"
msgstr "Public Transport (ÖPNV)"
@@ -24559,8 +24878,8 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr "Stamen Terrain"
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
-msgstr "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
+msgstr "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -24638,6 +24957,14 @@ msgstr ""
"Late summer imagery where usual sources are severely limited by clouds and "
"snow (true color)"
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr "Municipality of Tirana (Open Labs GeoPortal)"
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
@@ -24970,6 +25297,9 @@ msgstr "URBIS 2015 aerial imagery"
msgid "URBIS 2016 aerial imagery"
msgstr "URBIS 2016 aerial imagery"
+msgid "URBIS 2017 aerial imagery"
+msgstr "URBIS 2017 aerial imagery"
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW(allonie) PICC numerical imagery"
@@ -24985,6 +25315,9 @@ msgstr "SPW(allonie) 2012-2013 aerial imagery"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 aerial imagery"
+msgid "SPW(allonie) shaded relief"
+msgstr "SPW(allonie) shaded relief"
+
msgid "TEC bus lines"
msgstr "TEC bus lines"
@@ -25300,6 +25633,9 @@ msgstr "BDOrtho IGN"
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
+msgid "Bordeaux - 2016"
+msgstr "Bordeaux - 2016"
+
msgid "Cadastre"
msgstr "Matrikel"
@@ -26271,6 +26607,9 @@ msgstr "Fiez Orthophoto 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr "Kanton Basel-Stadt 2015"
+msgid "Kanton Basel-Stadt 2017"
+msgstr "Kanton Basel-Stadt 2017"
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr "Kanton Basel-Landschaft 10cm (2015)"
@@ -26321,11 +26660,11 @@ msgstr "USGS Topographic Maps"
msgid "USGS Large Scale Imagery"
msgstr "USGS Large Scale Imagery"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
+msgstr "TIGER Roads 2012"
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
+msgstr "TIGER Roads 2014"
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -26336,6 +26675,16 @@ msgstr ""
"zooms, only changes since 2006 minus changes already incorporated into "
"OpenStreetMap"
+msgid "TIGER Roads 2017"
+msgstr "TIGER Roads 2017"
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
@@ -26407,6 +26756,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr "San Juan Metro Area: 2013 USACE Orthophotos"
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr "PR/USVI 2017 NOAA Hurricane Maria imagery"
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr "WA 2013 aerial imagery for San Juan County"
@@ -27517,6 +27869,16 @@ msgstr "{0} på en vej. Bør bruges på et punkt."
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} på en vej. Bør bruges i en relation"
+msgid "node connects highway and building"
+msgstr "punkt forbinder vej og bygning"
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+"Objekt ved position 0.00E 0.00N. Der er intet i denne position undtagen en "
+"allerede kortlagt vejrbøje."
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr "{0} sammen med {1} på et punkt. Fjern {0}."
@@ -27589,16 +27951,6 @@ msgstr ""
"{0} er tagget for det lineære vandløb. Til at tagge vandområdet brug {1} + "
"{2} i stedet."
-msgid "node connects highway and building"
-msgstr "punkt forbinder vej og bygning"
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-"Objekt ved position 0.00E 0.00N. Der er intet i denne position undtagen en "
-"allerede kortlagt vejrbøje."
-
msgid "Ferry route is not connected to the road network or branches."
msgstr "Færgerute er ikke forbundet med vejnet eller forgrening."
@@ -27651,11 +28003,11 @@ msgstr "tom værdi i semikolon-separeret ''{0}''"
msgid "numerical key"
msgstr "numerisk nøgle"
-msgid "layer tag with + sign"
-msgstr "tag på lag med + tegn"
+msgid "{0} value with + sign"
+msgstr "{0} værdi med + tegn"
-msgid "layer should be between -5 and 5"
-msgstr "lag bør være mellem -5 og 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr "{0} skal være et helt tal mellem -5 og 5"
msgid "{0} should have numbers only with optional .5 increments"
msgstr "{0} skal kun have numre med valgfri .5 intervaller"
@@ -30706,34 +31058,34 @@ msgid "Add \"source=...\" to elements?"
msgstr "Tilføj \"source=...\" til elementer?"
msgid "Download from Cadastre"
-msgstr ""
+msgstr "Download fra Matrikel"
msgid "Objects:"
-msgstr ""
+msgstr "Objekter:"
msgid "Select to download buildings in the selected download area."
-msgstr ""
+msgstr "Vælg for at downloade bygninger i det valgte downloadområde."
msgid "address"
msgstr "adresse"
msgid "Select to download addresses in the selected download area."
-msgstr ""
+msgstr "Vælg for at downloade adresser i det valgte downloadområde."
msgid "symbol"
msgstr "symbol"
msgid "Select to download symbols in the selected download area."
-msgstr ""
+msgstr "Vælg for at downloade symboler i det valgte downloadområde."
msgid "Select to download water bodies in the selected download area."
-msgstr ""
+msgstr "Vælg for at downloade vandflader i det valgte downloadområde."
msgid "parcel"
msgstr "grund"
msgid "Select to download cadastral parcels in the selected download area."
-msgstr ""
+msgstr "Vælg for at downloade matrikelgrunde i det valgte downloadområde."
msgid "parcel number"
msgstr "grundnummer"
@@ -30741,29 +31093,34 @@ msgstr "grundnummer"
msgid ""
"Select to download cadastral parcel numbers in the selected download area."
msgstr ""
+"Vælg for at downloade matrikelgrundnumre i det valgte downloadområde."
msgid "section"
msgstr "sektion"
msgid "Select to download cadastral sections in the selected download area."
msgstr ""
+"Vælg for at downloade matrikel sektioner i det valgte downloadområde."
msgid "locality"
msgstr "lokalitet"
msgid "Select to download localities in the selected download area."
-msgstr ""
+msgstr "Vælg for at downloade lokaliteter i det valgte downloadområde."
msgid "commune"
msgstr "kommune"
msgid ""
"Select to download municipality boundary in the selected download area."
-msgstr ""
+msgstr "Vælg for at downloade kommunegrænser i det valgte downloadområde."
msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
-msgstr ""
+msgstr "<html>Intet er aktiveret.<br>Vælg noget, der skal downloades.</html>"
+
+msgid "Download cadastre data"
+msgstr "Download matrikeldata"
msgid "Recipient"
msgstr "Modtager"
@@ -32689,9 +33046,6 @@ msgstr "Slet dette"
msgid "Delete this&older"
msgstr "Slet dette&ældre"
-msgid "km/h"
-msgstr "km/t"
-
msgid "Track name: "
msgstr "Spor navn: "
@@ -34205,6 +34559,9 @@ msgstr "positivt tal eller tom"
msgid "Speed:"
msgstr "Hastighed:"
+msgid "km/h"
+msgstr "km/t"
+
msgid "direction"
msgstr "retning"
@@ -35482,6 +35839,12 @@ msgstr "Vælg kun et objekt"
msgid "Select a map object"
msgstr "Vælg et kort objekt"
+msgid "Please enter minimal distance in metres"
+msgstr "Indtast mindste afstand i meter"
+
+msgid "Please enter numeric angle in degrees"
+msgstr "Indtast numerisk vinkel i grader"
+
msgid "Shape actions panel"
msgstr "Form handlings panel"
diff --git a/i18n/po/de.po b/i18n/po/de.po
index e8b281f..24fc378 100644
--- a/i18n/po/de.po
+++ b/i18n/po/de.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-09-27 19:55+0000\n"
-"Last-Translator: holger (lp) <Unknown>\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-29 18:20+0000\n"
+"Last-Translator: Klumbumbus <Unknown>\n"
"Language-Team: JOSM\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:41+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: de\n"
"X-Poedit-SearchPath-0: .\n"
"X-Poedit-Basepath: /home/simon/src/josm.all/i18n\n"
@@ -422,7 +422,7 @@ 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 ""
-"Sie wollen Punkte außerhalb des heruntergeladenen Bereichs löschen.<br>Das "
+"Sie wollen Punkte außerhalb des heruntergeladenen Gebietes löschen.<br>Das "
"kann zu Problemen führen, wenn andere Objekte (die Sie nicht sehen) diese "
"verwenden.<br>Wollen Sie die Punkte wirklich löschen?"
@@ -641,10 +641,10 @@ msgstr ""
"Webbrowser anzeigen."
msgid "Join overlapping Areas"
-msgstr "Überlappende Flächen verbinden"
+msgstr "Überlappende Gebiete verbinden"
msgid "Joins areas that overlap each other"
-msgstr "Sich überlappende Flächen miteinander verbinden"
+msgstr "Sich überlappende Gebiete miteinander verbinden"
msgid "Please select at least one closed way that should be joined."
msgstr ""
@@ -706,7 +706,7 @@ msgid "Delete Ways that are not part of an inner multipolygon"
msgstr "Linien entfernen, die nicht Teil eines inneren Multipolygons sind"
msgid "Joined overlapping areas"
-msgstr "Überlappende Flächen verbunden"
+msgstr "Überlappende Gebiete verbunden"
msgid ""
"Some of the ways were part of relations that have been modified.<br>Please "
@@ -752,7 +752,7 @@ msgid "Remove tags from inner ways"
msgstr "Merkmale von inneren Linien entfernen"
msgid "Join Areas Function"
-msgstr "Funktion zum Flächen verbinden"
+msgstr "Funktion zum Gebiete verbinden"
msgid "Join Node to Way"
msgstr "Punkt mit der Linie verbinden"
@@ -1934,8 +1934,8 @@ msgstr ""
msgid ""
"Request a smaller area to make sure that all notes are being downloaded."
msgstr ""
-"Fordern Sie einen kleineren Bereich an, um sicherzustellen, dass alle "
-"Notizen heruntergeladen werden."
+"Fordern Sie ein kleineres Gebiet an, um sicherzustellen, dass alle Notizen "
+"heruntergeladen werden."
msgid "More notes to download"
msgstr "Weitere Hinweise zum Herunterladen"
@@ -2213,7 +2213,7 @@ msgid "Extrude"
msgstr "Ausziehen"
msgid "Create areas"
-msgstr "Flächen erstellen"
+msgstr "Gebiete erstellen"
msgid "Extrude Dual alignment"
msgstr "Ausziehen: doppelte Ausrichtung"
@@ -2791,12 +2791,12 @@ msgstr ""
"Objekte (und alle Linienpunkte / Relationselemente) in der aktuellen Ansicht"
msgid "objects in downloaded area"
-msgstr "Objekte im heruntergeladenen Bereich"
+msgstr "Objekte im heruntergeladenen Gebiet"
msgid "objects (and all its way nodes / relation members) in downloaded area"
msgstr ""
"Objekte (und alle Linienpunkte / Relationselemente) im heruntergeladenen "
-"Bereich"
+"Gebiet"
msgid "No match found for ''{0}''"
msgstr "Nichts gefunden für Suche ''{0}''"
@@ -3222,31 +3222,6 @@ msgstr "Ungültiger Breitenwert ''{0}''"
msgid "Illegal longitude value ''{0}''"
msgstr "Ungültiger Längenwert ''{0}''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr "Fehlendes Einstellungsverzeichnis konnte nicht erstellt werden: {0}"
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-"<html>Fehlendes Einstellungsverzeichnis konnte nicht erstellt werden: "
-"{0}</html>"
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr "Fehlendes Benutzerdatenverzeichnis konnte nicht erstellt werden: {0}"
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-"<html>Fehlendes Benutzerdatenverzeichnis konnte nicht erstellt werden: "
-"{0}</html>"
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-"Erstellen des fehlenden Zwischenspeicherverzeichnisses fehlgeschlagen: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-"<html>Erstellen des fehlenden Zwischenspeicherverzeichnisses fehlgeschlagen: "
-"{0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Temporäre Datei kann nicht gelöscht werden {0}"
@@ -3332,22 +3307,15 @@ msgstr ""
"Löschen der fehlerhaften Standardeinstellungs-Cachedatei ist fehlgeschlagen: "
"{0}"
-msgid "Paint style {0}: {1}"
-msgstr "Zeichenstil {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Ebene: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Zeichenstil {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Fehler beim Speichern der Einstellungen in ''{0}''"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Versuche IPv6-Netzwerk zu aktivieren und IPv6 vor IPv4 zu bevorzugen "
-"(funktioniert nur direkt nach dem Programmstart)."
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr ""
"Einstellung {0} wird nicht länger benutzt und wurde deshalb entfernt."
@@ -3432,7 +3400,7 @@ msgstr "Datum des Hintergrundbildes: {0}"
msgid "This imagery is marked as best in this region in other editors."
msgstr ""
"In anderen Editoren ist dieses Hintergrundbild als das beste in dieser "
-"Region gekennzeichnet."
+"Region gekennzeichnet."
msgid "{0} mirror server {1}"
msgstr "{0} Spiegelserver {1}"
@@ -3924,7 +3892,32 @@ msgid "text"
msgstr "Text"
msgid "areatext"
-msgstr "Flächentext"
+msgstr "Gebietstext"
+
+msgid "Failed to create missing preferences directory: {0}"
+msgstr "Fehlendes Einstellungsverzeichnis konnte nicht erstellt werden: {0}"
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+"<html>Fehlendes Einstellungsverzeichnis konnte nicht erstellt werden: "
+"{0}</html>"
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr "Fehlendes Benutzerdatenverzeichnis konnte nicht erstellt werden: {0}"
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+"<html>Fehlendes Benutzerdatenverzeichnis konnte nicht erstellt werden: "
+"{0}</html>"
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+"Fehlendes Zwischenspeicherverzeichnis konnte nicht erstellt werden: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+"<html>Fehlendes Zwischenspeicherverzeichnis konnte nicht erstellt werden: "
+"{0}</html>"
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Erwartetes Element ''{0}'', aber ''{1}'' erhalten"
@@ -4606,7 +4599,7 @@ msgid "No outer way for multipolygon"
msgstr "Keine äußere Linie für Multipolygon"
msgid "No area style for multipolygon"
-msgstr "Kein Flächenstil für Multipolygon"
+msgstr "Kein Gebietsstil für Multipolygon"
msgid ""
"Multipolygon relation should be tagged with area tags and not the outer way"
@@ -4634,14 +4627,17 @@ msgid ""
"the area style"
msgstr ""
"Mit dem aktuell verwendeten Kartenstil passt der Stil des äußeren Weges "
-"nicht zum Flächenzeichenstil"
+"nicht zum Gebietszeichenstil"
msgid "Area style on outer way"
-msgstr "Flächenzeichenstil auf äußerer Linie"
+msgstr "Gebietszeichenstil auf äußerer Linie"
msgid "Multipolygon is not closed"
msgstr "Multipolygon nicht geschlossen"
+msgid "Self-intersecting polygon ring"
+msgstr "Sich selbst überschneidender Multipolygon-Ring"
+
msgid "Multipolygon rings share node(s)"
msgstr "Multipolygon-Ringe teilen sich Punkte"
@@ -4741,16 +4737,16 @@ msgstr ""
"als einer Linie verwendet wird."
msgid "Areas share segment"
-msgstr "Flächen teilen Abschnitt"
+msgstr "Gebiete teilen Abschnitt"
msgid "Highways share segment with area"
-msgstr "Straßen teilen Abschnitt mit Fläche"
+msgstr "Straßen teilen Abschnitt mit Gebiet"
msgid "Railways share segment with area"
-msgstr "Gleise teilen Abschnitt mit Fläche"
+msgstr "Gleise teilen Abschnitt mit Gebiet"
msgid "Ways share segment with area"
-msgstr "Linien teilen Abschnitt mit Fläche"
+msgstr "Linien teilen Abschnitt mit Gebiet"
msgid "Overlapping highways"
msgstr "Überlappende Straßen"
@@ -5082,7 +5078,7 @@ msgid "boundary type {0}"
msgstr "Grenz-Typ {0}"
msgid "area"
-msgstr "Fläche"
+msgstr "Gebiet"
msgid "Unconnected highways"
msgstr "Unverbundene Straßen"
@@ -5172,10 +5168,10 @@ msgid "One node ways"
msgstr "Linien, die nur aus einem Punkt bestehen"
msgid "Way connected to Area"
-msgstr "Linie mit Fläche verbunden"
+msgstr "Linie mit Gebiet verbunden"
msgid "Checks for ways connected to areas."
-msgstr "Prüft auf Linien, welche mit Fläcghen verbunden sind."
+msgstr "Prüft auf Linien, welche mit Gebieten verbunden sind."
msgid "Way terminates on Area"
msgstr "Linie endet an Gebiet"
@@ -5329,7 +5325,7 @@ msgid "Would you like to update now ?"
msgstr "Möchten Sie jetzt die Aktualisierung durchführen?"
msgid "Starting file watcher"
-msgstr "Dateiwächter starten"
+msgstr "Dateiwächter wird gestartet"
msgid "Executing platform startup hook"
msgstr "Plattform-Einschaltmethode wird ausgeführt"
@@ -5369,6 +5365,29 @@ msgstr "Bildeinstellungen werden geladen"
msgid "usage"
msgstr "Verwendung"
+msgid "commands"
+msgstr "Befehle"
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+"JOSM starten (Standard; wird ausgeführt, wenn kein Befehl angegeben wird)"
+
+msgid "render data and save the result to an image file"
+msgstr "Daten rendern und das Ergebnis in einer Bilddatei speichern"
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+"Koordinaten von einem Koordinatenreferenzsystem in ein anderes konvertieren"
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+"Für Einzelheiten zu den {0} und {1} Befehlen führen Sie diese mit der {2}-"
+"Option aus."
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr "Der Rest dieser Hilfeseite beschreibt das {0}-Kommando."
+
msgid "options"
msgstr "Optionen"
@@ -5508,6 +5527,13 @@ msgstr "Voreinstellungen werden festgelegt"
msgid "Creating main GUI"
msgstr "Hauptoberfläche wird erzeugt"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Versuche IPv6-Netzwerk zu aktivieren und IPv6 vor IPv4 zu bevorzugen "
+"(funktioniert nur direkt nach dem Programmstart)."
+
msgid "Updating plugins"
msgstr "Erweiterungen werden aktualisiert"
@@ -5830,6 +5856,9 @@ msgstr "Vergrößern"
msgid "Shrink"
msgstr "Verkleinern"
+msgid "Show downloaded area"
+msgstr "Heruntergeladenes Gebiet anzeigen"
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -6864,13 +6893,13 @@ msgid "Resolve to my versions"
msgstr "Auf meine Versionen auflösen"
msgid "Resolves all unresolved conflicts to ''my'' version"
-msgstr "Löst alle ungelösten Konflikte auf ''meine'' Version auf"
+msgstr "Löst alle ungelösten Konflikte auf ''meine'' Version auf"
msgid "Resolve to their versions"
msgstr "Auf deren Versionen auflösen"
msgid "Resolves all unresolved conflicts to ''their'' version"
-msgstr "Löst alle ungelösten Konflikte auf ''deren'' Version auf"
+msgstr "Löst alle ungelösten Konflikte auf ''deren'' Version auf"
msgid "There was {0} conflict detected."
msgid_plural "There were {0} conflicts detected."
@@ -8872,6 +8901,9 @@ msgstr ""
"Objekt<br>''{1}''.<br>Bitte erst den Konflikt lösen und danach wieder "
"versuchen.</html>"
+msgid "Select the currently edited relation"
+msgstr "Die momentan bearbeitete Relation auswählen"
+
msgid "Select objects for selected relation members"
msgstr "Wählen Sie Objekte für die ausgewählten Relationselemente aus"
@@ -8956,29 +8988,32 @@ msgid "Bookmarks"
msgstr "Lesezeichen"
msgid "<html>There is currently no download area selected.</html>"
-msgstr "<html>Es ist kein Ladebereich ausgewählt.</html>"
+msgstr "<html>Es ist momentan kein Herunterladegebiet ausgewählt.</html>"
msgid ""
"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
"maxlat): </html>"
msgstr ""
-"<html><strong>Aktueller Ladebereich</strong> (min. Länge, min. Breite, max. "
-"L., max. Br.): </html>"
+"<html><strong>Aktuelles Herunterladegebiet</strong> (min. Länge, min. "
+"Breite, max. L., max. Br.): </html>"
msgid "Create bookmark"
msgstr "Lesezeichen erstellen"
msgid "Add a bookmark for the currently selected download area"
-msgstr "Fügen Sie ein Lesezeichen für den aktuellen Ladebereich hinzu"
+msgstr ""
+"Lesezeichen für das aktuell ausgewählte Herunterladegebiet hinzufügen"
msgid ""
"Currently, there is no download area selected. Please select an area first."
msgstr ""
-"Es ist kein Ladebereich ausgewählt. Bitte wählen Sie zunächst einen Bereich "
-"aus."
+"Es ist kein Herunterladegebiet ausgewählt. Bitte wählen Sie zuerst ein "
+"Gebiet aus."
msgid "Please enter a name for the bookmarked download area."
-msgstr "Bitte geben Sie einen Namen für das Lesezeichen ein."
+msgstr ""
+"Bitte geben Sie einen Namen für das zu den Lesezeichen hinzugefügte "
+"Herunterladegebiet ein."
msgid "Name of location"
msgstr "Name des Ortes"
@@ -9011,8 +9046,8 @@ msgid ""
"URL from www.openstreetmap.org (you can paste an URL here to download the "
"area)"
msgstr ""
-"Adresse von www.openstreetmap.org (hier eine Adresse einfügen, um einen "
-"Bereich zu laden)"
+"Adresse von www.openstreetmap.org (hier eine Adresse einfügen, um ein Gebiet "
+"zu herunterzuladen)"
msgid "Bounding Box"
msgstr "Koordinaten"
@@ -9065,7 +9100,7 @@ msgstr ""
"Klicken, um das Fenster zu schließen und das Herunterladen abzubrechen"
msgid "Click to download the currently selected area"
-msgstr "Klicken Sie, um die derzeitig ausgewählten Bereiche herunterzuladen"
+msgstr "Klicken Sie, um das derzeitig ausgewählte Gebiet herunterzuladen"
msgid "Download referrers (parent relations)"
msgstr "Verweise herunterladen (Eltern-Relationen)"
@@ -9102,20 +9137,22 @@ msgstr "OpenStreetMap-Daten"
msgid "Select to download OSM data in the selected download area."
msgstr ""
-"Auswählen, um OSM-Datenobjekte im ausgewählten Ladebereich herunterzuladen."
+"Auswählen, um OSM-Datenobjekte im ausgewählten Herunterladegebiet "
+"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 herunterzuladen."
+"Auswählen, um GPS-Spuren im ausgewählten Herunterladegebiet herunterzuladen."
msgid "Select to download notes in the selected download area."
-msgstr "Auswählen, um Hinweise im ausgewählten Ladebereich herunterzuladen."
+msgstr ""
+"Auswählen, um Hinweise im ausgewählten Herunterladegebiet herunterzuladen."
msgid "Please select a download area first."
-msgstr "Bitte wählen Sie zunächst einen Ladebereich aus."
+msgstr "Bitte wählen Sie zunächst ein Herunterladegebiet aus."
msgid ""
"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> nor "
@@ -9127,23 +9164,25 @@ msgstr ""
"Hinweise oder mehrere davon zum Herunterladen auswählen.</html>"
msgid "No area selected yet"
-msgstr "Es ist kein Bereich ausgewählt"
+msgstr "Es ist kein Gebiet ausgewählt"
msgid "Download area too large; will probably be rejected by server"
-msgstr "Bereich zu groß, der Server wird das Laden wahrscheinlich ablehnen"
+msgstr "Herunterladegebiet zu groß; wird wahrscheinlich vom Server abgelehnt"
msgid "Download area ok, size probably acceptable to server"
-msgstr "Bereich korrekt, Größe ist wahrscheinlich akzeptabel für den Server"
+msgstr ""
+"Herunterladegebiet korrekt, Größe ist wahrscheinlich akzeptabel für den "
+"Server"
msgid "Download from Overpass API"
-msgstr "Von Overpass API herunterladen"
+msgstr "Von Overpass-API herunterladen"
msgid ""
"Place your Overpass query below or generate one using the Overpass Turbo "
"Query Wizard"
msgstr ""
"Geben Sie Ihre Overpass-Abfrage unterhalb ein oder erstellen Sie eine durch "
-"Verwendung des Overpass Turbo Abfrage-Wizards."
+"Verwendung des Overpass Turbo Abfrage-Wizards."
msgid "Build an Overpass query using the Overpass Turbo Query Wizard tool"
msgstr "Erstelle eine Overpass-Abfrage mit dem Overpass Turbo Abfrage-Wizard"
@@ -9158,14 +9197,14 @@ msgid "Show/hide Overpass snippet list"
msgstr "Zeige/Verstecke die Overpass Schnipsel-Liste"
msgid "Overpass query:"
-msgstr "Overpass Abfrage:"
+msgstr "Overpass-Abfrage:"
msgid ""
"You entered an empty query. Do you want to download all data in this area "
"instead?"
msgstr ""
-"Sie gaben eine leere Abfrage ein. Wollen Sie statt dessen alle Daten in "
-"diesem Bereich herunterladen?"
+"Sie gaben eine leere Abfrage ein. Möchten Sie stattdessen alle Daten in "
+"diesem Gebiet herunterladen?"
msgid "Download all data?"
msgstr "Alle Daten herunterladen?"
@@ -9201,8 +9240,8 @@ msgid ""
"Allows you to interact with <i>Overpass API</i> by writing declarative, "
"human-readable terms."
msgstr ""
-"Erlaubt Ihnen, durch das schreiben von deklarativen, menschenlesbaren "
-"Begriffen, mit der <i>Overpass API</i> zu interagieren."
+"Ermöglicht die Interaktion mit der <i>Overpass-API</i> durch das Schreiben "
+"von deklarativen, menschenlesbaren Begriffen."
msgid ""
"The <i>Query Wizard</i> tool will transform those to a valid overpass query."
@@ -9213,7 +9252,7 @@ msgid "For more detailed description see "
msgstr "Für detaillierte Beschreibung siehe "
msgid "<a href=\"{0}\">OSM Wiki</a>."
-msgstr "<a href=\"{0}\">OSM Wikii</a>."
+msgstr "<a href=\"{0}\">OSM-Wiki</a>."
msgid "Hints"
msgstr "Hinweise"
@@ -9236,8 +9275,8 @@ msgid ""
"the generated query."
msgstr ""
"{0} alle Objekte mit dem passenden Schlüssel/Wert-Paar rund um Berlin. "
-"Beachten Sie, dass der Standardwert für den Radius zu 1000m gesetzt ist, "
-"aber dies kann in der generellen Abfrage geändert werden."
+"Beachten Sie, dass der Standardwert für den Radius auf 1000 m gesetzt ist, "
+"aber dies kann in der erzeugten Abfrage geändert werden."
msgid ""
"{0} all objects within the current selection that have {1} as attribute."
@@ -9271,8 +9310,8 @@ msgid ""
"\"&\", \"&&\"."
msgstr ""
"Einfache logische Operatoren können verwendet werden, um anspruchsvollere "
-"Abfragen zu erstellen. Statt \"oder\" kann \"|\" oder \"||\", und statt "
-"\"und\" kann \"&\" oder \"&&\" verwendet werden."
+"Abfragen zu erstellen. Statt \"or\" kann \"|\" oder \"||\", und statt "
+"\"and\" kann \"&\" oder \"&&\" verwendet werden."
msgid "Class Type"
msgstr "Klassentyp"
@@ -9290,7 +9329,7 @@ msgid "Enter a place name to search for"
msgstr "Bitte den Ortsnamen eingeben, nach dem gesucht werden soll."
msgid "Areas around places"
-msgstr "Ladebereich um bestimmte Orte"
+msgstr "Gebiete um bestimmte Orte"
msgid "Search ..."
msgstr "Suchen …"
@@ -10243,9 +10282,9 @@ msgid ""
"change, you will make life<br />easier for many other mappers."
msgstr ""
"Sie haben keine Quelle für die Änderungen angegeben.<br />Dies ist technisch "
-"erlaubt, aber eine Quellenangabe erleichtert anderen Nutzern<br />die "
-"Quellen der Daten später einzuschätzen.<br /><br />Wenn Sie kurz erklären "
-"worauf die Änderungen basieren, <br />erleichtert dies die Arbeit vieler "
+"erlaubt, aber eine Quellenangabe erleichtert anderen Nutzern<br />die "
+"Quellen der Daten später einzuschätzen.<br /><br />Wenn Sie kurz erklären, "
+"worauf die Änderungen basieren,<br />erleichtert dies die Arbeit vieler "
"anderer Nutzer."
msgid "Revise"
@@ -10993,7 +11032,7 @@ msgid "Save Note file"
msgstr "Speichere Notizen-Datei"
msgid "outside downloaded area"
-msgstr "Außerhalb des heruntergeladenen Bereichs"
+msgstr "Außerhalb des heruntergeladenen Gebietes"
msgid "Data Layer {0}"
msgstr "Datenebene {0}"
@@ -11702,6 +11741,185 @@ msgstr "(Die Adresse lautet: "
msgid "Select the map painting styles"
msgstr "Wählen Sie den Kartenstil"
+msgid "Error - file not found: ''{0}''"
+msgstr "Fehler - Datei nicht gefunden: ''{0}''"
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr "Für Option {0} wurde eine Ganzzahl erwartet, aber ''{1}'' erhalten"
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+"Für Option {0} wurde eine Ganzzahl >= 0 erwartet, aber ''{1}'' erhalten"
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr "{0}-Parameter kann nicht geparst werden: {1}"
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+"Für Option {0} wurde Schlüssel und Wert getrennt durch '':'' erwartet, aber "
+"''{1}'' erhalten"
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+"Für Option {0} wurde eine Gleitkommazahl erwartet, aber ''{1}'' erhalten"
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+"Für Option {0} wurden zwei durch Komma getrennte Koordinaten erwartet, aber "
+"''{1}'' erhalten"
+
+msgid "In option {0}: {1}"
+msgstr "In Option {0}: {1}"
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+"Für Option {0} wurde eine Gleitkommazahl > 0 erwartet, aber ''{1}'' erhalten"
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+"Für Option {0} wurde eine Ganzzahl > 0 erwartet, aber ''{1}'' erhalten"
+
+msgid "JOSM rendering command line interface"
+msgstr "Befehlszeilenschnittstelle für JOSM-Rendering"
+
+msgid "Renders data and saves the result to an image file."
+msgstr "Rendert Daten und speichert das Ergebnis in einer Bilddatei."
+
+msgid "Input data file name (.osm)"
+msgstr "Name der Eingabe-Datendatei (.osm)"
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr "Name der Ausgabe-Bilddatei (.png); Voreinstellung ist ''{0}''"
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr "Für das Rendering zu verwendende Stildatei (.mapcss oder .zip)"
+
+msgid "This option can be repeated to load multiple styles."
+msgstr "Diese Option kann wiederholt werden, um mehrere Stile zu laden."
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+"Stileinstellung (in JOSM zugänglich im Stillistendialog-Rechtsklickmenü)"
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr "Bezieht sich auf den letzten mit der Option {0} geladenen Stil."
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+"Zu rendernde Zoomstufe auswählen. (Ganzzahl, 0=ganze Erde, 18=Straßenebene)"
+
+msgid "Select the map scale"
+msgstr "Den Kartenmaßstab auswählen"
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+"Ein Wert von 10000 bedeutet einen Maßstab von 1:10000 (1 cm auf der Karte "
+"entspricht 100 m auf dem Land; Bildschirmauflösung: 96 dpi)"
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr "Optionen {0} und {1} schließen sich gegenseitig aus."
+
+msgid "Area to render, default value is ''{0}''"
+msgstr "Zu renderndes Gebiet, Standardwert ist ''{0}''"
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+"Mit dem Schlüsselwort ''{0}'' wird das heruntergeladene Gebiet in der .osm-"
+"Eingabedatei verwendet (falls eingetragen)."
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr "Linke untere Ecke des gerenderten Gebietes festlegen"
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+"Wird in Kombination mit Breiten- und Höhenoptionen verwendet, um das zu "
+"rendernde Gebiet festzulegen."
+
+msgid "Width of the rendered area, in meter"
+msgstr "Breite des gerenderten Gebietes, in Meter"
+
+msgid "Height of the rendered area, in meter"
+msgstr "Höhe des gerenderten Gebietes, in Meter"
+
+msgid "Width of the target image, in pixel"
+msgstr "Breite des Zielbildes, in Pixel"
+
+msgid "Height of the target image, in pixel"
+msgstr "Höhe des Zielbildes, in Pixel"
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr "Zu verwendende Projektion, Standardwert ''{0}\" (Web-Mercator)"
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+"Maximale Bildbreite/-höhe in Pixel (''{0}'' bedeutet keine Begrenzung), "
+"Standardwert: {1}"
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+"Die Optionen können auf verschiedene Arten kombiniert werden, um das "
+"gerenderte Gebiet und die Skalierung festzulegen"
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+"Wird weder ''{0}'' noch ''{1}'' angegeben, so gilt der Vorgabewert {2} und "
+"es werden die Grenzen des heruntergeladenen Gebietes in der .osm "
+"Eingabedatei verwendet."
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+"Argument {0} gegeben, aber die Skalierung kann nicht aus den restlichen "
+"Argumenten bestimmt werden"
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr "Argument {0} gegeben, {1} oder {2} erwartet"
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr "{0}-Modus, aber keine Grenzen in der osm-Dateneingabedatei gefunden"
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+"Skalierung kann nicht bestimmt werden, eine der Optionen {0}, {1}, {2} oder "
+"{3} wird erwartet"
+
+msgid "Missing argument - input data file ({0})"
+msgstr "Fehlendes Argument - Eingabedatendatei ({0})"
+
+msgid "In .osm data file ''{0}'' - "
+msgstr "In .osm-Datendatei ''{0}'' - "
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr "Fehlendes Argument - mindestens ein Stil erwartet ({0})"
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+"Bildabmessungen ({0}x{1}) überschreiten die maximale Bildgröße {2} "
+"(verwenden Sie die Option {3}, um die Begrenzung zu ändern)"
+
+msgid "Style setting not found: ''{0}''"
+msgstr "Stileinstellung nicht gefunden: ''{0}''"
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11725,6 +11943,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Kartenstile in ''{0}'' enthalten Fehler: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Fehler beim Laden des Bildes ''{0}''"
@@ -11860,7 +12083,7 @@ msgid ""
msgstr ""
"<html>Sie haben erfolgreich eine OAuth-Zugriffsmarke von der OSM-Webseite "
"erhalten. Auf <strong>{0}</strong> klicken, um die Marke zu akzeptieren. "
-"JOSM wird sie bei zukünftigen Anfragen verwenden, um Zugriff auf das OSM API "
+"JOSM wird sie bei zukünftigen Anfragen verwenden, um Zugriff auf das OSM-API "
"zu erhalten.</html>"
msgid "Authorize now"
@@ -12717,7 +12940,7 @@ msgid "Smooth map graphics in wireframe mode (antialiasing)"
msgstr "Glätten der Kartengrafik in Drahtdarstellung (Anti-Aliasing)"
msgid "Draw only outlines of areas"
-msgstr "Nur Außenlinie von Flächen zeichnen"
+msgstr "Nur Außenlinie von Gebieten zeichnen"
msgid "GPS Points"
msgstr "GPS-Punkte"
@@ -12765,7 +12988,7 @@ msgid ""
"This option suppresses the filling of areas, overriding anything specified "
"in the selected style."
msgstr ""
-"Diese Option unterdrückt die Füllung von Bereichen, vorrangig vor allem "
+"Diese Option unterdrückt die Füllung von Gebieten, vorrangig vor allem "
"anderen im ausgewählten Stil."
msgid ""
@@ -13996,7 +14219,7 @@ msgid "Permitted actions:"
msgstr "Erlaubte Aktionen:"
msgid "Testing OSM API URL ''{0}''"
-msgstr "Teste OSM API URL ''{0}''"
+msgstr "Teste OSM-API-URL ''{0}''"
msgid ""
"<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
@@ -14158,7 +14381,7 @@ msgid "The current value is not a valid URL"
msgstr "Der aktuelle Wert ist keine gültige URL."
msgid "Please enter the OSM API URL."
-msgstr "Bitte die OSM API URL eingeben."
+msgstr "Bitte die OSM-API-URL eingeben."
msgid "Use Overpass server for object downloads"
msgstr "Overpass-Server zum Herunterladen von Objekten verwenden"
@@ -14930,7 +15153,7 @@ msgid "Null pointer exception, possibly some missing tags."
msgstr "Nullzeiger-Ausnahme, vielleicht fehlende Merkmale."
msgid "OSM API"
-msgstr "OSM API"
+msgstr "OSM-API"
msgid "JOSM website"
msgstr "JOSM-Internetseite"
@@ -15656,6 +15879,21 @@ msgstr "Ebene überspringen und fortfahren"
msgid "expected .jos file inside .joz archive"
msgstr "Datei mit Endung .jos innerhalb des .joz-Archivs erwartet"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+"Fehlendes Erweiterungs-Einstellungsverzeichnis konnte nicht erstellt werden: "
+"{0}"
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+"Fehlendes Erweiterungs-Benutzerdatenverzeichnis konnte nicht erstellt "
+"werden: {0}"
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+"Fehlendes Erweiterungs-Zwischenspeicherverzeichnis konnte nicht erstellt "
+"werden: {0}"
+
msgid "Skip download"
msgstr "Herunterladen überspringen"
@@ -16385,8 +16623,8 @@ msgid ""
"large.<br>Either request a smaller area or use an export file provided by "
"the OSM community."
msgstr ""
-"Der angeforderte Bereich ist zu groß oder enthält zu viele "
-"Daten.<br>Versuchen Sie, einen kleineren Bereich herunterzuladen oder nutzen "
+"Das angeforderte Gebiet ist zu groß oder enthält zu viele "
+"Daten.<br>Versuchen Sie, ein kleineres Gebiet herunterzuladen oder nutzen "
"Sie einen Datenbankexport."
msgid ""
@@ -16642,7 +16880,7 @@ msgid ""
"area, or use planet.osm"
msgstr ""
"Sie haben zu viele Punkte angefordert (Obergrenze ist 50.000). Fordern Sie "
-"entweder einen kleineren Ausschnitt an oder nutzen Sie die Datei planet.osm."
+"entweder ein kleineres Gebiet an oder nutzen Sie die Datei planet.osm."
msgid "Database offline for maintenance"
msgstr "Datenbank ist zur Wartung offline"
@@ -16656,8 +16894,8 @@ msgid ""
"The maximum bbox size is 0.25, and your request was too large. Either "
"request a smaller area, or use planet.osm"
msgstr ""
-"Die maximale Downloadgröße ist 0.25 und Ihre Anfrage war zu groß. Fordern "
-"Sie entweder einen kleineren Ausschnitt an oder nutzen Sie die Datei "
+"Die maximale Herunterladegröße ist 0.25 und Ihre Anfrage war zu groß. "
+"Fordern Sie entweder ein kleineres Gebiet an oder nutzen Sie die Datei "
"planet.osm."
msgid "JOSM-Trac login at josm.openstreetmap.de"
@@ -17268,6 +17506,12 @@ msgstr "Motorrad"
msgid "Motorcar"
msgstr "Automobil"
+msgid "Minimum age"
+msgstr "Mindestalter"
+
+msgid "Maximum age"
+msgstr "Maximales Alter"
+
msgid "Reference"
msgstr "Referenz"
@@ -17915,6 +18159,10 @@ msgid "platform"
msgstr "Plattform"
msgctxt "power"
+msgid "rooftop"
+msgstr "Hausdach"
+
+msgctxt "power"
msgid "kiosk"
msgstr "Kiosk"
@@ -17963,6 +18211,42 @@ msgstr "Dampf"
msgid "vacuum"
msgstr "Vacuum"
+msgid "Material"
+msgstr "Material"
+
+msgid "plastic"
+msgstr "Kunststoff"
+
+msgid "steel"
+msgstr "Stahl"
+
+msgid "stone"
+msgstr "Stein"
+
+msgid "Location transition"
+msgstr "Lageübergang"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Nennleistung (kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Phasen"
+
msgid "Max. weight (tonnes)"
msgstr "Max. Gewicht (Tonnen)"
@@ -18132,7 +18416,7 @@ msgid "right_of:1"
msgstr "rechts von 1. Spur"
msgid "right_of:2"
-msgstr "rechts von 2. Spur"
+msgstr "rechts von 2. Spur"
msgid "right_of:3"
msgstr "rechts von 3. Spur"
@@ -18224,7 +18508,7 @@ msgid "Pedestrian"
msgstr "Fußgängerzone"
msgid "Area"
-msgstr "Fläche"
+msgstr "Gebiet"
msgid "Service"
msgstr "Zufahrtsstraße"
@@ -18912,12 +19196,6 @@ msgstr "Barrieren"
msgid "Block"
msgstr "Steinblock"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "Stein"
-
msgid "Bollard"
msgstr "Poller"
@@ -18930,9 +19208,6 @@ msgstr "ausfahrend"
msgid "removable"
msgstr "entfernbar"
-msgid "plastic"
-msgstr "Kunststoff"
-
msgid "Cycle Barrier"
msgstr "Umlaufgitter"
@@ -19218,7 +19493,7 @@ msgstr "Feuchtgebiet"
msgid "Waterlogged area, either permanently or seasonally with vegetation."
msgstr ""
-"Wassergesättigter Bereich, entweder dauerhaft oder saisonal mit Vegetation."
+"Wassergesättigtes Gebiet, entweder dauerhaft oder saisonal mit Vegetation."
msgid "swamp"
msgstr "Bruchwald"
@@ -19435,7 +19710,7 @@ msgid "CNG (Compressed Natural Gas)"
msgstr "CNG (komprimiertes Erdgas)"
msgid "Pier"
-msgstr "Anlegestelle (Pier)"
+msgstr "Pier"
msgid "Mooring"
msgstr "Liegeplatz"
@@ -19714,6 +19989,12 @@ msgstr "1:25 Gemisch (Mofa/Moped)"
msgid "1/50 mix (mofa/moped)"
msgstr "1:50 Gemisch (Mofa/Moped)"
+msgid "Additives:"
+msgstr "Zusatzstoffe:"
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr "Harnstofflösung (AdBlue/AUS32)"
+
msgid "Fuel cards:"
msgstr "Tankkarten:"
@@ -20425,9 +20706,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Anzahl Leinwände"
-msgid "Minimum age"
-msgstr "Mindestalter"
-
msgid "Zoo"
msgstr "Zoo"
@@ -21089,7 +21367,7 @@ msgid "street (up to 20m)"
msgstr "Straße (bis zu 20 m)"
msgid "area (more than 20m)"
-msgstr "Bereich (mehr als 20 m)"
+msgstr "Gebiet (mehr als 20 m)"
msgid "Shows current date"
msgstr "Datumsanzeige"
@@ -22623,24 +22901,6 @@ msgctxt "power"
msgid "industrial"
msgstr "Industrie"
-msgid "Power rating (kVA/MVA)"
-msgstr "Nennleistung (kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "Gas-isoliert"
@@ -22666,9 +22926,6 @@ msgctxt "power"
msgid "yes"
msgstr "Ja"
-msgid "Phases"
-msgstr "Phasen"
-
msgid "Power Switchgear"
msgstr "Schaltwerk"
@@ -22688,6 +22945,25 @@ msgstr "Schaltfeld"
msgid "Power Switch"
msgstr "Leistungsschalter"
+msgid "Type of switch"
+msgstr "Schaltertyp"
+
+msgctxt "power"
+msgid "mechanical"
+msgstr "mechanisch"
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr "Trennung unter Last"
+
+msgctxt "power"
+msgid "disconnector"
+msgstr "Trennung ohne Last"
+
+msgctxt "power"
+msgid "earthing"
+msgstr "Erdung"
+
msgid "Power Converter"
msgstr "Spannungsumformer"
@@ -22789,9 +23065,6 @@ msgstr "röhrenartig"
msgid "solid"
msgstr "massiv"
-msgid "steel"
-msgstr "Stahl"
-
msgctxt "color"
msgid "red/white"
msgstr "rot/weiß"
@@ -22954,18 +23227,21 @@ msgstr "Dreifachmast"
msgid "Incomplete tower"
msgstr "Unvollständiger Mast"
-msgid "Location transition"
-msgstr "Lageübergang"
-
msgid "Pole"
msgstr "Kleiner Freileitungsmast"
-msgid "Pole with Transformer"
-msgstr "Kleiner Freileitungsmast mit Transformator"
+msgid "Pole with Switch"
+msgstr "Mast mit Schalter"
msgid "Pole Attributes:"
msgstr "Mast-Attribute:"
+msgid "Switch Attributes:"
+msgstr "Schalter-Attribute:"
+
+msgid "Pole with Transformer"
+msgstr "Kleiner Freileitungsmast mit Transformator"
+
msgid "Transformer Attributes:"
msgstr "Transformator-Attribute"
@@ -23078,6 +23354,52 @@ msgstr "Schlachtfeld"
msgid "Palaeontological Site"
msgstr "Paläontologische Stätte"
+msgid "Grave"
+msgstr "Grab"
+
+msgid "Tomb"
+msgstr "Grabmal"
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr "Hügelgrab"
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr "Felsengrab"
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr "Hypogäum"
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr "Kriegsgrab"
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr "Mausoleum"
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr "Kolumbarium"
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr "Gruft"
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr "Pyramide"
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr "Sarkophag"
+
+msgctxt "tomb"
+msgid "vault"
+msgstr "Gewölbe"
+
msgid "Monument"
msgstr "monumentale Gedenkstätte"
@@ -23855,6 +24177,9 @@ msgstr "Abgelegene Wohnstätte"
msgid "Suburb"
msgstr "Stadtteil"
+msgid "Quarter"
+msgstr "Viertel"
+
msgid "Neighbourhood"
msgstr "Nachbarschaft"
@@ -24226,6 +24551,9 @@ msgstr "Gewächshäuser"
msgid "Plant Nursery"
msgstr "Gärtnerei/Pflanzschule/Baumschule"
+msgid "Salt Pond"
+msgstr "Salzteich"
+
msgid "Aquaculture"
msgstr "Aquakultur"
@@ -24836,9 +25164,19 @@ msgstr "Routen"
msgid "Bicycle Route"
msgstr "Fahrradroute"
+msgctxt "network"
+msgid "international"
+msgstr "international"
+
+msgctxt "network"
msgid "national"
msgstr "national"
+msgctxt "network"
+msgid "regional"
+msgstr "regional"
+
+msgctxt "network"
msgid "local"
msgstr "lokal"
@@ -25039,9 +25377,9 @@ msgid ""
"select regions filled with +Vivid or custom area of interest imagery, 50cm "
"resolution or better, and refreshed more frequently with ongoing updates."
msgstr ""
-"DigitalGlobe-Premium ist ein Mosaik bestehend aus DigitalGlobe basemap mit "
-"ausgewählten Regionen gefüllt mit +Vivid oder benutzerdefinierten Flächen "
-"mit Interessebildern."
+"DigitalGlobe-Premium ist ein Mosaik bestehend aus DigitalGlobe-Basiskarte "
+"mit ausgewählten Regionen gefüllt mit +Vivid oder benutzerdefinierten "
+"Flächen mit Interessebildern."
msgid "DigitalGlobe Standard Imagery"
msgstr "DigitalGlobe Standard Luftbilder"
@@ -25089,6 +25427,9 @@ msgstr "OpenStreetMap GPS-Spuren"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr "Öffentliche GPS-Spuren auf OpenStreetMap hochgeladen."
+msgid "OpenTopoMap"
+msgstr "OpenTopoMap"
+
msgid "Public Transport (ÖPNV)"
msgstr "Öffentlicher Personennahverkehr (ÖPNV)"
@@ -25101,8 +25442,8 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr "Stamen Gelände"
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
-msgstr "Kambodscha, Laos, Thailand, Vietnam, Myanmar zweisprachig"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
+msgstr "Kambodscha, Laos, Thailand, Vietnam, Malaysia, Myanmar zweisprachig"
msgid "OpenPT Map (overlay)"
msgstr "OpenPT-Karte (Einblendung)"
@@ -25160,7 +25501,7 @@ msgid "OSM Inspector: Highways"
msgstr "OSM-Inspektor: Straßen"
msgid "OSM Inspector: Area"
-msgstr "OSM-Inspektor: Bereich"
+msgstr "OSM-Inspektor: Gebiet"
msgid "OSM Inspector: Routing"
msgstr "OSM-Inspektor: Routing"
@@ -25182,6 +25523,15 @@ msgstr ""
"Bildmaterial vom Spätsommer, wo übliche Quellen durch Wolken und Schnee "
"stark eingeschränkt sind (Echtfarben)"
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr "Gemeinde Tirana (Open Labs GeoPortal)"
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+"Straßen & Gebäude, die von der Gemeinde Tirana zur Verfügung gestellt und "
+"von Open Labs gehostet werden"
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
"imagico.de OSM Bilder für die Kartierung: Südliches Transantarktisches "
@@ -25496,7 +25846,7 @@ msgstr ""
"Referenzdatei)"
msgid "URBISfr numerical imagery (2013)"
-msgstr "URBISfr (Haus-)Nummernkarten (2013)"
+msgstr "URBISfr (Haus-)Nummernkarten (2013)"
msgid "URBISfr numerical imagery"
msgstr "URBISfr (Haus-)Nummernkarten"
@@ -25505,7 +25855,7 @@ msgid "URBISnl numerical imagery (2013)"
msgstr "URBISnl (Haus-)Nummernkarten (2013)"
msgid "URBISnl numerical imagery"
-msgstr "URBISnl (Haus-)Nummernkarten"
+msgstr "URBISnl (Haus-)Nummernkarten"
msgid "URBIS 2009 aerial imagery"
msgstr "URBIS 2009 Luftbilder"
@@ -25522,6 +25872,9 @@ msgstr "URBIS 2015 Luftbilder"
msgid "URBIS 2016 aerial imagery"
msgstr "URBIS 2016 Luftbilder"
+msgid "URBIS 2017 aerial imagery"
+msgstr "URBIS 2017 Luftbildaufnahme"
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW (Wallonie) PICC-(Haus-)Nummernkarten"
@@ -25537,6 +25890,9 @@ msgstr "SPW (Wallonie) 2012-2013 Luftbilder"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW (Wallonie) 2009-2010 Luftbilder"
+msgid "SPW(allonie) shaded relief"
+msgstr "SPW(allonien) geschummertes Relief"
+
msgid "TEC bus lines"
msgstr "TEC-Buslinien"
@@ -25560,10 +25916,10 @@ msgid "For more accurate coastline and glacier mapping (true color)"
msgstr "Für genauere Küsten- und Gletscherkartierung (Echtfarben)"
msgid "IBGE Map of urban areas"
-msgstr "IBGE Karte der Stadtgebiete"
+msgstr "IBGE-Karte der Stadtgebiete"
msgid "IBGE Map of rural areas"
-msgstr "IBGE Karte der ländlichen Gebiete"
+msgstr "IBGE-Karte der ländlichen Gebiete"
msgid "IBGE federal district"
msgstr "IBGE Bundesdistrikt"
@@ -25858,6 +26214,9 @@ msgstr "BDOrtho IGN"
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
+msgid "Bordeaux - 2016"
+msgstr "Bordeaux - 2016"
+
msgid "Cadastre"
msgstr "Kataster"
@@ -26281,7 +26640,7 @@ msgid "OSMIE Baronies"
msgstr "OSMIE Baronien"
msgid "OSMIE Local Election Areas"
-msgstr "OSMIE Kommunalwahlgebiete"
+msgstr "OSMIE-Kommunalwahlgebiete"
msgid "OSMIE Dail Election Areas"
msgstr "OSMIE Dail (Unterhaus) Wahlgebiete"
@@ -26705,8 +27064,8 @@ msgid ""
"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
"municipal area. 12cm ground sample distance"
msgstr ""
-"Ausschließlich OpenStreetMap-Verwendung. Stadt von Cape Town Flächen-ortho-"
-"Foto der städtischen Fläche. 12m Bodenprobenabstand"
+"Ausschließliche OpenStreetMap-Verwendung. Luftbildaufnahme des "
+"Gemeindegebietes der Stadt Kapstadt. 12 cm Bodenprobenabstand"
msgid "City of Cape Town 2015 Aerial"
msgstr "Stadt Kapstadt 2015 Luftbilder"
@@ -26715,8 +27074,8 @@ msgid ""
"OpenStreetMap use only. City of Cape Town Aerial ortho-photography of the "
"municipal area. 8cm ground sample distance"
msgstr ""
-"Ausschließlich OpenStreetMap-Verwendung. Stadt von Cape Town Flächen-ortho-"
-"Foto der städtischen Fläche. 8m Bodenprobenabstand"
+"Ausschließliche OpenStreetMap-Verwendung. Luftbildaufnahme des "
+"Gemeindegebietes der Stadt Kapstadt. 8 m Bodenprobenabstand"
msgid "South Africa CD:NGI Aerial"
msgstr "South Africa CD:NGI Aerial (Luftbild)"
@@ -26843,6 +27202,9 @@ msgstr "Fiez Orthophoto 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr "Kanton Basel-Stadt 2015"
+msgid "Kanton Basel-Stadt 2017"
+msgstr "Kanton Basel-Stadt 2017"
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr "Kanton Basel-Landschaft 10cm (2015)"
@@ -26896,11 +27258,11 @@ msgstr "USGS Topografische Karten"
msgid "USGS Large Scale Imagery"
msgstr "USGS Großflächige Bilder"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012-Straßeneinblendung"
+msgid "TIGER Roads 2012"
+msgstr "TIGER-Straßen 2012"
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "Neue & falsch ausgerichtete TIGER-Straßen (2015)"
+msgid "TIGER Roads 2014"
+msgstr "TIGER-Straßen 2014"
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -26911,6 +27273,16 @@ msgstr ""
"Zoomstufen nur Änderungen seit 2006 minus bereits in OpenStreetMap "
"befindlichen Änderungen"
+msgid "TIGER Roads 2017"
+msgstr "TIGER-Straßen 2017"
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+"Gelb = Gemeinfreie Kartendaten vom US-Zensus. Rot = Daten in OpenStreetMap "
+"nicht gefunden"
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parzellen"
@@ -26934,9 +27306,9 @@ msgid ""
"of North Carolina. The coverage area and pixel resolution varies for each "
"year."
msgstr ""
-"Dieses Sevice repräsentiert ortho-Fotos welche von 1995-2013 für den Staat "
-"North Carolina gesammelt wurden. Die abgedeckte Fläche und Pixelauflösung "
-"unterscheidet sich für jedes Jahr."
+"Dieser Dienst stellt die von 1995-2013 für den Bundesstaat North Carolina "
+"gesammelten Orthofotos dar. Der Erfassungsbereich und die Pixelauflösung "
+"unterscheiden sich für jedes Jahr."
msgid "U.S. Forest Service roads"
msgstr "U.S. Waldwege"
@@ -26980,6 +27352,9 @@ msgstr "Digitales Luftbild von New Jersey, Naturfarbe, Auflösung 30cm"
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr "Metropolregion San Juan: 2013 USACE Orthofotos"
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr "PR/USVI 2017 NOAA Hurrikan Maria Luftbilder"
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr "WA 2013 Luftbilder für San Juan County"
@@ -28119,6 +28494,16 @@ 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"
+msgid "node connects highway and building"
+msgstr "Punkt verbindet Straße und Gebäude"
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+"Objekt an Position 0.00E 0.00N. Hier ist nichts an dieser Position außer "
+"einer, bereits gemappten, Wetter-Boje."
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr "{0} zusammen mit {1} auf einem Punkt. Entfernen Sie {0}."
@@ -28191,16 +28576,6 @@ msgstr ""
"{0} ist das Merkmal für einen linearen Wasserweg. Um die Wasserfläche zu "
"erfassen stattdessen {1} + {2} benutzen."
-msgid "node connects highway and building"
-msgstr "Punkt verbindet Straße und Gebäude"
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-"Objekt an Position 0.00E 0.00N. Hier ist nichts an dieser Position außer "
-"einer, bereits gemappten, Wetter-Boje."
-
msgid "Ferry route is not connected to the road network or branches."
msgstr "Fährenroute ist mit keinem Straßennetz und mit keinem Ast verbunden."
@@ -28255,11 +28630,11 @@ msgstr "Leerer Wert in Semikolon-getrenntem ''{0}''"
msgid "numerical key"
msgstr "Numerischer Schlüssel"
-msgid "layer tag with + sign"
-msgstr "Ebenenschlüssel mit + Symbol"
+msgid "{0} value with + sign"
+msgstr "{0} Wert mit Pluszeichen"
-msgid "layer should be between -5 and 5"
-msgstr "Ebene sollte zwischen -5 und 5 liegen"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr "{0} sollte ein Ganzzahlwert zwischen -5 und 5 sein"
msgid "{0} should have numbers only with optional .5 increments"
msgstr "{0} sollte nur Zahlen mit optionalen 0.5-Schritten aufweisen"
@@ -28319,7 +28694,7 @@ msgid "{0} relation without {0} tag"
msgstr "{0} Relation ohne {0} Merkmal"
msgid "way with {0} is part of a bicycle route relation"
-msgstr "Weg mit {0} ist Teil einer Fahrradroutenrelation"
+msgstr "Linie mit {0} ist Teil einer Fahrradroutenrelation"
msgid "religion without denomination"
msgstr "Religion ohne Konfession"
@@ -28779,7 +29154,7 @@ msgstr "Fügt Abbiegeverbote nach links für 4 oder 5 ausgewählte Linien hinzu"
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
"Ermöglicht das unmittelbare Zuordnen von Merkmalen zu allen Objekten eines "
-"ausgewählten Bereichs"
+"ausgewählten Gebietes"
msgid "NanoLog adjustment and browsing layer"
msgstr "NanoLog-Anpassung und Navigationsebene"
@@ -28810,7 +29185,7 @@ msgstr "erweiterte Optionen zum Bearbeiten von Öffnungszeiten"
msgid ""
"Allows opening gpx/osm files that intersect the currently visible screen area"
msgstr ""
-"Erlaubt das Öffnen von GPX- oder OSM-Dateien, welche den aktuellen Bereich "
+"Erlaubt das Öffnen von GPX- oder OSM-Dateien, welche das aktuelle Gebiet "
"schneiden."
msgid ""
@@ -30211,8 +30586,8 @@ msgid ""
"The downloaded OSM area is too big. Download mode has been changed to OSM "
"area until the layer is restarted."
msgstr ""
-"Der heruntergeladene OSM-Bereich ist zu groß. Herunterlademodus wurde auf "
-"OSM-Bereich geändert, bis die Ebene neu gestartet wird."
+"Das heruntergeladene OSM-Gebiet ist zu groß. Herunterlademodus wurde auf OSM-"
+"Gebiet geändert, bis die Ebene neu gestartet wird."
msgid "Downloading"
msgstr "Wird heruntergeladen"
@@ -30737,10 +31112,10 @@ msgstr ""
"<html>\n"
"<div style=\"font-family:sans-serif\">\n"
"<ul>\n"
-" <li><b>Den auszurichtenden Abschnitt auswählen.</b> Dies ist einfach "
-"durch <b><i><span style=\"color:green\">Klick</span></i></b>en auf einen "
-"anderen Abschnitt möglich. Der Drehpunkt (standardmäßig im Abschnittzentrum) "
-"wird hervorgehoben.\n"
+" <li><b>Den auszurichtenden Abschnitt auswählen.</b> Dies ist einfach durch "
+"<b><i><span style=\"color:green\">Klick</span></i></b>en auf einen anderen "
+"Abschnitt möglich. Der Drehpunkt (standardmäßig im Abschnittszentrum) wird "
+"hervorgehoben.\n"
" </li>\n"
"</ul>\n"
"</div>\n"
@@ -30885,16 +31260,16 @@ msgid "Tools: {0}"
msgstr "Werkzeuge: {0}"
msgid "Area Selection"
-msgstr "Flächenauswahl"
+msgstr "Gebietsauswahl"
msgid "Select an area (e.g. building) from an underlying image."
msgstr "Eine Fläche (z.B. Gebäude) vom unterliegenden Bild auswählen."
msgid "Area Selector"
-msgstr "Flächenauswahl"
+msgstr "Gebietsauswahl"
msgid "Trying to detect an area at:"
-msgstr "Versuche eine Fläche zu erkennen bei:"
+msgstr "Versuche ein Gebiet zu erkennen bei:"
msgid "create building"
msgstr "Gebäude erstellen"
@@ -30929,7 +31304,7 @@ msgstr ""
"finden können."
msgid "Area Selector - Preferences"
-msgstr "Flächenauswahl - Einstellungen"
+msgstr "Gebietsauswahl - Einstellungen"
msgid "Settings for the area detection algorithm."
msgstr "Einstellungen für den Gebietserkennungsalgorithmus"
@@ -31382,30 +31757,34 @@ msgid "Objects:"
msgstr "Objekte:"
msgid "Select to download buildings in the selected download area."
-msgstr "Auswählen, um Gebäude im ausgewählten Ladebereich herunterzuladen."
+msgstr ""
+"Auswählen, um Gebäude im ausgewählten Herunterladegebiet herunterzuladen."
msgid "address"
msgstr "Adresse"
msgid "Select to download addresses in the selected download area."
-msgstr "Auswählen, um Adressen im ausgewählten Ladebereich herunterzuladen."
+msgstr ""
+"Auswählen, um Adressen im ausgewählten Herunterladegebiet herunterzuladen."
msgid "symbol"
msgstr "Symbol"
msgid "Select to download symbols in the selected download area."
-msgstr "Auswählen, um Symbole im ausgewählten Ladebereich herunterzuladen."
+msgstr ""
+"Auswählen, um Symbole im ausgewählten Herunterladegebiet herunterzuladen."
msgid "Select to download water bodies in the selected download area."
msgstr ""
-"Auswählen, um Wasserflächen im ausgewählten Ladebereich herunterzuladen."
+"Auswählen, um Wasserflächen im ausgewählten Herunterladegebiet "
+"herunterzuladen."
msgid "parcel"
msgstr "Paket"
msgid "Select to download cadastral parcels in the selected download area."
msgstr ""
-"Auswählen, um Flurstücke im ausgewählten Ladebereich herunterzuladen."
+"Auswählen, um Flurstücke im ausgewählten Herunterladegebiet herunterzuladen."
msgid "parcel number"
msgstr "Paketnummer"
@@ -31413,21 +31792,23 @@ msgstr "Paketnummer"
msgid ""
"Select to download cadastral parcel numbers in the selected download area."
msgstr ""
-"Auswählen, um Flurstücknummern im ausgewählten Ladebereich herunterzuladen."
+"Auswählen, um Flurstücknummern im ausgewählten Herunterladegebiet "
+"herunterzuladen."
msgid "section"
msgstr "Abschnitt"
msgid "Select to download cadastral sections in the selected download area."
msgstr ""
-"Auswählen, um Katasterabschnitte im ausgewählten Ladebereich herunterzuladen."
+"Auswählen, um Katasterabschnitte im ausgewählten Herunterladegebiet "
+"herunterzuladen."
msgid "locality"
msgstr "Ortschaft"
msgid "Select to download localities in the selected download area."
msgstr ""
-"Auswählen, um Ortschaften im ausgewählten Ladebereich herunterzuladen."
+"Auswählen, um Ortschaften im ausgewählten Herunterladegebiet herunterzuladen."
msgid "commune"
msgstr "Gemeinde"
@@ -31435,7 +31816,8 @@ msgstr "Gemeinde"
msgid ""
"Select to download municipality boundary in the selected download area."
msgstr ""
-"Auswählen, um Gemeindegrenze im ausgewählten Ladebereich herunterzuladen."
+"Auswählen, um Gemeindegrenze im ausgewählten Herunterladegebiet "
+"herunterzuladen."
msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
@@ -31443,6 +31825,9 @@ msgstr ""
"<html>Es ist nichts aktiviert.<br>Bitte etwas zum Herunterladen "
"auswählen.</html>"
+msgid "Download cadastre data"
+msgstr "Katasterdaten herunterladen"
+
msgid "Recipient"
msgstr "Empfänger"
@@ -32277,12 +32662,12 @@ msgid ""
"Max area to download in degrees^2. Increasing this number will cause the "
"plugin to download areas when you are zoomed far out."
msgstr ""
-"Maximal heruntergeladene Fläche in Grad². Eine Vergrößerung dieser Zahl "
-"sorgt dafür, dass Flächen heruntergeladen werden, wenn weit herausgezoomt "
+"Maximal heruntergeladenes Gebiet in Grad². Eine Vergrößerung dieser Zahl "
+"sorgt dafür, dass Gebiete heruntergeladen werden, wenn weit herausgezoomt "
"wird."
msgid "Max download area"
-msgstr "Max. Herunterladebereich"
+msgstr "Max. Herunterladegebiet"
msgid "The strategy for finding what areas to request from the server."
msgstr ""
@@ -33400,9 +33785,6 @@ msgstr "Dies löschen"
msgid "Delete this&older"
msgstr "Dies und älteres löschen"
-msgid "km/h"
-msgstr "km/h"
-
msgid "Track name: "
msgstr "Spurname: "
@@ -33855,7 +34237,7 @@ msgid "Selection Length"
msgstr "Auswahllänge"
msgid "Selection Area"
-msgstr "Auswahlfläche"
+msgstr "Auswahlgebiet"
msgid "Selection Radius"
msgstr "Auswahlradius"
@@ -34954,6 +35336,9 @@ msgstr "positive Zahl oder leer"
msgid "Speed:"
msgstr "Geschwindigkeit:"
+msgid "km/h"
+msgstr "km/h"
+
msgid "direction"
msgstr "Richtung"
@@ -35211,7 +35596,7 @@ msgid "The file must begin with a polygon name"
msgstr "Die Datei muss mit einem Polygonnamen beginnen"
msgid "There are less than 2 points in an area"
-msgstr "Es sind weniger als 2 Punkte in diesem Bereich"
+msgstr "Es sind weniger als 2 Punkte in diesem Gebiet"
msgid "A polygon coordinate line must contain exactly 2 numbers"
msgstr "Eine Polygonkoordinatenlinie muss genau 2 Nummern beinhalten"
@@ -35777,7 +36162,7 @@ msgstr ""
"hinzufügen"
msgid "Move area tags from contour to relation"
-msgstr "Merkmale der Fläche von der Kontur in die Relation verschieben"
+msgstr "Merkmale der Gebietes von der Kontur in die Relation verschieben"
msgid "When moving tags, consider even non-repeating ones"
msgstr ""
@@ -36260,6 +36645,12 @@ msgstr "Nur ein Objekt auswählen"
msgid "Select a map object"
msgstr "Ein Kartenobjekt auswählen"
+msgid "Please enter minimal distance in metres"
+msgstr "Bitte minimalen Abstand in Metern eingeben"
+
+msgid "Please enter numeric angle in degrees"
+msgstr "Bitte numerischen Winkel in Grad eingeben"
+
msgid "Shape actions panel"
msgstr "Formaktionen-Bedienfeld"
@@ -36306,10 +36697,10 @@ msgid "Delete overlay"
msgstr "Einblendung löschen"
msgid "Simplify Area"
-msgstr "Fläche vereinfachen"
+msgstr "Gebiet vereinfachen"
msgid "Delete unnecessary nodes from an area."
-msgstr "Unnötige Punkte aus Flächen entfernen"
+msgstr "Unnötige Punkte aus Gebieten entfernen"
msgid "Yes, delete nodes"
msgstr "Ja, Punkte löschen"
@@ -36735,7 +37126,7 @@ msgid "Setting new URL: "
msgstr "Neue URL festlegen: "
msgid "Set download area (m²)"
-msgstr "Herunterladebereich festlegen (m²)"
+msgstr "Herunterladegebiet festlegen (m²)"
msgid "~.02"
msgstr "~.02"
@@ -38576,8 +38967,8 @@ msgid ""
"an entire way first.</html>"
msgstr ""
"<html>Weder ein Punkt, noch eine Linie mit einem Endpunkt außerhalb "
-"des<br>aktuellen Ladebereichs ist ausgewählt.<br>Wählen Sie zunächst einen "
-"Punkt am Anfang oder Ende einer Linie oder die ganze Linie aus."
+"des<br>aktuellen Herunterladegebietes ist ausgewählt.<br>Wählen Sie zunächst "
+"einen Punkt am Anfang oder Ende einer Linie oder die ganze Linie aus."
msgid "<html>Could not find a unique node to start downloading from.</html>"
msgstr ""
@@ -38825,7 +39216,7 @@ msgid "View image"
msgstr "Bild anzeigen"
msgid "View %name% article"
-msgstr "Artikel %name% anzeigen"
+msgstr "%name%-Artikel anzeigen"
msgid "View Wikidata page"
msgstr "Wikidata-Seite anzeigen"
diff --git a/i18n/po/de_DE.po b/i18n/po/de_DE.po
index 2db0edb..4e03994 100644
--- a/i18n/po/de_DE.po
+++ b/i18n/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2011-07-10 12:32+0000\n"
"Last-Translator: ralekuja <Unknown>\n"
"Language-Team: German (Germany) <de_DE at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 05:06+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2919,24 +2919,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3003,18 +2985,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3528,6 +3505,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4196,6 +4191,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4884,6 +4882,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5011,6 +5028,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr "Erzeuge Hauptfenster"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5308,6 +5330,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8049,6 +8074,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10537,6 +10565,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10555,6 +10733,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13974,6 +14157,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15351,6 +15543,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15994,6 +16192,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16042,6 +16244,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16968,12 +17206,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16986,9 +17218,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17760,6 +17989,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18469,9 +18704,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20667,24 +20899,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20710,9 +20924,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20730,6 +20941,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20831,9 +21061,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20996,18 +21223,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21120,6 +21350,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21897,6 +22173,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22245,6 +22524,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22850,9 +23132,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23096,6 +23388,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23108,7 +23403,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23185,6 +23480,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23511,6 +23813,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23526,6 +23831,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23830,6 +24138,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24753,6 +25064,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24800,10 +25114,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24812,6 +25126,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24873,6 +25195,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25812,6 +26137,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25878,14 +26211,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25936,10 +26261,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28701,6 +29026,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30505,9 +30833,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31941,6 +32266,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33176,6 +33504,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/el.po b/i18n/po/el.po
index 652ada6..7c9c8db 100644
--- a/i18n/po/el.po
+++ b/i18n/po/el.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2016-01-25 09:17+0000\n"
"Last-Translator: Aggelos Arnaoutis <angelosarn at hotmail.com>\n"
"Language-Team: Greek <el at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:43+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: el\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3087,24 +3087,6 @@ msgstr "Μη αποδεκτή τιμή Γ/Πλάτους \"{0}\""
msgid "Illegal longitude value ''{0}''"
msgstr "Μη αποδεκτή τιμή Γ/Μήκους \"{0}\""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3171,18 +3153,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr "Επίπεδο: {0}"
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3697,6 +3674,24 @@ msgstr "κείμενο"
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4371,6 +4366,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "Το πολύ-πολύγωνο δεν είναι κλειστό"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -5074,6 +5072,25 @@ msgstr "Φόρτωση προτιμήσεων υπόβαθρου εικόνων"
msgid "usage"
msgstr "χρήση"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "Επιλογές"
@@ -5209,6 +5226,11 @@ msgstr "Ρύθμιση προκαθορισμένων"
msgid "Creating main GUI"
msgstr "Δημιουργία κύριου GUI"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr "Ενημέρωση προσθέτων"
@@ -5508,6 +5530,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8297,6 +8322,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10856,6 +10884,156 @@ msgstr "Το URL ήταν: "
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10874,6 +11052,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14336,6 +14519,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Παράλειψη λήψης"
@@ -15732,6 +15924,12 @@ msgstr "Μοτοσυκλέτα"
msgid "Motorcar"
msgstr "Αυτοκίνητο"
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Παραπομπή"
@@ -16375,6 +16573,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16423,6 +16625,42 @@ msgstr "ατμός"
msgid "vacuum"
msgstr "υποπίεση"
+msgid "Material"
+msgstr "Υλικό"
+
+msgid "plastic"
+msgstr "πλαστικό"
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr "πέτρα"
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr "Μεγ. βάρος (τόνοι)"
@@ -17349,12 +17587,6 @@ msgstr "Εμπόδια"
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr "Υλικό"
-
-msgid "stone"
-msgstr "πέτρα"
-
msgid "Bollard"
msgstr "στύλος"
@@ -17367,9 +17599,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr "πλαστικό"
-
msgid "Cycle Barrier"
msgstr ""
@@ -18141,6 +18370,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18850,9 +19085,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "Ζωολογικός Κήπος"
@@ -21048,24 +21280,6 @@ msgctxt "power"
msgid "industrial"
msgstr "βιομηχανικός"
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr ""
@@ -21091,9 +21305,6 @@ msgctxt "power"
msgid "yes"
msgstr "ναι"
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -21111,6 +21322,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -21212,9 +21442,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21377,18 +21604,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr "Στύλος ρεύματος"
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21501,6 +21731,52 @@ msgstr "Πεδίο Μάχης"
msgid "Palaeontological Site"
msgstr "Παλαιοντολογικός Χώρος"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Μνημείο"
@@ -22278,6 +22554,9 @@ msgstr ""
msgid "Suburb"
msgstr "Προάστιο"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "Γειτονιά"
@@ -22626,6 +22905,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -23231,9 +23513,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23477,6 +23769,9 @@ msgstr "Ίχνη GPS OpenStreetMap"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr "Δημόσια συγκοινωνία (ÖPNV)"
@@ -23489,7 +23784,7 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23566,6 +23861,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23892,6 +24194,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23907,6 +24212,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -24211,6 +24519,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -25134,6 +25445,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -25181,10 +25495,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -25193,6 +25507,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -25254,6 +25576,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -26193,6 +26518,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -26259,14 +26592,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -26317,10 +26642,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -29086,6 +29411,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30894,9 +31222,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr "χλμ/ω"
-
msgid "Track name: "
msgstr ""
@@ -32346,6 +32671,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr "χλμ/ω"
+
msgid "direction"
msgstr ""
@@ -33584,6 +33912,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/en_AU.po b/i18n/po/en_AU.po
index ec1c49c..67bbb6c 100644
--- a/i18n/po/en_AU.po
+++ b/i18n/po/en_AU.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2015-06-08 12:52+0000\n"
"Last-Translator: Mark Pulley <mrpulley at iinet.net.au>\n"
"Language-Team: English (Australia) <en_AU at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 05:05+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:07+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3117,24 +3117,6 @@ msgstr "Illegal latitude value ''{0}''"
msgid "Illegal longitude value ''{0}''"
msgstr "Illegal longitude value ''{0}''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Failed to create missing cache directory: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Failed to create missing cache directory: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Unable to delete temporary file {0}"
@@ -3216,22 +3198,15 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "Paint style {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Layer: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Paint style {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Failed to persist preferences to ''{0}''"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Try enabling IPv6 network, preferring IPv6 over IPv4 (only works on early "
-"startup)."
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr "Preference setting {0} has been removed since it is no longer used."
@@ -3772,6 +3747,24 @@ msgstr "text"
msgid "areatext"
msgstr "areatext"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Failed to create missing cache directory: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Failed to create missing cache directory: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4455,6 +4448,9 @@ msgstr "Area style on outer way"
msgid "Multipolygon is not closed"
msgstr "Multipolygon is not closed"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -5154,6 +5150,25 @@ msgstr "Loading imagery preferences"
msgid "usage"
msgstr "usage"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "options"
@@ -5290,6 +5305,13 @@ msgstr "Setting defaults"
msgid "Creating main GUI"
msgstr "Creating main GUI"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Try enabling IPv6 network, preferring IPv6 over IPv4 (only works on early "
+"startup)."
+
msgid "Updating plugins"
msgstr "Updating plugins"
@@ -5604,6 +5626,9 @@ msgstr "Enlarge"
msgid "Shrink"
msgstr "Shrink"
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8513,6 +8538,9 @@ msgstr ""
"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please "
"resolve this conflict first, then try again.</html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr "Select objects for selected relation members"
@@ -11208,6 +11236,156 @@ msgstr "(URL was: "
msgid "Select the map painting styles"
msgstr "Select the map painting styles"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11230,6 +11408,11 @@ msgstr "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14836,6 +15019,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Skip download"
@@ -16282,6 +16474,12 @@ msgstr "Motorcycle"
msgid "Motorcar"
msgstr "Motorcar"
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Reference"
@@ -16925,6 +17123,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16973,6 +17175,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr "Material"
+
+msgid "plastic"
+msgstr "plastic"
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr "stone"
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr "Max. weight (tonnes)"
@@ -17899,12 +18137,6 @@ msgstr "Barriers"
msgid "Block"
msgstr "Block"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "stone"
-
msgid "Bollard"
msgstr "Bollard"
@@ -17917,9 +18149,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr "plastic"
-
msgid "Cycle Barrier"
msgstr "Cycle Barrier"
@@ -18691,6 +18920,12 @@ msgstr "1/25 mix (mofa/moped)"
msgid "1/50 mix (mofa/moped)"
msgstr "1/50 mix (mofa/moped)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -19400,9 +19635,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "Zoo"
@@ -21598,24 +21830,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -21641,9 +21855,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -21661,6 +21872,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -21762,9 +21992,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21927,18 +22154,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -22051,6 +22281,52 @@ msgstr "Battlefield"
msgid "Palaeontological Site"
msgstr "Palaeontological Site"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monument"
@@ -22828,6 +23104,9 @@ msgstr ""
msgid "Suburb"
msgstr "Suburb"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -23176,6 +23455,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -23781,9 +24063,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -24027,6 +24319,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -24039,7 +24334,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -24116,6 +24411,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -24442,6 +24744,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -24457,6 +24762,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -24761,6 +25069,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Cadastre"
@@ -25684,6 +25995,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -25731,10 +26045,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -25743,6 +26057,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -25804,6 +26126,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -26743,6 +27068,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -26809,14 +27142,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -26867,10 +27192,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -29674,6 +29999,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -31511,9 +31839,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -32963,6 +33288,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -34202,6 +34530,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/en_CA.po b/i18n/po/en_CA.po
index 0e9febd..95791a9 100644
--- a/i18n/po/en_CA.po
+++ b/i18n/po/en_CA.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2010-09-24 17:25+0000\n"
"Last-Translator: Johann Beda <Unknown>\n"
"Language-Team: English (Canada) <en_CA at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 05:06+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2917,24 +2917,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3001,18 +2983,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3526,6 +3503,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4194,6 +4189,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4881,6 +4879,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5008,6 +5025,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5305,6 +5327,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8046,6 +8071,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10534,6 +10562,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10552,6 +10730,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13971,6 +14154,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15345,6 +15537,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15988,6 +16186,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16036,6 +16238,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16962,12 +17200,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16980,9 +17212,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17754,6 +17983,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18463,9 +18698,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20661,24 +20893,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20704,9 +20918,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20724,6 +20935,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20825,9 +21055,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20990,18 +21217,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21114,6 +21344,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21891,6 +22167,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22239,6 +22518,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22844,9 +23126,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23090,6 +23382,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23102,7 +23397,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23179,6 +23474,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23505,6 +23807,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23520,6 +23825,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23824,6 +24132,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24747,6 +25058,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24794,10 +25108,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24806,6 +25120,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24867,6 +25189,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25806,6 +26131,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25872,14 +26205,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25930,10 +26255,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28693,6 +29018,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30495,9 +30823,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31931,6 +32256,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33166,6 +33494,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/en_GB.po b/i18n/po/en_GB.po
index d4ab580..92397ba 100644
--- a/i18n/po/en_GB.po
+++ b/i18n/po/en_GB.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JOSM\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2016-11-01 11:03+0000\n"
"Last-Translator: Andi Chandler <Unknown>\n"
"Language-Team: German <josm-dev at openstreetmap.org>\n"
@@ -18,8 +18,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 05:04+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:07+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: de\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3124,24 +3124,6 @@ msgstr "Illegal latitude value ''{0}''"
msgid "Illegal longitude value ''{0}''"
msgstr "Illegal longitude value ''{0}''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Failed to create missing cache directory: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Failed to create missing cache directory: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Unable to delete temporary file {0}"
@@ -3223,22 +3205,15 @@ msgstr "Failed to load defaults cache file: {0}"
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr "Failed to delete faulty defaults cache file: {0}"
-msgid "Paint style {0}: {1}"
-msgstr "Paint style {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Layer: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Paint style {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Failed to persist preferences to ''{0}''"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr "Preference setting {0} has been removed since it is no longer used."
@@ -3784,6 +3759,24 @@ msgstr "text"
msgid "areatext"
msgstr "areatext"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Failed to create missing cache directory: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Failed to create missing cache directory: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Expected element ''{0}'', but got ''{1}''"
@@ -4470,6 +4463,9 @@ msgstr "Area style on outer way"
msgid "Multipolygon is not closed"
msgstr "Multipolygon is not closed"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -5173,6 +5169,25 @@ msgstr "Loading imagery preferences"
msgid "usage"
msgstr "usage"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "options"
@@ -5309,6 +5324,13 @@ msgstr "Setting defaults"
msgid "Creating main GUI"
msgstr "Creating main GUI"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+
msgid "Updating plugins"
msgstr "Updating plug-ins"
@@ -5624,6 +5646,9 @@ msgstr "Enlarge"
msgid "Shrink"
msgstr "Shrink"
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8571,6 +8596,9 @@ msgstr ""
"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please "
"resolve this conflict first, then try again.</html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr "Select objects for selected relation members"
@@ -11274,6 +11302,156 @@ msgstr "(URL was: "
msgid "Select the map painting styles"
msgstr "Select the map painting styles"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11296,6 +11474,11 @@ msgstr "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Failed to locate image ''{0}''"
@@ -15026,6 +15209,15 @@ msgstr "Skip layer and continue"
msgid "expected .jos file inside .joz archive"
msgstr "expected .jos file inside .joz archive"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Skip download"
@@ -16595,6 +16787,12 @@ msgstr "Motorcycle"
msgid "Motorcar"
msgstr "Motorcar"
+msgid "Minimum age"
+msgstr "Minimum age"
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Reference"
@@ -17242,6 +17440,10 @@ msgid "platform"
msgstr "platform"
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr "kiosk"
@@ -17290,6 +17492,42 @@ msgstr "steam"
msgid "vacuum"
msgstr "vacuum"
+msgid "Material"
+msgstr "Material"
+
+msgid "plastic"
+msgstr "plastic"
+
+msgid "steel"
+msgstr "steel"
+
+msgid "stone"
+msgstr "stone"
+
+msgid "Location transition"
+msgstr "Location transition"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Power rating (kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Phases"
+
msgid "Max. weight (tonnes)"
msgstr "Max. weight (tonnes)"
@@ -18233,12 +18471,6 @@ msgstr "Barriers"
msgid "Block"
msgstr "Block"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "stone"
-
msgid "Bollard"
msgstr "Bollard"
@@ -18251,9 +18483,6 @@ msgstr "rising"
msgid "removable"
msgstr "removable"
-msgid "plastic"
-msgstr "plastic"
-
msgid "Cycle Barrier"
msgstr "Cycle Barrier"
@@ -19030,6 +19259,12 @@ msgstr "1/25 mix (mofa/moped)"
msgid "1/50 mix (mofa/moped)"
msgstr "1/50 mix (mofa/moped)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr "Fuel cards:"
@@ -19740,9 +19975,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Number of screens"
-msgid "Minimum age"
-msgstr "Minimum age"
-
msgid "Zoo"
msgstr "Zoo"
@@ -21938,24 +22170,6 @@ msgctxt "power"
msgid "industrial"
msgstr "industrial"
-msgid "Power rating (kVA/MVA)"
-msgstr "Power rating (kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "Gas insulated"
@@ -21981,9 +22195,6 @@ msgctxt "power"
msgid "yes"
msgstr "yes"
-msgid "Phases"
-msgstr "Phases"
-
msgid "Power Switchgear"
msgstr "Power Switchgear"
@@ -22003,6 +22214,25 @@ msgstr "Power Bay"
msgid "Power Switch"
msgstr "Power Switch"
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr "Power Converter"
@@ -22104,9 +22334,6 @@ msgstr "tubular"
msgid "solid"
msgstr "solid"
-msgid "steel"
-msgstr "steel"
-
msgctxt "color"
msgid "red/white"
msgstr "red/white"
@@ -22269,18 +22496,21 @@ msgstr "Triple tower"
msgid "Incomplete tower"
msgstr "Incomplete tower"
-msgid "Location transition"
-msgstr "Location transition"
-
msgid "Pole"
msgstr "Pole"
-msgid "Pole with Transformer"
-msgstr "Pole with Transformer"
+msgid "Pole with Switch"
+msgstr ""
msgid "Pole Attributes:"
msgstr "Pole Attributes:"
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr "Pole with Transformer"
+
msgid "Transformer Attributes:"
msgstr "Transformer Attributes:"
@@ -22393,6 +22623,52 @@ msgstr "Battlefield"
msgid "Palaeontological Site"
msgstr "Palaeontological Site"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monument"
@@ -23170,6 +23446,9 @@ msgstr "Isolated Dwelling"
msgid "Suburb"
msgstr "Suburb"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "Neighbourhood"
@@ -23536,6 +23815,9 @@ msgstr "Greenhouse Horticulture"
msgid "Plant Nursery"
msgstr "Plant Nursery"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr "Aquaculture"
@@ -24145,9 +24427,19 @@ msgstr "Routes"
msgid "Bicycle Route"
msgstr "Bicycle Route"
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -24391,6 +24683,9 @@ msgstr "OpenStreetMap GPS Traces"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr "Public Transport (ÖPNV)"
@@ -24403,7 +24698,7 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -24480,6 +24775,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -24806,6 +25108,9 @@ msgstr "URBIS 2015 aerial imagery"
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW(allonie) PICC numerical imagery"
@@ -24821,6 +25126,9 @@ msgstr "SPW(allonie) 2012-2013 aerial imagery"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 aerial imagery"
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -25125,6 +25433,9 @@ msgstr "BDOrtho IGN"
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Cadastre"
@@ -26050,6 +26361,9 @@ msgstr "Fiez Orthophoto 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -26097,11 +26411,11 @@ msgstr "USGS Topographic Maps"
msgid "USGS Large Scale Imagery"
msgstr "USGS Large Scale Imagery"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
+msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
+msgstr ""
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -26109,6 +26423,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
@@ -26170,6 +26492,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -27128,6 +27453,14 @@ msgstr "{0} on a way. Should be used on a node."
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} on a way. Should be used in a relation"
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr "{0} together with {1} on a node. Remove {0}."
@@ -27198,14 +27531,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -27258,11 +27583,11 @@ msgstr "empty value in semicolon-separated ''{0}''"
msgid "numerical key"
msgstr "numerical key"
-msgid "layer tag with + sign"
-msgstr "layer tag with + sign"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr "{0} should have numbers only with optional .5 increments"
@@ -30291,6 +30616,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -32202,9 +32530,6 @@ msgstr "Delete this"
msgid "Delete this&older"
msgstr "Delete this & older"
-msgid "km/h"
-msgstr "km/h"
-
msgid "Track name: "
msgstr "Track name: "
@@ -33713,6 +34038,9 @@ msgstr "positive number or empty"
msgid "Speed:"
msgstr "Speed:"
+msgid "km/h"
+msgstr "km/h"
+
msgid "direction"
msgstr "direction"
@@ -34977,6 +35305,12 @@ msgstr "Select only one object"
msgid "Select a map object"
msgstr "Select a map object"
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/eo.po b/i18n/po/eo.po
index bb5f1a8..4ee9796 100644
--- a/i18n/po/eo.po
+++ b/i18n/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2016-09-21 04:23+0000\n"
"Last-Translator: Yuri Tretyakov <Unknown>\n"
"Language-Team: Esperanto <eo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:38+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:41+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: eo\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2917,24 +2917,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3001,18 +2983,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3526,6 +3503,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4194,6 +4189,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4882,6 +4880,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5009,6 +5026,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr "Kreado de la Grafika Interfaco (GUI)"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5306,6 +5328,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8047,6 +8072,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10539,6 +10567,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10557,6 +10735,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13976,6 +14159,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15350,6 +15542,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15993,6 +16191,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16041,6 +16243,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16967,12 +17205,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16985,9 +17217,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17759,6 +17988,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18468,9 +18703,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20666,24 +20898,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20709,9 +20923,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20729,6 +20940,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20830,9 +21060,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20995,18 +21222,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21119,6 +21349,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21896,6 +22172,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22244,6 +22523,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22849,9 +23131,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23095,6 +23387,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23107,7 +23402,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23184,6 +23479,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23510,6 +23812,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23525,6 +23830,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23829,6 +24137,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24752,6 +25063,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24799,10 +25113,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24811,6 +25125,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24872,6 +25194,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25811,6 +26136,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25877,14 +26210,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25935,10 +26260,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28698,6 +29023,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30500,9 +30828,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31936,6 +32261,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33171,6 +33499,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/es.po b/i18n/po/es.po
index fe610ab..ddfcc95 100644
--- a/i18n/po/es.po
+++ b/i18n/po/es.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-09-17 10:56+0000\n"
-"Last-Translator: cdavila <cdavilam at orangecorreo.es>\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-12 10:53+0000\n"
+"Last-Translator: Rodrigo Rega <rodrigorega at gmail.com>\n"
"Language-Team: Spanish <es at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:59+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:02+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: es\n"
"X-Language: es_ES\n"
"X-Source-Language: C\n"
@@ -478,7 +478,7 @@ msgid "Download data"
msgstr "Descargar datos"
msgid "Download map data from a server of your choice"
-msgstr ""
+msgstr "Descargar datos del mapa desde un servidor a su elección"
msgid ""
"<html>This action will require {0} individual<br>download requests. Do you "
@@ -3194,26 +3194,6 @@ msgstr "Valor de latitud ilegal \"{0}\""
msgid "Illegal longitude value ''{0}''"
msgstr "Valor de longitud ilegal \"{0}\""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Error al crear el directorio de caché faltante: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-"<html>Se ha producido un fallo al crear el directorio para la caché: "
-"{0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Incapaz de eliminar el archivo temporal {0}"
@@ -3300,22 +3280,15 @@ msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
"No se ha podido eliminar el archivo caché por defecto defectuoso: {0}"
-msgid "Paint style {0}: {1}"
-msgstr "Estilo de representación {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Capa: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Estilo de representación {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "No se ha podido conservar las preferencias para ''{0}''"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Intenta habilitar la red IPv6, preferentemente IPv6 sobre IPv4 (solo "
-"funciona en el inicio)"
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr ""
"La opción de configuración {0} ha sido eliminada porque ya no se usa."
@@ -3889,6 +3862,26 @@ msgstr "texto"
msgid "areatext"
msgstr "area de texto"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Error al crear el directorio de caché faltante: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+"<html>Se ha producido un fallo al crear el directorio para la caché: "
+"{0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Elemento esperado ''{0}'', pero se obtuvo ''{1}''"
@@ -4098,7 +4091,7 @@ msgid "Custom Projection"
msgstr "Proyeccion ajustada"
msgid "Error: {0}"
-msgstr ""
+msgstr "Error: {0}"
msgid "JOSM projection command line interface"
msgstr ""
@@ -4133,7 +4126,7 @@ msgid ""
msgstr ""
msgid "[file]"
-msgstr ""
+msgstr "[Archivo]"
msgid ""
"Reads input data from one or more files listed as positional arguments. When "
@@ -4600,6 +4593,9 @@ msgstr "Estilo de área en una vía exterior"
msgid "Multipolygon is not closed"
msgstr "El multipolígono no está cerrado"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr "Anillos de multipolígono comparten nodo(s)"
@@ -5323,6 +5319,25 @@ msgstr "Cargando preferencias de imágenes"
msgid "usage"
msgstr "uso"
+msgid "commands"
+msgstr "comandos"
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr "interpretar datos y guardar el resultado en un archivo de imagen"
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr "El resto de esta página de ayuda documenta el comando {0}."
+
msgid "options"
msgstr "opciones"
@@ -5463,6 +5478,13 @@ msgstr "Ajuste de predefinidos"
msgid "Creating main GUI"
msgstr "Creando la interfaz principal de usuario"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Intenta habilitar la red IPv6, preferentemente IPv6 sobre IPv4 (solo "
+"funciona en el inicio)"
+
msgid "Updating plugins"
msgstr "Actualizando componentes"
@@ -5791,6 +5813,9 @@ msgstr "Agrandar"
msgid "Shrink"
msgstr "Contraer"
+msgid "Show downloaded area"
+msgstr "Mostrar área descargada"
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -7820,7 +7845,7 @@ msgid "Update the changeset from the OSM server"
msgstr "Actualizar el conjunto de cambios desde el servidor de OSM"
msgid "View changeset"
-msgstr ""
+msgstr "Mostrar conjunto de cambios"
msgid ""
"Select the primitives in the content of this changeset in the current data "
@@ -8851,6 +8876,9 @@ msgstr ""
"objeto<br>\"{1}\".<br>Por favor resuelva este conflicto primero e intente de "
"nuevo.</html>"
+msgid "Select the currently edited relation"
+msgstr "Seleccionar la relación editada actualmente"
+
msgid "Select objects for selected relation members"
msgstr "Seleccionar los objetos para los miembros de la relación indicados"
@@ -9134,7 +9162,7 @@ msgid "Query Wizard"
msgstr "Asistente de consultas"
msgid "Your saved queries:"
-msgstr ""
+msgstr "Sus consultas guardadas:"
msgid "Show/hide Overpass snippet list"
msgstr ""
@@ -9148,7 +9176,7 @@ msgid ""
msgstr ""
msgid "Download all data?"
-msgstr ""
+msgstr "¿Descargar todos los datos?"
msgid "Add new snippet"
msgstr ""
@@ -9157,7 +9185,7 @@ msgid "Delete selected snippet"
msgstr ""
msgid "Edit selected snippet"
-msgstr ""
+msgstr "Editar el fragmento seleccionado"
msgid "Overpass Turbo Query Wizard"
msgstr "Asistente de consultas de Overpass Turbo"
@@ -9166,13 +9194,13 @@ msgid "Build query"
msgstr "Generar consulta"
msgid "Build query and execute"
-msgstr ""
+msgstr "Construir consulta y ejecutar"
msgid "Search :"
-msgstr ""
+msgstr "Buscar :"
msgid "The Overpass wizard could not parse the following query:"
-msgstr ""
+msgstr "El asistente de Overpass no pudo analizar la siguiente consulta:"
msgid "Parse error"
msgstr "Error al deserializar"
@@ -9189,19 +9217,20 @@ msgstr ""
"consulta válida de Overpass."
msgid "For more detailed description see "
-msgstr ""
+msgstr "Para una descripción más detallada ver "
msgid "<a href=\"{0}\">OSM Wiki</a>."
msgstr ""
msgid "Hints"
-msgstr ""
+msgstr "Sugerencias"
msgid "Download objects of a certain type."
-msgstr ""
+msgstr "Descargar objetos de un cierto tipo."
msgid "Download object by specifying a specific location. For example,"
msgstr ""
+"Descargar objeto especificando una localización específica. Por ejemplo,"
msgid "{0} all objects having {1} as attribute are downloaded."
msgstr ""
@@ -9289,28 +9318,28 @@ msgid "history"
msgstr "historia"
msgid "Please select an item first"
-msgstr ""
+msgstr "Primero seleccione un elemento, por favor"
msgid "Edit item"
-msgstr ""
+msgstr "Editar elemento"
msgid "Add snippet"
msgstr ""
msgid "Query cannot be empty"
-msgstr ""
+msgstr "La consulta no puede estar vacía"
msgid "This name can be used for the item"
-msgstr ""
+msgstr "Este nombre puede ser usado para el elemento"
msgid "Item with this name already exists"
-msgstr ""
+msgstr "Ya existe un elemento con este nombre"
msgid "The item cannot be created with provided name"
-msgstr ""
+msgstr "No se puede crear un elemento con el nombre facilitado"
msgid "The item cannot be created with an empty query"
-msgstr ""
+msgstr "El elemento no puede ser creado con una consulta vacía"
msgid "JOSM Help Browser"
msgstr "Navegador de ayuda de JOSM"
@@ -9473,10 +9502,10 @@ msgid "Open a history browser with the history of this node"
msgstr "Abrir un navegador de históricos con el historial de este nodo"
msgid "View changeset in web browser"
-msgstr ""
+msgstr "Mostrar conjunto de cambios en navegador web"
msgid "Open {0}"
-msgstr ""
+msgstr "Abrir {0}"
msgid "Way {0}"
msgstr "Vía {0}"
@@ -9488,7 +9517,7 @@ msgid "Object"
msgstr "Objeto"
msgid "Open Changeset Manager"
-msgstr ""
+msgstr "Abrir gestor de conjuntos de cambios"
msgid "Changeset comment"
msgstr "Comentar Changeset"
@@ -9668,7 +9697,7 @@ msgstr ""
"izquierda."
msgid "I would like someone to review my edits."
-msgstr ""
+msgstr "Me gustaría que alguien revisase mis ediciones."
msgid "Provide a brief comment for the changes you are uploading:"
msgstr "Introduzca un breve comentario sobre los cambios que se van a subir:"
@@ -10684,7 +10713,7 @@ msgid "Open OSM file"
msgstr "Abrir archivo OSM"
msgid "Validation Error Files"
-msgstr ""
+msgstr "Archivos de errores de validación"
msgid "WMS Files (*.wms)"
msgstr "Archivos WMS (*.wms)"
@@ -11643,6 +11672,157 @@ msgstr "(La URL era: "
msgid "Select the map painting styles"
msgstr "Seleciones Estilo de MAPa de imagenes"
+msgid "Error - file not found: ''{0}''"
+msgstr "Error - archivo no encontrado: ''{0}''"
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+"Se esperaba un número entero para la opción {0}, pero se obtuvo ''{1}''"
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr "En opción {0}: {1}"
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr "Nombre de archivo de datos de entrada (.osm)"
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr "Esta opción puede ser repetida para cargar múltiples estilos."
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr "Seleccionar la escala del mapa"
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr "Área a interpretar, el valor por defecto es ''{0}''"
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr "Especificar la esquina inferior izquierda del área de interpretado"
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr "Recibido argumento {0}, se esperaba {1} o {2}"
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr "Falta argumento - archivo de datos de entrada ({0})"
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr "Falta argumento - se esperaba al menos un estilo ({0})"
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr "Opción de estilo no encontrada: ''{0}''"
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11668,6 +11848,11 @@ msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
"Error al deserializar los estilos Mappaint desde ''{0}''. El error fue: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "No se pudo localizar la imagen ''{0}''"
@@ -12988,7 +13173,7 @@ msgid "Lower limit of visibility"
msgstr "Límite inferior de visibilidad"
msgid "Adjust the gain of overlay blending."
-msgstr ""
+msgstr "Ajustar la ganancia de superposición de colores"
msgid "Draw all GPX traces that exceed this threshold."
msgstr "Dibuja todas las trazas GPX que exceden este umbral."
@@ -15580,6 +15765,15 @@ msgstr "Saltar capa y continuar"
msgid "expected .jos file inside .joz archive"
msgstr "se esperaba un archivo .jos dentro del archivo .joz"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Saltar descarga"
@@ -17182,6 +17376,12 @@ msgstr "Motocicleta"
msgid "Motorcar"
msgstr "Automóvil"
+msgid "Minimum age"
+msgstr "Edad mínima"
+
+msgid "Maximum age"
+msgstr "Edad máxima"
+
msgid "Reference"
msgstr "Referencia"
@@ -17830,6 +18030,10 @@ msgid "platform"
msgstr "plataforma"
msgctxt "power"
+msgid "rooftop"
+msgstr "azotea"
+
+msgctxt "power"
msgid "kiosk"
msgstr "gabinete"
@@ -17878,6 +18082,42 @@ msgstr "vapor"
msgid "vacuum"
msgstr "vacío"
+msgid "Material"
+msgstr "Material"
+
+msgid "plastic"
+msgstr "plástico"
+
+msgid "steel"
+msgstr "acero"
+
+msgid "stone"
+msgstr "piedra"
+
+msgid "Location transition"
+msgstr "Transición de ubicación"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Potencia nominal (kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Fases"
+
msgid "Max. weight (tonnes)"
msgstr "Peso máximo (t)"
@@ -18830,12 +19070,6 @@ msgstr "Barreras"
msgid "Block"
msgstr "Bloques"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "piedra"
-
msgid "Bollard"
msgstr "Bolardo"
@@ -18848,9 +19082,6 @@ msgstr "en ascenso"
msgid "removable"
msgstr "desinstalable"
-msgid "plastic"
-msgstr "plástico"
-
msgid "Cycle Barrier"
msgstr "Barrera para bicicletas"
@@ -19193,6 +19424,8 @@ msgid ""
"An area of water mostly surrounded by land but with level connection to the "
"ocean or a lake."
msgstr ""
+"Área de agua rodeada por tierra en su mayor parte pero con conexión al mar o "
+"a un lago."
msgid "Shipping"
msgstr "Navegación"
@@ -19629,6 +19862,12 @@ msgstr "mezcla 1/25 (ciclomotor)"
msgid "1/50 mix (mofa/moped)"
msgstr "mezcla 1/50 (ciclomotor)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr "Tarjetas de combustible:"
@@ -20341,9 +20580,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Número de pantallas"
-msgid "Minimum age"
-msgstr "Edad mínima"
-
msgid "Zoo"
msgstr "Zoo"
@@ -22543,24 +22779,6 @@ msgctxt "power"
msgid "industrial"
msgstr "industrial"
-msgid "Power rating (kVA/MVA)"
-msgstr "Potencia nominal (kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "aislada en gas"
@@ -22586,9 +22804,6 @@ msgctxt "power"
msgid "yes"
msgstr "sí"
-msgid "Phases"
-msgstr "Fases"
-
msgid "Power Switchgear"
msgstr "Celda de media tensión"
@@ -22608,6 +22823,25 @@ msgstr "Bahía de Energía"
msgid "Power Switch"
msgstr "Interruptor de Corriente"
+msgid "Type of switch"
+msgstr "Tipo de interruptor"
+
+msgctxt "power"
+msgid "mechanical"
+msgstr "mecánica"
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr "Conversor de energía"
@@ -22709,9 +22943,6 @@ msgstr "tubular"
msgid "solid"
msgstr "sólido"
-msgid "steel"
-msgstr "acero"
-
msgctxt "color"
msgid "red/white"
msgstr "rojo/blanco"
@@ -22874,18 +23105,21 @@ msgstr "Torre triple"
msgid "Incomplete tower"
msgstr "Torre incompleta"
-msgid "Location transition"
-msgstr "Transición de ubicación"
-
msgid "Pole"
msgstr "Poste"
-msgid "Pole with Transformer"
-msgstr "Poste con transformador"
+msgid "Pole with Switch"
+msgstr ""
msgid "Pole Attributes:"
msgstr "Atributos del poste:"
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr "Poste con transformador"
+
msgid "Transformer Attributes:"
msgstr "Atributos del transformador:"
@@ -22999,6 +23233,52 @@ msgstr "Campo de batalla"
msgid "Palaeontological Site"
msgstr "Sitio paleontológico"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monumento"
@@ -23313,7 +23593,7 @@ msgid "Variety Store"
msgstr "Tienda de variedades o bazar"
msgid "Charity"
-msgstr ""
+msgstr "Caridad"
msgid "Bookmaker"
msgstr "Corredor de apuestas"
@@ -23779,6 +24059,9 @@ msgstr ""
"Poblamiento compacto (grandes barrios, suburbios, polígonos de viviendas, "
"distritos, etc.)"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
"Vecindario (área de un lugar habitado, urbanización, colonia, barrio, etc.)"
@@ -24147,6 +24430,9 @@ msgstr "Invernadero hortofrutícola"
msgid "Plant Nursery"
msgstr "Vivero de plantas"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr "Acuicultura"
@@ -24226,7 +24512,7 @@ msgstr ""
msgctxt "industrial"
msgid "factory"
-msgstr ""
+msgstr "fábrica"
msgctxt "industrial"
msgid "grinding_mill"
@@ -24242,7 +24528,7 @@ msgstr ""
msgctxt "industrial"
msgid "mine"
-msgstr ""
+msgstr "mina"
msgctxt "industrial"
msgid "oil"
@@ -24250,7 +24536,7 @@ msgstr ""
msgctxt "industrial"
msgid "port"
-msgstr ""
+msgstr "puerto"
msgctxt "industrial"
msgid "salt_pond"
@@ -24258,7 +24544,7 @@ msgstr ""
msgctxt "industrial"
msgid "sawmill"
-msgstr ""
+msgstr "aserradero"
msgctxt "industrial"
msgid "scrap_yard"
@@ -24266,15 +24552,15 @@ msgstr ""
msgctxt "industrial"
msgid "shipyard"
-msgstr ""
+msgstr "astillero"
msgctxt "industrial"
msgid "slaughterhouse"
-msgstr ""
+msgstr "matadero"
msgctxt "industrial"
msgid "warehouse"
-msgstr ""
+msgstr "almacén"
msgid "Garages"
msgstr "Garajes o plazas de aparcamiento particulares"
@@ -24763,11 +25049,21 @@ msgstr "Rutas"
msgid "Bicycle Route"
msgstr "Ruta de ciclismo"
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
-msgstr "nacional"
+msgstr ""
+
+msgctxt "network"
+msgid "regional"
+msgstr ""
+msgctxt "network"
msgid "local"
-msgstr "local"
+msgstr ""
msgid "Mountain Biking Route"
msgstr "Ruta de ciclismo de montaña"
@@ -25009,6 +25305,9 @@ msgstr "Trazas de GPS OpenStreetMap"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr "Publicar trazas de GPS subidas a OpenStreetMap."
+msgid "OpenTopoMap"
+msgstr "OpenTopoMap"
+
msgid "Public Transport (ÖPNV)"
msgstr "Transporte Público (ÖPNV)"
@@ -25021,8 +25320,8 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr "Terrain de Stamen"
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
-msgstr "Camboya, Laos, Tailandia, Vietnam, Myanmar bilingüe"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (superposición)"
@@ -25100,6 +25399,13 @@ msgstr ""
"Imágenes del último verano donde las fuentes usuales tienen limitantes "
"severas debido a nubes y nieve (color verdadero)"
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr "Imágenes de imagico.de: Montañas Transantárticas del Sur"
@@ -25131,13 +25437,13 @@ msgstr ""
"verdadero)"
msgid "IGN topographical map (TMS)"
-msgstr ""
+msgstr "Mapa topográfico de IGN (TMS)"
msgid "IGN topographical map (WMTS)"
-msgstr ""
+msgstr "Mapa topográfico de IGN (WMTS)"
msgid "IGN topographical map (WMS)"
-msgstr ""
+msgstr "Mapa topográfico de IGN (WMS)"
msgid "IGN orthophoto AMBA a (WMTS)"
msgstr ""
@@ -25437,6 +25743,9 @@ msgstr "Imágenes aéreas de URBIS 2015"
msgid "URBIS 2016 aerial imagery"
msgstr "Imágenes aéreas URBIS 2016"
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "Imágenes aéreas SPW(allonie) PICC numéricas"
@@ -25452,6 +25761,9 @@ msgstr "SPW(solitario) 2012-2013 imágenes aéreas"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(solitario) 2009-2010 imágenes aéreas"
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr "Líneas de autobús de TEC"
@@ -25773,6 +26085,9 @@ msgstr "BDOrtho IGN"
msgid "Bordeaux - 2012"
msgstr "Burdeos - 2012"
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Catastro"
@@ -26758,6 +27073,9 @@ msgstr "Fiez Ortofoto 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr "Cantón de la Ciudad de Basilea 2015"
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr "Cantón de Basilea Campiña 10cm (2015)"
@@ -26810,11 +27128,11 @@ msgstr "USGS Mapas Topográficos"
msgid "USGS Large Scale Imagery"
msgstr "Imágenes aéreas grandes USGS"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012 Superposición de caminos"
+msgid "TIGER Roads 2012"
+msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "Carreteras Nuevas y No alineadas de TIGER (2015)"
+msgid "TIGER Roads 2014"
+msgstr ""
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -26825,6 +27143,14 @@ msgstr ""
"de Estados Unidos. En niveles inferiores, solo cambios desde el 2006 ecxepto "
"los que ya fueron incorporados a OpenStreetMap"
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcelas"
@@ -26897,6 +27223,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr "Área Metropolitana de San Juan: Ortofotos USACE de 2013"
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr "Imágenes aéreas WA 2013 del Condado de San Juan"
@@ -28035,6 +28364,14 @@ msgstr "{0} sobre una vía. Debería ser utilizado en un nodo."
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} sobre una vía. Debería ser utilizado en una relación"
+msgid "node connects highway and building"
+msgstr "el nodo conecta vía y un edificio"
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr "{0} junto con {1} en un nodo. Eliminar {0}."
@@ -28107,14 +28444,6 @@ msgstr ""
"{0} es la etiqueta para la navegación lineal. Para etiquetar el área de agua "
"utilice {1} + {2}."
-msgid "node connects highway and building"
-msgstr "el nodo conecta vía y un edificio"
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -28169,11 +28498,11 @@ msgstr "valor vacío separado por punto y coma ''{0}''"
msgid "numerical key"
msgstr "tecla numérica"
-msgid "layer tag with + sign"
-msgstr "etiqueta layer con el signo +"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "la capa debe estar entre -5 y 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr "{0} debe tener solamente números con incrementos opcionales de 0,5"
@@ -31320,31 +31649,38 @@ msgid "Download from Cadastre"
msgstr ""
msgid "Objects:"
-msgstr ""
+msgstr "Objetos:"
msgid "Select to download buildings in the selected download area."
msgstr ""
+"Seleccionar para descargar edificios en el área de descarga seleccionada."
msgid "address"
msgstr "dirección"
msgid "Select to download addresses in the selected download area."
msgstr ""
+"Seleccionar para descargar direcciones en el área de descarga seleccionada."
msgid "symbol"
msgstr "símbolo"
msgid "Select to download symbols in the selected download area."
msgstr ""
+"Seleccionar para descargar símbolos en el área de descarga seleccionada."
msgid "Select to download water bodies in the selected download area."
msgstr ""
+"Seleccionar para descargar cuerpos de agua en el área de descarga "
+"seleccionada."
msgid "parcel"
msgstr "parcela"
msgid "Select to download cadastral parcels in the selected download area."
msgstr ""
+"Seleccionar para descargar parcelas catastrales en el área de descargar "
+"seleccionada."
msgid "parcel number"
msgstr "parcela"
@@ -31352,18 +31688,23 @@ msgstr "parcela"
msgid ""
"Select to download cadastral parcel numbers in the selected download area."
msgstr ""
+"Seleccionar para descargar números de parcelas catastrales en el área de "
+"descarga seleccionada."
msgid "section"
msgstr "sección"
msgid "Select to download cadastral sections in the selected download area."
msgstr ""
+"Seleccionar para descargar secciones catastrales en el área de descarga "
+"selccionada."
msgid "locality"
msgstr "localidad"
msgid "Select to download localities in the selected download area."
msgstr ""
+"Seleccionar para descargar localidades en el área de descarga seleccionada."
msgid "commune"
msgstr "comuna"
@@ -31375,9 +31716,14 @@ msgstr ""
msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+"<html>No hay nada activado.<br>Seleccione algo para descargar, por "
+"favor.</html>"
+
+msgid "Download cadastre data"
+msgstr "Descargar datos catastrales"
msgid "Recipient"
-msgstr ""
+msgstr "Destinatario"
msgid "Diffusion restriction"
msgstr ""
@@ -33343,9 +33689,6 @@ msgstr "Eliminar esto"
msgid "Delete this&older"
msgstr "Eliminar este&más antiguo"
-msgid "km/h"
-msgstr "km/h"
-
msgid "Track name: "
msgstr "Nombre pista: "
@@ -34810,7 +35153,7 @@ msgid "Retry"
msgstr ""
msgid "Unable to process file ''{0}'':"
-msgstr ""
+msgstr "No se pudo procesar el archivo ''{0}'':"
msgid "File could not be deleted!"
msgstr "¡No se pudo eliminar el archivo!"
@@ -34902,6 +35245,9 @@ msgstr "número positivo o vacío"
msgid "Speed:"
msgstr "Velocidad:"
+msgid "km/h"
+msgstr "km/h"
+
msgid "direction"
msgstr "dirección"
@@ -36199,6 +36545,12 @@ msgstr "Seleccione únicamente un objeto"
msgid "Select a map object"
msgstr "Seleccione un objeto del mapa"
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr "Panel de acciones de forma"
@@ -38698,7 +39050,7 @@ msgstr ""
"objetos seleccionados"
msgid "Download from Wikosm API"
-msgstr ""
+msgstr "Descargar desde Wikosm API"
msgid ""
"Find places of education at least 2km, and at most 3km from the center of "
@@ -38709,13 +39061,13 @@ msgid "Show/hide Wikosm snippet list"
msgstr ""
msgid "help"
-msgstr ""
+msgstr "ayuda"
msgid "Server: "
-msgstr ""
+msgstr "Servidor: "
msgid "Wikidata+OSM server"
-msgstr ""
+msgstr "Wikidata+servidor OSM"
msgid "The Ultimate WMS Super-speed Turbo Challenge II"
msgstr "El Ultimate WMS Super-Velocidad Turbo Desafío II"
diff --git a/i18n/po/et.po b/i18n/po/et.po
index bda5333..076eb3d 100644
--- a/i18n/po/et.po
+++ b/i18n/po/et.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2017-02-23 08:40+0000\n"
"Last-Translator: Margus Värton <margus at dakar.ee>\n"
"Language-Team: Estonian <et at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:39+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:41+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: et\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2998,24 +2998,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3082,18 +3064,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "Kujundus {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Kiht: {0}"
-msgid "Failed to persist preferences to ''{0}''"
-msgstr ""
+msgid "Paint style {0}: {1}"
+msgstr "Kujundus {0}: {1}"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3607,6 +3584,24 @@ msgstr "tekst"
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4275,6 +4270,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "Liitala pole suletud"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4968,6 +4966,25 @@ msgstr "Laadin aluskaardi eelistused"
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5095,6 +5112,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr "Loon kasutajaliidest"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5392,6 +5414,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8155,6 +8180,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10703,6 +10731,156 @@ msgstr "(URL oli: "
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10721,6 +10899,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14179,6 +14362,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Jäta allalaadimine vahele"
@@ -15582,6 +15774,12 @@ msgstr "Mootorratas"
msgid "Motorcar"
msgstr "Auto"
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -16225,6 +16423,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16273,6 +16475,42 @@ msgstr "aur"
msgid "vacuum"
msgstr "vaakum"
+msgid "Material"
+msgstr "Materjal"
+
+msgid "plastic"
+msgstr "plastikust"
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr "kivi"
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr "Suurim mass (tonni)"
@@ -17199,12 +17437,6 @@ msgstr "Tõkked"
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr "Materjal"
-
-msgid "stone"
-msgstr "kivi"
-
msgid "Bollard"
msgstr "Pollar"
@@ -17217,9 +17449,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr "plastikust"
-
msgid "Cycle Barrier"
msgstr ""
@@ -17991,6 +18220,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18700,9 +18935,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "Loomaaed"
@@ -20898,24 +21130,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20941,9 +21155,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20961,6 +21172,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -21062,9 +21292,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21227,18 +21454,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr "Elektripost"
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21351,6 +21581,52 @@ msgstr "Lahingupaik"
msgid "Palaeontological Site"
msgstr "Paleontoloogiamälestis"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monument"
@@ -22128,6 +22404,9 @@ msgstr ""
msgid "Suburb"
msgstr "Linnaosa"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "Piirkond"
@@ -22476,6 +22755,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -23081,9 +23363,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23327,6 +23619,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23339,7 +23634,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23416,6 +23711,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23742,6 +24044,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23757,6 +24062,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -24061,6 +24369,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24984,6 +25295,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -25031,10 +25345,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -25043,6 +25357,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -25104,6 +25426,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -26043,6 +26368,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -26109,14 +26442,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -26167,10 +26492,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28949,6 +29274,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30754,9 +31082,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -32201,6 +32526,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33436,6 +33764,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/eu.po b/i18n/po/eu.po
index 37d720a..bec1344 100644
--- a/i18n/po/eu.po
+++ b/i18n/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2015-03-09 16:55+0000\n"
"Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
"Language-Team: Basque <eu at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:34+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:36+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: eu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3013,24 +3013,6 @@ msgstr "Latitudearen ''{0}'' balio ilegalak"
msgid "Illegal longitude value ''{0}''"
msgstr "Longitudearen ''{0}'' balio ilegalak"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3105,18 +3087,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr "Geruza: {0}"
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3653,6 +3630,24 @@ msgstr "testua"
msgid "areatext"
msgstr "areatext"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4325,6 +4320,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -5027,6 +5025,25 @@ msgstr "Irudi-hobespenak kargatzen"
msgid "usage"
msgstr "erabilera"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "aukerak"
@@ -5163,6 +5180,11 @@ msgstr "Hobespen orijinalak ezartzen"
msgid "Creating main GUI"
msgstr "GUI nagusia sortzen"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5462,6 +5484,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8230,6 +8255,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10721,6 +10749,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10739,6 +10917,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14158,6 +14341,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15537,6 +15729,12 @@ msgstr "Motozikleta"
msgid "Motorcar"
msgstr "Automobil"
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Erreferentzia"
@@ -16180,6 +16378,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16228,6 +16430,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr "Materiala"
+
+msgid "plastic"
+msgstr "plastikoa"
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr "harria"
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr "Gehienezko pixua (t)"
@@ -17154,12 +17392,6 @@ msgstr "Oztopoak"
msgid "Block"
msgstr "Blokea"
-msgid "Material"
-msgstr "Materiala"
-
-msgid "stone"
-msgstr "harria"
-
msgid "Bollard"
msgstr "Bolardoa"
@@ -17172,9 +17404,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr "plastikoa"
-
msgid "Cycle Barrier"
msgstr "Bizikletentzako oztopoa"
@@ -17946,6 +18175,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18655,9 +18890,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "Zoo"
@@ -20853,24 +21085,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20896,9 +21110,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20916,6 +21127,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -21017,9 +21247,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21182,18 +21409,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21306,6 +21536,52 @@ msgstr "Gudu-zelaia"
msgid "Palaeontological Site"
msgstr "Gune-paleontologikoa"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monumentua"
@@ -22083,6 +22359,9 @@ msgstr ""
msgid "Suburb"
msgstr "Auzoa"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22431,6 +22710,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -23036,9 +23318,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23282,6 +23574,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23294,7 +23589,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23371,6 +23666,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23697,6 +23999,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23712,6 +24017,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -24016,6 +24324,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24939,6 +25250,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24986,10 +25300,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24998,6 +25312,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -25059,6 +25381,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25998,6 +26323,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -26064,14 +26397,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -26122,10 +26447,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28922,6 +29247,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30724,9 +31052,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -32165,6 +32490,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33400,6 +33728,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/fa.po b/i18n/po/fa.po
index 53fb899..743405e 100644
--- a/i18n/po/fa.po
+++ b/i18n/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2014-03-18 07:32+0000\n"
"Last-Translator: Saeed Ghazi Joolaee <Unknown>\n"
"Language-Team: Persian <fa at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:54+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: fa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2976,24 +2976,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3060,18 +3042,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr "لايه: {0}"
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3583,6 +3560,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4251,6 +4246,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4939,6 +4937,25 @@ msgstr "بارگیری ترجیحات تصویری"
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5066,6 +5083,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5363,6 +5385,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8108,6 +8133,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10601,6 +10629,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10619,6 +10797,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14038,6 +14221,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15412,6 +15604,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -16055,6 +16253,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16103,6 +16305,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -17029,12 +17267,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -17047,9 +17279,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17821,6 +18050,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18530,9 +18765,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20728,24 +20960,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20771,9 +20985,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20791,6 +21002,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20892,9 +21122,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21057,18 +21284,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21181,6 +21411,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21958,6 +22234,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22306,6 +22585,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22911,9 +23193,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23157,6 +23449,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23169,7 +23464,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23246,6 +23541,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23572,6 +23874,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23587,6 +23892,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23891,6 +24199,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24814,6 +25125,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24861,10 +25175,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24873,6 +25187,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24934,6 +25256,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25873,6 +26198,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25939,14 +26272,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25997,10 +26322,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28760,6 +29085,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30562,9 +30890,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31998,6 +32323,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33233,6 +33561,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/fi.po b/i18n/po/fi.po
index c291c12..138cdf5 100644
--- a/i18n/po/fi.po
+++ b/i18n/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2016-01-19 17:11+0000\n"
"Last-Translator: Lauri Kytömaa <Unknown>\n"
"Language-Team: Finnish <fi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:40+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:42+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: fi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3126,25 +3126,6 @@ msgstr "Virheellinen leveyspiiri ''{0}''"
msgid "Illegal longitude value ''{0}''"
msgstr "Virheellinen pituuspiiri ''{0}''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-"<html>Puuttuvan välimuistihakemiston luominen ei onnistunut: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Väliaikaistiedoston poistaminen ei onnistunut: {0}"
@@ -3220,18 +3201,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "Piirtotyyli {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Taso: {0}"
-msgid "Failed to persist preferences to ''{0}''"
-msgstr ""
+msgid "Paint style {0}: {1}"
+msgstr "Piirtotyyli {0}: {1}"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3772,6 +3748,25 @@ msgstr "teksti"
msgid "areatext"
msgstr "alueteksti"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+"<html>Puuttuvan välimuistihakemiston luominen ei onnistunut: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4462,6 +4457,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "Monimonikulmiota ei ole suljettu"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -5172,6 +5170,25 @@ msgstr "Ladataan kuvatasojen asetukset"
msgid "usage"
msgstr "käyttö"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "valinnat"
@@ -5304,6 +5321,11 @@ msgstr "Asetetaan oletuksia"
msgid "Creating main GUI"
msgstr "Luodaan pääikkuna"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr "Päivitetään liitännäisiä"
@@ -5609,6 +5631,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8499,6 +8524,9 @@ msgstr ""
"karttakohteelle<br>\"{1}\".<br>Ratkaise ensin tuo ristiriita ja yritä sitten "
"uudelleen.</html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
"Valitsee kartalta ne kohteet, jotka olet valinnut relaation jäsenlistasta."
@@ -11184,6 +11212,156 @@ msgstr "(URL oli: "
msgid "Select the map painting styles"
msgstr "Valitse käytettävät piirtotyylit"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11202,6 +11380,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14776,6 +14959,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -16204,6 +16396,12 @@ msgstr "Moottoripyörä"
msgid "Motorcar"
msgstr "Auto"
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Numero"
@@ -16847,6 +17045,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16895,6 +17097,42 @@ msgstr "kuuma höyry"
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr "Materiaali"
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr "kivi"
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr "Vaiheiden lukumäärä"
+
msgid "Max. weight (tonnes)"
msgstr "Maksimipaino (tonnia)"
@@ -17823,12 +18061,6 @@ msgstr "Esteet"
msgid "Block"
msgstr "Betoniporsas tms."
-msgid "Material"
-msgstr "Materiaali"
-
-msgid "stone"
-msgstr "kivi"
-
msgid "Bollard"
msgstr "Sulkutolppa"
@@ -17841,9 +18073,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -18615,6 +18844,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -19324,9 +19559,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "Eläintarha"
@@ -21522,24 +21754,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -21565,9 +21779,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr "Vaiheiden lukumäärä"
-
msgid "Power Switchgear"
msgstr ""
@@ -21585,6 +21796,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -21686,9 +21916,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21851,18 +22078,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr "Sähköpylväs (ei korkeajännitelinjan)"
-msgid "Pole with Transformer"
-msgstr "Sähköpylväs muuntajalla (ei korkeajännitelinjan)"
+msgid "Pole with Switch"
+msgstr ""
msgid "Pole Attributes:"
msgstr "Sähköpylvään ominaisuudet:"
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr "Sähköpylväs muuntajalla (ei korkeajännitelinjan)"
+
msgid "Transformer Attributes:"
msgstr "Muuntajan ominaisuudet:"
@@ -21975,6 +22205,52 @@ msgstr "Taistelukenttä"
msgid "Palaeontological Site"
msgstr "Paleontologinen kaivaus"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monumentti"
@@ -22752,6 +23028,9 @@ msgstr ""
msgid "Suburb"
msgstr "Kaupunginosa"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -23100,6 +23379,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -23706,9 +23988,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23952,6 +24244,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23964,7 +24259,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -24041,6 +24336,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -24367,6 +24669,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -24382,6 +24687,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -24686,6 +24994,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -25609,6 +25920,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -25656,10 +25970,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -25668,6 +25982,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -25729,6 +26051,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -26676,6 +27001,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -26742,14 +27075,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -26800,10 +27125,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -29630,6 +29955,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -31454,9 +31782,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -32915,6 +33240,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -34158,6 +34486,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/fil.po b/i18n/po/fil.po
index 425a23a..26f8be6 100644
--- a/i18n/po/fil.po
+++ b/i18n/po/fil.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2011-06-19 14:15+0000\n"
"Last-Translator: Anthony Balico <Unknown>\n"
"Language-Team: Filipino <fil at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 05:07+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: fil\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/fo.po b/i18n/po/fo.po
index 20a4a24..1503869 100644
--- a/i18n/po/fo.po
+++ b/i18n/po/fo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2015-02-28 16:15+0000\n"
"Last-Translator: LiFo <Unknown>\n"
"Language-Team: Faroese <fo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:39+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:42+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}: valmøguleiki ''{1}'' er tvítýddur"
@@ -2910,24 +2910,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2994,18 +2976,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3519,6 +3496,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4187,6 +4182,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4874,6 +4872,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5001,6 +5018,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5298,6 +5320,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8039,6 +8064,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10527,6 +10555,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10545,6 +10723,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13964,6 +14147,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15338,6 +15530,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15981,6 +16179,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16029,6 +16231,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16955,12 +17193,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16973,9 +17205,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17747,6 +17976,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18456,9 +18691,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20654,24 +20886,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20697,9 +20911,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20717,6 +20928,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20818,9 +21048,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20983,18 +21210,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21107,6 +21337,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21884,6 +22160,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22232,6 +22511,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22837,9 +23119,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23083,6 +23375,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23095,7 +23390,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23172,6 +23467,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23498,6 +23800,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23513,6 +23818,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23817,6 +24125,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24740,6 +25051,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24787,10 +25101,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24799,6 +25113,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24860,6 +25182,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25799,6 +26124,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25865,14 +26198,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25923,10 +26248,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28686,6 +29011,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30488,9 +30816,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31924,6 +32249,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33159,6 +33487,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/fr.po b/i18n/po/fr.po
index 1a0e2e3..fc2bebe 100644
--- a/i18n/po/fr.po
+++ b/i18n/po/fr.po
@@ -5,16 +5,16 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-09-22 10:40+0000\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-19 06:28+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Fr <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:40+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:43+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: fr\n"
"X-Poedit-Bookmarks: -1,-1,-1,2669,-1,-1,-1,-1,-1,-1\n"
@@ -25,7 +25,7 @@ msgid "gas"
msgstr "gaz"
msgid "{0}: option ''{1}'' is ambiguous"
-msgstr "{0} : l’option « {1} » est ambigüe"
+msgstr "{0} : l’option «{1}» est ambigüe"
msgid "{0}: option ''--{1}'' does not allow an argument"
msgstr "{0} : l’option ''--{1}'' n’autorise pas d’argument"
@@ -2538,10 +2538,10 @@ msgid "Selection settings"
msgstr ""
msgid "Additional settings"
-msgstr ""
+msgstr "Paramètres supplémentaires"
msgid "Search syntax"
-msgstr ""
+msgstr "Syntaxe de recherche"
msgid "Invalid search expression"
msgstr "L’expression de recherche n’est pas valide"
@@ -3186,24 +3186,6 @@ msgstr "Valeur de latitude ''{0}'' erronée"
msgid "Illegal longitude value ''{0}''"
msgstr "Valeur de longitude ''{0}'' erronée"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Impossible de créer le dossier de cache manquant: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Échec de création du répertoire cache manquant : {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Impossible de supprimer le fichier temporaire {0}"
@@ -3291,22 +3273,15 @@ msgstr ""
"Impossible de charger le fichier, corrompu, de cache des paramètres par "
"défaut : {0}"
-msgid "Paint style {0}: {1}"
-msgstr "Modèle de rendu {0} : {1}"
-
msgid "Layer: {0}"
msgstr "Calque : {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Modèle de rendu {0} : {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Impossible de régler les préférences à ''{0}''"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Test d''activation du réseau IPv6, préférant IPv6 par rapport à IPv4 (ne "
-"fonctionne qu''au début du démarrage)."
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr "La préférence {0} a été supprimée car elle n’est plus utilisée."
@@ -3880,6 +3855,24 @@ msgstr "texte"
msgid "areatext"
msgstr "zone de texte"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Impossible de créer le dossier de cache manquant: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Échec de création du répertoire cache manquant : {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Élément attendu ''{0}'', ''{1}'' obtenu"
@@ -4086,7 +4079,7 @@ msgid "Custom Projection"
msgstr "Projection personnalisée"
msgid "Error: {0}"
-msgstr ""
+msgstr "Erreur: {0}"
msgid "JOSM projection command line interface"
msgstr ""
@@ -4582,6 +4575,9 @@ msgstr "Style de la zone sur la partie externe du chemin"
msgid "Multipolygon is not closed"
msgstr "Le multipolygone n’est pas fermé"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr "Des membres d’un multipolygone partagent des nœuds"
@@ -5306,6 +5302,25 @@ msgstr "Chargement des préférences d’imagerie"
msgid "usage"
msgstr "usage"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "options"
@@ -5447,6 +5462,13 @@ msgstr "Réglage des valeurs par défaut"
msgid "Creating main GUI"
msgstr "Création de l’interface graphique"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Test d''activation du réseau IPv6, préférant IPv6 par rapport à IPv4 (ne "
+"fonctionne qu''au début du démarrage)."
+
msgid "Updating plugins"
msgstr "Mise à jour des greffons"
@@ -5762,6 +5784,8 @@ msgstr "<h2>Filtre actif: {0}</h2>"
msgid "</p><p>Click again on filter button to see all objects.</p></html>"
msgstr ""
+"</p><p>Cliquez de nouveau sur le bouton filtre pour voir tous les "
+"objets.</p></html>"
msgid "Enlarge"
msgstr "Agrandir"
@@ -5769,6 +5793,9 @@ msgstr "Agrandir"
msgid "Shrink"
msgstr "Rétrécir"
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8777,6 +8804,9 @@ msgstr ""
"l’objet<br>''{1}''.<br>Veuillez d’abord résoudre ce conflit puis "
"réessayer.</html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr "Sélectionner les objets des membres"
@@ -9060,15 +9090,17 @@ msgid "Show/hide Overpass snippet list"
msgstr ""
msgid "Overpass query:"
-msgstr ""
+msgstr "Requête Overpass :"
msgid ""
"You entered an empty query. Do you want to download all data in this area "
"instead?"
msgstr ""
+"Vous avez saisi une requête vide. Voulez-vous télécharger toutes les données "
+"de cette zone à la place ?"
msgid "Download all data?"
-msgstr ""
+msgstr "Télécharger toutes les données?"
msgid "Add new snippet"
msgstr ""
@@ -9080,19 +9112,19 @@ msgid "Edit selected snippet"
msgstr ""
msgid "Overpass Turbo Query Wizard"
-msgstr ""
+msgstr "Assistant de requête Overpass Turbo"
msgid "Build query"
msgstr "Construire la requête"
msgid "Build query and execute"
-msgstr ""
+msgstr "Construire la requête et l’exécuter"
msgid "Search :"
msgstr ""
msgid "The Overpass wizard could not parse the following query:"
-msgstr ""
+msgstr "L’assistant Overpass n’a pu analyser la requête suivante :"
msgid "Parse error"
msgstr "Erreur d''analyse"
@@ -9105,12 +9137,14 @@ msgstr ""
msgid ""
"The <i>Query Wizard</i> tool will transform those to a valid overpass query."
msgstr ""
+"L’<i>Assistant de requête</i> transformera ces données en une requête "
+"Overpass valide."
msgid "For more detailed description see "
-msgstr ""
+msgstr "Pour une description plus détaillée, voir "
msgid "<a href=\"{0}\">OSM Wiki</a>."
-msgstr ""
+msgstr "<a href=\"{0}\">Wiki OSM</a>."
msgid "Hints"
msgstr ""
@@ -9207,7 +9241,7 @@ msgid "history"
msgstr "histoire"
msgid "Please select an item first"
-msgstr ""
+msgstr "Veuillez d’abord sélectionner un élément"
msgid "Edit item"
msgstr ""
@@ -9216,19 +9250,19 @@ msgid "Add snippet"
msgstr ""
msgid "Query cannot be empty"
-msgstr ""
+msgstr "La requête ne peut être vide"
msgid "This name can be used for the item"
-msgstr ""
+msgstr "Ce nom peut être utilisé pour l’élément"
msgid "Item with this name already exists"
-msgstr ""
+msgstr "Un élément de ce nom existe déjà"
msgid "The item cannot be created with provided name"
msgstr ""
msgid "The item cannot be created with an empty query"
-msgstr ""
+msgstr "L’élément ne peut être créé avec une requête vide"
msgid "JOSM Help Browser"
msgstr "Aide de JOSM"
@@ -9582,7 +9616,7 @@ msgstr ""
"gauche."
msgid "I would like someone to review my edits."
-msgstr ""
+msgstr "J’aimerais que quelqu’un vérifie mes modifications."
msgid "Provide a brief comment for the changes you are uploading:"
msgstr "Ajoutez un commentaire :"
@@ -11581,6 +11615,158 @@ msgstr "(L’adresse web était : "
msgid "Select the map painting styles"
msgstr "Sélectionner les styles de rendu de carte"
+msgid "Error - file not found: ''{0}''"
+msgstr "Erreur - fichier non trouvé: ''{0}''"
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr "Cette option peut être répétée pour charger différents styles."
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr "Sélectionnez l’échelle de la carte"
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+"Une valeur de 10000 correspond à une échelle 1:10000 (1 cm sur la carte pour "
+"100 m sur le terrain; résolution de l’affichage: 96 dpi)"
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr "Largeur de l’image cible, en pixels"
+
+msgid "Height of the target image, in pixel"
+msgstr "Hauteur de l’image cible, en pixels"
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11605,6 +11791,11 @@ msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
"Echec de lʼanalyse des styles Mappaint de ''{0}''. Lʼerreur était: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Impossible de trouver l''image \"{0}\""
@@ -12567,7 +12758,7 @@ msgid "Use auto filters"
msgstr ""
msgid "Rule"
-msgstr ""
+msgstr "Règle"
msgid "Highlight target ways and nodes"
msgstr "Mettre en surbrillance les nœuds et chemins survolés"
@@ -15113,7 +15304,7 @@ msgid "Reading user info ..."
msgstr "Lecture des informations sur l’utilisateur…"
msgid "Reading user preferences ..."
-msgstr ""
+msgstr "Lecture des préférences utilisateur ..."
msgid "Starting to upload with one request per primitive ..."
msgstr "Début de l’envoi des données avec une requête par objet…"
@@ -15505,6 +15696,15 @@ msgstr "Ignorer le calque et continuer"
msgid "expected .jos file inside .joz archive"
msgstr "fichier .jos attendu à l’’intérieur de l’’archive .joz"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Abandonner le téléchargement"
@@ -17102,6 +17302,12 @@ msgstr "Motos"
msgid "Motorcar"
msgstr "Automobiles"
+msgid "Minimum age"
+msgstr "Âge minimum"
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Référence"
@@ -17747,6 +17953,10 @@ msgid "platform"
msgstr "plateforme"
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr "kiosque"
@@ -17795,6 +18005,42 @@ msgstr "vapeur"
msgid "vacuum"
msgstr "vide"
+msgid "Material"
+msgstr "Matériau"
+
+msgid "plastic"
+msgstr "plastique"
+
+msgid "steel"
+msgstr "acier"
+
+msgid "stone"
+msgstr "pierre"
+
+msgid "Location transition"
+msgstr "Transition de localisation"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Puissance (kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Phases"
+
msgid "Max. weight (tonnes)"
msgstr "Poids maximal (tonnes)"
@@ -18738,12 +18984,6 @@ msgstr "Barrières"
msgid "Block"
msgstr "Obstacle"
-msgid "Material"
-msgstr "Matériau"
-
-msgid "stone"
-msgstr "pierre"
-
msgid "Bollard"
msgstr "Plot"
@@ -18756,9 +18996,6 @@ msgstr "levé"
msgid "removable"
msgstr "Amovible"
-msgid "plastic"
-msgstr "plastique"
-
msgid "Cycle Barrier"
msgstr "Barrière pour cycles"
@@ -19540,6 +19777,12 @@ msgstr "Mélange 1/25 (cyclomoteur)"
msgid "1/50 mix (mofa/moped)"
msgstr "Mélange 1/50 (cyclomoteur)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr "Carte essence:"
@@ -19659,7 +19902,7 @@ msgid "parts"
msgstr ""
msgid "tyres"
-msgstr ""
+msgstr "pneus"
msgid "Parts"
msgstr "Pièces détachées"
@@ -19970,7 +20213,7 @@ msgstr "oui"
msgctxt "airmark"
msgid "Beacon"
-msgstr ""
+msgstr "Balise"
msgid "Navigationaid"
msgstr ""
@@ -20255,9 +20498,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Nombre d’écrans"
-msgid "Minimum age"
-msgstr "Âge minimum"
-
msgid "Zoo"
msgstr "Zoo"
@@ -22453,24 +22693,6 @@ msgctxt "power"
msgid "industrial"
msgstr "industrielle"
-msgid "Power rating (kVA/MVA)"
-msgstr "Puissance (kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "Isolation gazeuse"
@@ -22496,9 +22718,6 @@ msgctxt "power"
msgid "yes"
msgstr "oui"
-msgid "Phases"
-msgstr "Phases"
-
msgid "Power Switchgear"
msgstr "Puissance de Commutation"
@@ -22518,6 +22737,25 @@ msgstr "Baie d''Alimentation"
msgid "Power Switch"
msgstr "Interrupteur"
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr "Convertisseur"
@@ -22619,9 +22857,6 @@ msgstr "tubulaire"
msgid "solid"
msgstr "plein"
-msgid "steel"
-msgstr "acier"
-
msgctxt "color"
msgid "red/white"
msgstr "rouge/blanc"
@@ -22784,18 +23019,21 @@ msgstr "triple à un triangle"
msgid "Incomplete tower"
msgstr "Tour incomplète"
-msgid "Location transition"
-msgstr "Transition de localisation"
-
msgid "Pole"
msgstr "Poteau électrique"
-msgid "Pole with Transformer"
-msgstr "Poteau avec transformateur"
+msgid "Pole with Switch"
+msgstr ""
msgid "Pole Attributes:"
msgstr "Attributs du pylône"
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr "Poteau avec transformateur"
+
msgid "Transformer Attributes:"
msgstr "Attributs du transformateur"
@@ -22908,6 +23146,52 @@ msgstr "Lieu de bataille"
msgid "Palaeontological Site"
msgstr "Site paléontologique"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr "Tombe"
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr "tumulus"
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr "hypogée"
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr "mausolée"
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr "crypte"
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr "pyramide"
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr "sarcophage"
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Grand monument commémoratif"
@@ -23688,6 +23972,9 @@ msgstr "Habitation isolée"
msgid "Suburb"
msgstr "Banlieue"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "Voisinage"
@@ -24054,6 +24341,9 @@ msgstr "Serre horticole"
msgid "Plant Nursery"
msgstr "Pépinière"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr "Aquaculture"
@@ -24107,15 +24397,15 @@ msgstr "Zone industrielle"
msgctxt "industrial"
msgid "bakery"
-msgstr ""
+msgstr "boulangerie"
msgctxt "industrial"
msgid "brewery"
-msgstr ""
+msgstr "brasserie"
msgctxt "industrial"
msgid "brickyard"
-msgstr ""
+msgstr "briqueterie"
msgctxt "industrial"
msgid "depot"
@@ -24127,11 +24417,11 @@ msgstr ""
msgctxt "industrial"
msgid "factory"
-msgstr ""
+msgstr "usine"
msgctxt "industrial"
msgid "grinding_mill"
-msgstr ""
+msgstr "broyeur"
msgctxt "industrial"
msgid "heating_station"
@@ -24143,7 +24433,7 @@ msgstr ""
msgctxt "industrial"
msgid "mine"
-msgstr ""
+msgstr "mine"
msgctxt "industrial"
msgid "oil"
@@ -24151,7 +24441,7 @@ msgstr ""
msgctxt "industrial"
msgid "port"
-msgstr ""
+msgstr "port"
msgctxt "industrial"
msgid "salt_pond"
@@ -24167,11 +24457,11 @@ msgstr ""
msgctxt "industrial"
msgid "shipyard"
-msgstr ""
+msgstr "chantier naval"
msgctxt "industrial"
msgid "slaughterhouse"
-msgstr ""
+msgstr "abattoir"
msgctxt "industrial"
msgid "warehouse"
@@ -24665,11 +24955,21 @@ msgstr "Itinéraires"
msgid "Bicycle Route"
msgstr "Itinéraire cycliste"
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
-msgstr "national"
+msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
-msgstr "local"
+msgstr ""
msgid "Mountain Biking Route"
msgstr "Itinéraire de vélo tout-terrain (VTT)"
@@ -24879,7 +25179,7 @@ msgid ""
msgstr ""
msgid "Esri World Imagery"
-msgstr ""
+msgstr "Images mondiales Esri"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -24911,6 +25211,9 @@ msgstr "Traces GPS OpenStreetMap"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr "Traces GPS publiques téléchargées sur OpenStreetMap."
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr "Transport Public (ÖPNV)"
@@ -24923,8 +25226,8 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr "Stamen Terrain"
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
-msgstr "Cambodge, Laos, Thaïlande, Vietnam, Myanmar bilingue"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "Surcouche OpenPT Map"
@@ -24966,7 +25269,7 @@ msgid "Waymarked Trails: Winter Sports"
msgstr "Waymarked Trails: Sports d’hiver"
msgid "Wikimedia Map"
-msgstr ""
+msgstr "Carte Wikimedia"
msgid "OSM Inspector: Geometry"
msgstr "OSM Inspector : Géométrie"
@@ -24993,7 +25296,7 @@ msgid "OSM Inspector: Coastline (EU)"
msgstr "OSM Inspector : Ligne de côte (UE)"
msgid "imagico.de OSM images for mapping: Prokletije Mountains"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Massif des Prokletije"
msgid ""
"Late summer imagery where usual sources are severely limited by clouds and "
@@ -25002,6 +25305,13 @@ msgstr ""
"L’imagerie de fin d’été où les sources habituelles sont sévèrement limitées "
"par les nuages et la neige (couleur vraie)"
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
"imagico.de OSM Images pour la cartographie: Montagnes du Sud Transantartique"
@@ -25027,18 +25337,22 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
msgstr ""
+"Imagerie imagico.de pour la cartographie OSM: Terre d’Enderby et Terre de "
+"Kemp"
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
+"Images Sentinel-2 de la Terre d’Enderby et de la Terre de Kemp (couleurs "
+"réelles)"
msgid "IGN topographical map (TMS)"
-msgstr ""
+msgstr "Carte topographique IGN (TMS)"
msgid "IGN topographical map (WMTS)"
-msgstr ""
+msgstr "Carte topographique IGN (WMTS)"
msgid "IGN topographical map (WMS)"
-msgstr ""
+msgstr "Carte topographique IGN (WMS)"
msgid "IGN orthophoto AMBA a (WMTS)"
msgstr ""
@@ -25071,112 +25385,114 @@ msgid "IGN orthophoto AMBA 7 (WMTS)"
msgstr ""
msgid "IGN orthophoto Barranqueras (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Barranqueras (WMTS)"
msgid "IGN orthophoto Catamarca (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Catamarca (WMTS)"
msgid "IGN orthophoto Córdoba (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Córdoba (WMTS)"
msgid "IGN orthophoto El Calafate (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN d’El Calafate (WMTS)"
msgid "IGN orthophoto El Rodeo (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN d’El Rodeo (WMTS)"
msgid "IGN orthophoto Jujuy (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Jujuy (WMTS)"
msgid "IGN orthophoto La Rioja (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de La Rioja (WMTS)"
msgid "IGN orthophoto Mendoza (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Mendoza (WMTS)"
msgid "IGN orthophoto Neuquén (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Neuquén (WMTS)"
msgid "IGN orthophoto Posadas (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Posadas (WMTS)"
msgid "IGN orthophoto Resistencia (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Resistencia (WMTS)"
msgid "IGN orthophoto Río Gallegos (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Rio Gallegos (WMTS)"
msgid "IGN orthophoto Río Grande (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Rio Grande (WMTS)"
msgid "IGN orthophoto Río Paraná A (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Río Paraná A (WMTS)"
msgid "IGN orthophoto Río Paraná B (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Río Paraná B (WMTS)"
msgid "IGN orthophoto Rosario (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Rosario (WMTS)"
msgid "IGN orthophoto Salta (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Salta (WMTS)"
msgid "IGN orthophoto Salta 1 (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Salta 1 (WMTS)"
msgid "IGN orthophoto Salta 2 (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Salta 2 (WMTS)"
msgid "IGN orthophoto Salta 3 (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Salta 3 (WMTS)"
msgid "IGN orthophoto Salta 4 (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Salta 4 (WMTS)"
msgid "IGN orthophoto Salto Grande (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Salto Grande (WMTS)"
msgid "IGN orthophoto San Juan (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de San Juan (WMTS)"
msgid "IGN orthophoto San Luis (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de San Luis (WMTS)"
msgid "IGN orthophoto Santa Cruz III (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Santa Cruz III (WMTS)"
msgid "IGN orthophoto Santa Cruz IV (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Santa Cruz IV (WMTS)"
msgid "IGN orthophoto Santa Cruz VI (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Santa Cruz VI (WMTS)"
msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Santa Fe et Paraná (WMTS)"
msgid "IGN orthophoto Tucumán (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN de Tucumán (WMTS)"
msgid "IGN orthophoto Ushuaia (WMTS)"
-msgstr ""
+msgstr "Orthophoto IGN d’Ushuaïa (WMTS)"
msgid "Educational map (WMS)"
-msgstr ""
+msgstr "Carte éducative (WMS)"
msgid "Ministry of Agroindustry (WMS)"
-msgstr ""
+msgstr "Ministère de l’Agro-industrie (WMS)"
msgid "Ministry of Energy and Mining (WMS)"
-msgstr ""
+msgstr "Ministère de l’Énergie et des Mines (WMS)"
msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
msgstr ""
+"Imagerie imagico.de pour la cartographie OSM: Bahía Blanca (marée basse)"
msgid "Tidal flats and islands at the coast (true color)"
msgstr ""
msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
msgstr ""
+"Imagerie imagico.de pour la cartographie OSM: Bahía Blanca (marée haute)"
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI noir et blanc 2.5 m"
@@ -25339,6 +25655,9 @@ msgstr "Imagerie aérienne URBIS 2015"
msgid "URBIS 2016 aerial imagery"
msgstr "Imagerie aérienne URBIS 2016"
+msgid "URBIS 2017 aerial imagery"
+msgstr "Imagerie aérienne URBIS 2017"
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "Imagerie numérique SPW(allonie) PICC"
@@ -25354,6 +25673,9 @@ msgstr "Imagerie aérienne SPW(allonie) 2012-2013"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "Imagerie aérienne SPW(allonie) 2009-2010"
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr "Lignes du réseau TEC"
@@ -25558,13 +25880,13 @@ msgid ""
msgstr ""
msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Fogo, Cap-Vert"
msgid "Image from after the 2014/2015 eruption (true color)"
-msgstr ""
+msgstr "Image postérieure à l’éruption de 2014/2015 (couleurs réelles)"
msgid "imagico.de OSM images for mapping: Isla Londonderry"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Île Londonderry"
msgid ""
"A lot of very coarse coastlines could be improved here, much snow cover "
@@ -25572,10 +25894,10 @@ msgid ""
msgstr ""
msgid "imagico.de OSM images for mapping: Volcán Calbuco"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: volcan Calbuco"
msgid "Image from after the 2015 eruption (true color)"
-msgstr ""
+msgstr "Image postérieure à l’éruption de 2015 (couleurs réelles)"
msgid "Czech CUZK:KM"
msgstr "République tchèque CUZK:KM"
@@ -25620,7 +25942,7 @@ msgid "Vejmidte"
msgstr ""
msgid "imagico.de OSM images for mapping: El Altar"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: El Altar"
msgid ""
"2007 ASTER image offering better glacier coverage than common sources (true "
@@ -25629,6 +25951,7 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
msgstr ""
+"Imagerie imagico.de pour la cartographie OSM: îles Darwin et Wolf, Galapagos"
msgid ""
"Recent image, only old and poor images in other sources currently (true "
@@ -25654,7 +25977,7 @@ msgid "BANO"
msgstr "BANO"
msgid "French address registry or Base Adresses Nationale"
-msgstr ""
+msgstr "Base Adresse Nationale (BAN) française"
msgid "BD Carthage"
msgstr "BD Carthage"
@@ -25665,6 +25988,9 @@ msgstr "BDOrtho IGN"
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
+msgid "Bordeaux - 2016"
+msgstr "Bordeaux - 2016"
+
msgid "Cadastre"
msgstr "Cadastre"
@@ -25763,7 +26089,7 @@ msgid "Berlin aerial photograph 2016"
msgstr "Berlin Photographie aérienne 2016"
msgid "Berlin aerial photograph 2017"
-msgstr ""
+msgstr "Photographie aérienne de Berlin 2017"
msgid "Deutsche Bahn VzG lines Nov 2013"
msgstr ""
@@ -25820,16 +26146,16 @@ msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
msgstr ""
msgid "Saxony latest aerial imagery"
-msgstr ""
+msgstr "Dernière image aérienne de la Saxe"
msgid "Saxony latest aerial imagery infrared"
-msgstr ""
+msgstr "Dernière image aérienne infrarouge de la Saxe"
msgid "Saxony historical aerial imagery 2012-2014"
-msgstr ""
+msgstr "Image aérienne historique de la saxe 2012-2014"
msgid "Saxony historical aerial imagery 2005"
-msgstr ""
+msgstr "Image aérienne historique de la Saxe 2005"
msgid "Saxony WebAtlasSN"
msgstr ""
@@ -25850,13 +26176,13 @@ msgid "Munich latest aerial imagery 60cm"
msgstr "Munich: dernière image aérienne 60 cm"
msgid "imagico.de OSM images for mapping: Qasigiannguit"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Qasigiannguit"
msgid "Icebridge DMS image of the settlement - alignment might be poor"
msgstr ""
msgid "imagico.de OSM images for mapping: Thule Air Base"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: base aérienne de Thulé"
msgid "Icebridge DMS image - alignment might be poor"
msgstr ""
@@ -25934,25 +26260,25 @@ msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr "Imagerie drone Cyclone Matthew (Haïti) Octobre 2016"
msgid "FÖMI orthophoto 2000"
-msgstr ""
+msgstr "Orthophoto BFKH 2000"
msgid "FÖMI orthophoto 2005"
-msgstr ""
+msgstr "Orthophoto BFKH 2005"
msgid "Szeged orthophoto 2011"
-msgstr ""
+msgstr "Orthophoto de Szeged 2011"
msgid "Inner part of Szeged"
msgstr ""
msgid "Törökbálint orthophoto 2013"
-msgstr ""
+msgstr "Orthophoto de Törökbálint 2013"
msgid "5 cm resolution bald image"
msgstr ""
msgid "Törökbálint orthophoto 2015"
-msgstr ""
+msgstr "Orthophoto de Törökbálint 2015"
msgid "Danube flood orthophoto 2013"
msgstr ""
@@ -25982,13 +26308,13 @@ msgid "Hillshade Hungary"
msgstr "Ombrage Hongrie"
msgid "imagico.de OSM images for mapping: Eastern Iceland"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Est de l’Islande"
msgid "Missing islets and inaccurate coast (true color)"
msgstr ""
msgid "imagico.de OSM images for mapping: Rann of Kutch"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Rann de Kutch"
msgid ""
"Land/water distinction difficult to properly map based on Bing/Mapbox images "
@@ -25997,6 +26323,7 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
msgstr ""
+"Imagerie imagico.de pour la cartographie OSM: Chaîne de Sudirman 2015"
msgid ""
"Older image of the Sudirman Range with no fresh snow showing glacier extent "
@@ -26012,13 +26339,13 @@ msgid ""
msgstr ""
msgid "imagico.de OSM images for mapping: Bakun Reservoir"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Barrage de Bakun"
msgid "Missing in older pre-2011 images (true color)"
msgstr ""
msgid "imagico.de OSM images for mapping: Batam"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Batam"
msgid "Missing Islands in OSM (true color)"
msgstr ""
@@ -26103,7 +26430,7 @@ msgid "South Tyrol Orthofoto 2011"
msgstr "Orthophotographie Sud Tyrol 2011"
msgid "South Tyrol Orthofoto 2011 (highres)"
-msgstr ""
+msgstr "Orthophoto du Sud Tyrol 2011 (haute résolution)"
msgid ""
"Orthophoto of South Tyrol from 2011 with up to 20cm resolution (larger "
@@ -26111,10 +26438,10 @@ msgid ""
msgstr ""
msgid "South Tyrol Orthofoto 2014"
-msgstr ""
+msgstr "Orthophoto du Sud Tyrol 2014"
msgid "South Tyrol Orthofoto 2014/2015"
-msgstr ""
+msgstr "Orthophoto du Sud Tyrol 2014/2015"
msgid "South Tyrol Topomap"
msgstr "Carte topographique Sud Tyrol"
@@ -26140,7 +26467,7 @@ msgid ""
msgstr ""
msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Mont Kenya 2016"
msgid "Up-to-date image for glacier mapping (true color)"
msgstr ""
@@ -26223,6 +26550,8 @@ msgstr "Bande de Gaza - Pléiades - 2014/07/06 (NIR)"
msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
msgstr ""
+"Imagerie imagico.de pour la cartographie OSM: Canal de Panama - côté "
+"Pacifique"
msgid ""
"New locks with less clouds than in the Sentinel-2 image - make sure to check "
@@ -26230,29 +26559,31 @@ msgid ""
msgstr ""
msgid "imagico.de OSM images for mapping: Panama Canal"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Canal de Panama"
msgid "Images of the new locks (but partly cloudy) (true color)"
msgstr ""
msgid "imagico.de OSM images for mapping: Vanatinai"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Vanatinai"
msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
msgstr ""
msgid "imagico.de OSM images for mapping: New Ireland"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Nouvelle-Irlande"
msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
msgstr ""
msgid "imagico.de OSM images for mapping: Coropuna"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Coropuna"
msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
+"Imagerie imagico.de pour la cartographie OSM: Cordillère de Vilcanota et "
+"glacier Quelccaya"
msgid "Poor and outdated imagery in other sources (true color)"
msgstr ""
@@ -26336,7 +26667,7 @@ msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
-msgstr ""
+msgstr "Powiat de Ropczycko-Sędziszowski: bâtiments"
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Powiat rzeszowski: Budynki (bâtiments)"
@@ -26369,7 +26700,7 @@ msgid "Siemianowice Śląskie: Ortofotomapa (aerial image)"
msgstr "Siemianowice Śląskie: Ortofotomapa (image aérienne)"
msgid "Siemianowice Śląskie: Budynki (buildings)"
-msgstr ""
+msgstr "Siemianowice Śląskie: bâtiments"
msgid "Świętochłowice: Ortofotomapa 2008 (aerial image)"
msgstr ""
@@ -26393,25 +26724,28 @@ msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
msgid "imagico.de OSM images for mapping: Kerch Strait"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Détroit de Kertch"
msgid "State of bridge construction in August 2016 (true color)"
msgstr ""
msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Côte de Petchora"
msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
msgstr ""
+"Image Sentinel-2 de la Côte de Petchora en automne 2016 (couleurs réelles)"
msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Île Ouchakov août 2016"
msgid "Up-to-date late summer imagery with few clouds (true color)"
msgstr ""
msgid "imagico.de OSM images for mapping: Northern Dvina delta at low tide"
msgstr ""
+"Imagerie imagico.de pour la cartographie OSM: Delta de la Dvina "
+"septentrionale à marée basse"
msgid "Beaches, tidal flats and other costal forms (true color)"
msgstr ""
@@ -26427,7 +26761,7 @@ msgid ""
msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Cosmodrome Vostochny"
msgid "Recent image showing newest features (true color)"
msgstr ""
@@ -26479,7 +26813,7 @@ msgid "Missing in other image sources (true color with estimated blue)"
msgstr ""
msgid "imagico.de OSM images for mapping: Scott Island"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Île Scott"
msgid "Missing in other image sources (true color)"
msgstr ""
@@ -26488,10 +26822,10 @@ msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
msgstr ""
msgid "imagico.de OSM images for mapping: Clerke Rocks"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Clerke Rocks"
msgid "imagico.de OSM images for mapping: Shag Rocks"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Shag Rocks"
msgid "Catastro Spain"
msgstr "Cadastre de l’Espagne"
@@ -26515,7 +26849,7 @@ msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Îles Canaries"
msgid "imagico.de OSM images for mapping: Adams Bridge"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Pont d’Adam"
msgid "Supplementing incomplete coverage in other sources (true color)"
msgstr ""
@@ -26592,11 +26926,16 @@ msgstr "Fiez Orthophoto 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr "Kanton Basel-Landschaft 10cm (2015)"
msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
msgstr ""
+"Imagerie imagico.de pour la cartographie OSM: Alpes Centrales fin septembre "
+"2016"
msgid ""
"Up-to-date image for glacier mapping - beware of some fresh snow at higher "
@@ -26622,10 +26961,10 @@ msgid "NLSC Open Data WMTS"
msgstr ""
msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Mont Kilimandjaro 2016"
msgid "Aşgabat (high resolution)"
-msgstr ""
+msgstr "Aşgabat (haute résolution)"
msgid "MSR Maps Topo"
msgstr ""
@@ -26639,11 +26978,11 @@ msgstr "Cartes topographiques de l''USGS"
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
-msgstr "Surcouche routes TIGER 2012"
+msgid "TIGER Roads 2012"
+msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "Routes nouvelles & mal alignées de TIGER (2015)"
+msgid "TIGER Roads 2014"
+msgstr ""
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -26651,6 +26990,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -26676,7 +27023,7 @@ msgid "U.S. Forest Service roads"
msgstr "Service forestier des routes (États-Unis)"
msgid "imagico.de OSM images for mapping: Alaska Range"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Chaîne d’Alaska"
msgid ""
"Recent summer image of the Alaska Range for mapping natural features (true "
@@ -26684,26 +27031,26 @@ msgid ""
msgstr ""
msgid "imagico.de OSM images for mapping: Bogoslof Island"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Île Bogoslof"
msgid "Recent image from after the eruption (true color)"
-msgstr ""
+msgstr "Imagerie récente postérieure à l’érution (couleurs réelles)"
msgid "imagico.de OSM images for mapping: Cook Inlet"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie: Golfe de Cook"
msgid "Tidal flats and glaciers in surrounding mountains (true color)"
msgstr ""
msgid "NJ 2015 Aerial Imagery (Infrared)"
-msgstr ""
+msgstr "Imagerie aérienne (infrarouge) du New Jersey 2015"
msgid ""
"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
msgstr ""
msgid "NJ 2015 Aerial Imagery (Natural Color)"
-msgstr ""
+msgstr "Imagerie aérienne (couleurs naturelles) du New Jersey 2015"
msgid ""
"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
@@ -26712,6 +27059,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -26740,13 +27090,14 @@ msgid "Texas Orthophoto"
msgstr "Texas Orthophoto"
msgid "Philadelphia 2015 Imagery"
-msgstr ""
+msgstr "Imagerie de Philadelphie 2015"
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
msgid "Six Inch resolution aerial imagery for the State of Maryland"
msgstr ""
+"Imagerie aérienne pour l’État du Maryland, avec une résolution de 6 pouces"
msgid "MD Three Inch Aerial Imagery"
msgstr ""
@@ -26755,6 +27106,8 @@ msgid ""
"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
"Annapolis"
msgstr ""
+"Imagerie pour les villes de Rockville, Gaithersburg et Annapolis, avec une "
+"résolution de 3 pouces"
msgid "MD Transportation Basemap"
msgstr ""
@@ -26765,7 +27118,7 @@ msgid ""
msgstr ""
msgid "Delaware 2012 Orthophotography"
-msgstr ""
+msgstr "Orthophotographie du Delaware 2012"
msgid ""
"This data set consists of 0.3-meter pixel resolution (approximately 1-foot), "
@@ -26774,7 +27127,7 @@ msgid ""
msgstr ""
msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Monts Rwenzori"
msgid ""
"Recent image of most of the remaining Rwenzori Mountains glaciers (false "
@@ -26782,13 +27135,15 @@ msgid ""
msgstr ""
msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
-msgstr ""
+msgstr "Imagerie imagico.de pour la cartographie OSM: Monts Rwenzori 2016"
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ukraine - Orthophoto 2012"
msgid "Works only from within Ukraine or with an Ukrainian proxy server."
msgstr ""
+"Fonctionne uniquement à partir de l’Ukraine ou à travers un serveur proxy "
+"ukrainien."
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr "Ukraine - Kiev 2014 (DZK)"
@@ -26836,6 +27191,8 @@ msgid ""
"Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville d’Aberdeen 1866-1867, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Airdrie 1858 (NLS)"
msgstr "Plans de ville Ordnance Survey, Airdrie 1858 (NLS)"
@@ -26843,6 +27200,8 @@ msgstr "Plans de ville Ordnance Survey, Airdrie 1858 (NLS)"
msgid ""
"Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville d’Airdrie 1858, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Alexandria 1859 (NLS)"
msgstr "Plans de ville Ordnance Survey, Alexandria 1859 (NLS)"
@@ -26851,6 +27210,8 @@ msgid ""
"Detailed town plan of Alexandria 1859, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville d’Alexandria 1859, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
msgstr "Plans de ville Ordnance Survey, Alloa 1861-1862 (NLS)"
@@ -26859,6 +27220,8 @@ msgid ""
"Detailed town plan of Alloa 1861-1862, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville d’Alloa 1861-1862, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Annan 1859 (NLS)"
msgstr "Plans de ville Ordnance Survey, Annan 1859 (NLS)"
@@ -26866,6 +27229,8 @@ msgstr "Plans de ville Ordnance Survey, Annan 1859 (NLS)"
msgid ""
"Detailed town plan of Annan 1859, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville d’Annan 1859, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Arbroath 1858 (NLS)"
msgstr "Plans de ville Ordnance Survey, Arbroath 1858 (NLS)"
@@ -26874,6 +27239,8 @@ msgid ""
"Detailed town plan of Arbroath 1858, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville d’Arbroath 1858, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Ayr 1855 (NLS)"
msgstr "Plans de ville Ordnance Survey, Ayr 1855 (NLS)"
@@ -26881,6 +27248,8 @@ msgstr "Plans de ville Ordnance Survey, Ayr 1855 (NLS)"
msgid ""
"Detailed town plan of Ayr 1855, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville d’Ayr 1855, avec la permission de la Bibliothèque "
+"Nationale d’Écosse."
msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
msgstr "Plans de ville Ordnance Survey, Berwick-upon-Tweed 1852 (NLS)"
@@ -26889,6 +27258,8 @@ msgid ""
"Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library "
"of Scotland."
msgstr ""
+"Plan détaillé de la ville de Berwick-upon-Tweed 1852, avec la permission de "
+"la Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Brechin 1862 (NLS)"
msgstr "Plans de ville Ordnance Survey, Brechin 1862 (NLS)"
@@ -26896,6 +27267,8 @@ msgstr "Plans de ville Ordnance Survey, Brechin 1862 (NLS)"
msgid ""
"Detailed town plan of Brechin 1862, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville de Brechin 1862, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Burntisland 1894 (NLS)"
msgstr "Plans de ville Ordnance Survey, Burntisland 1894 (NLS)"
@@ -26904,6 +27277,8 @@ msgid ""
"Detailed town plan of Burntisland 1894, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Burntisland 1894, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Campbelton 1865 (NLS)"
msgstr "Plans de ville Ordnance Survey, Campbelton 1865 (NLS)"
@@ -26912,6 +27287,8 @@ msgid ""
"Detailed town plan of Campbelton 1865, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Campbelton 1865, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Coatbridge 1858 (NLS)"
msgstr "Plans de ville Ordnance Survey, Coatbridge 1858 (NLS)"
@@ -26920,6 +27297,8 @@ msgid ""
"Detailed town plan of Coatbridge 1858, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Coatbridge 1858, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr "Plans de ville Ordnance Survey, Cupar 1854 (NLS)"
@@ -26927,6 +27306,8 @@ msgstr "Plans de ville Ordnance Survey, Cupar 1854 (NLS)"
msgid ""
"Detailed town plan of Cupar 1854, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville de Cupar 1854, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
msgstr "Plans de ville Ordnance Survey, Cupar 1893-1894 (NLS)"
@@ -26935,6 +27316,8 @@ msgid ""
"Detailed town plan of Cupar 1893-1894, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Cupar 1893-1894, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Dalkeith 1852 (NLS)"
msgstr "Plans de ville Ordnance Survey, Dalkeith 1852 (NLS)"
@@ -26943,6 +27326,8 @@ msgid ""
"Detailed town plan of Dalkeith 1852, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Dalkeith 1852, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Dalkeith 1893 (NLS)"
msgstr "Plans de ville Ordnance Survey, Dalkeith 1893 (NLS)"
@@ -26951,6 +27336,8 @@ msgid ""
"Detailed town plan of Dalkeith 1893, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Dalkeith 1893, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Dumbarton 1859 (NLS)"
msgstr "Plans de ville Ordnance Survey, Dumbarton 1859 (NLS)"
@@ -26959,6 +27346,8 @@ msgid ""
"Detailed town plan of Dumbarton 1859, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Dumbarton 1859, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Dumfries 1850 (NLS)"
msgstr "Plans de ville Ordnance Survey, Dumfries 1850 (NLS)"
@@ -26967,6 +27356,8 @@ msgid ""
"Detailed town plan of Dumfries 1850, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Dumfries 1850, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Dumfries 1893 (NLS)"
msgstr "Plans de ville Ordnance Survey, Dumfries 1893 (NLS)"
@@ -26975,6 +27366,8 @@ msgid ""
"Detailed town plan of Dumfries 1893, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Dumfries 1893, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
msgstr "Plans de ville Ordnance Survey, Dundee 1857-1858 (NLS)"
@@ -26983,6 +27376,8 @@ msgid ""
"Detailed town plan of Dundee 1857-1858, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Dundee 1857-1858, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
msgstr "Plans de ville Ordnance Survey, Dundee 1870-1872 (NLS)"
@@ -26991,6 +27386,8 @@ msgid ""
"Detailed town plan of Dundee 1870-1872, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Dundee 1870-1872, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Dunfermline 1854 (NLS)"
msgstr "Plans de ville Ordnance Survey, Dunfermline 1854 (NLS)"
@@ -26999,6 +27396,8 @@ msgid ""
"Detailed town plan of Dunfermline 1854, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Dunfermline 1854, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Dunfermline 1894 (NLS)"
msgstr "Plans de ville Ordnance Survey, Dunfermline 1894 (NLS)"
@@ -27007,33 +27406,41 @@ msgid ""
"Detailed town plan of Dunfermline 1894, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Dunfermline 1894, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
msgstr ""
-"OS Plans de ville, Édimbourg 1849-1851 (Bibliothèque nationale d''Écosse)"
+"OS Plans de ville, Édimbourg 1849-1851 (Bibliothèque nationale d’Écosse)"
msgid ""
"Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville d’Édimbourg 1849-1851, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
msgstr ""
-"OS Plans de ville, Édimbourg 1876-1877 (Bibliothèque nationale d''Écosse)"
+"OS Plans de ville, Édimbourg 1876-1877 (Bibliothèque nationale d’Écosse)"
msgid ""
"Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville d’Édimbourg 1876-1877, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
msgstr ""
-"OS Plans de ville, Édimbourg 1893-1894 (Bibliothèque nationale d''Écosse)"
+"OS Plans de ville, Édimbourg 1893-1894 (Bibliothèque nationale d’Écosse)"
msgid ""
"Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville d’Édimbourg 1893-1894, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
msgstr ""
@@ -27042,6 +27449,8 @@ msgid ""
"Detailed town plan of Edinburgh 1940s-1960s, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville d’Édimbourg années 1940-1960, avec la permission "
+"de la Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Elgin 1868 (NLS)"
msgstr "Plans de ville Ordnance Survey, Elgin 1868 (NLS)"
@@ -27049,6 +27458,8 @@ msgstr "Plans de ville Ordnance Survey, Elgin 1868 (NLS)"
msgid ""
"Detailed town plan of Elgin 1868, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville d’Elgin 1868, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
msgstr "Plans de ville Ordnance Survey, Falkirk 1858-1859 (NLS)"
@@ -27057,6 +27468,8 @@ msgid ""
"Detailed town plan of Falkirk 1858-1859, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Falkirk 1858-1859, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
msgstr "Plans de ville Ordnance Survey, Forfar 1860-1861 (NLS)"
@@ -27065,6 +27478,8 @@ msgid ""
"Detailed town plan of Forfar 1860-1861, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Forfar 1860-1861, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Forres 1868 (NLS)"
msgstr "Plans de ville Ordnance Survey, Forres 1868 (NLS)"
@@ -27072,6 +27487,8 @@ msgstr "Plans de ville Ordnance Survey, Forres 1868 (NLS)"
msgid ""
"Detailed town plan of Forres 1868, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville de Forres 1868, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Galashiels 1858 (NLS)"
msgstr "Plans de ville Ordnance Survey, Galashiels 1858 (NLS)"
@@ -27080,6 +27497,8 @@ msgid ""
"Detailed town plan of Galashiels 1858, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Galashiels 1858, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Girvan 1857 (NLS)"
msgstr "Plans de ville Ordnance Survey, Girvan 1857 (NLS)"
@@ -27087,6 +27506,8 @@ msgstr "Plans de ville Ordnance Survey, Girvan 1857 (NLS)"
msgid ""
"Detailed town plan of Girvan 1857, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville de Girvan 1857, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
msgstr "Plans de ville Ordnance Survey, Glasgow 1857-1858 (NLS)"
@@ -27095,6 +27516,8 @@ msgid ""
"Detailed town plan of Glasgow 1857-1858, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Glasgow 1857-1858, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
msgstr "Plans de ville Ordnance Survey, Glasgow 1892-1894 (NLS)"
@@ -27103,6 +27526,8 @@ msgid ""
"Detailed town plan of Glasgow 1892-1894, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Glasgow 1892-1894, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Greenock 1857 (NLS)"
msgstr "Plans de ville Ordnance Survey, Greenock 1857 (NLS)"
@@ -27111,6 +27536,8 @@ msgid ""
"Detailed town plan of Greenock 1857, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Greenock 1857, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Haddington 1853 (NLS)"
msgstr "Plans de ville Ordnance Survey, Haddington 1853 (NLS)"
@@ -27119,6 +27546,8 @@ msgid ""
"Detailed town plan of Haddington 1853, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Haddington 1853, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Haddington 1893 (NLS)"
msgstr "Plans de ville Ordnance Survey, Haddington 1893 (NLS)"
@@ -27127,6 +27556,8 @@ msgid ""
"Detailed town plan of Haddington 1893, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Haddington 1893, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Hamilton 1858 (NLS)"
msgstr "Plans de ville Ordnance Survey, Hamilton 1858 (NLS)"
@@ -27135,6 +27566,8 @@ msgid ""
"Detailed town plan of Hamilton 1858, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Hamilton 1858, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
msgstr "Plans de ville Ordnance Survey, Hawick 1857-1858 (NLS)"
@@ -27143,6 +27576,8 @@ msgid ""
"Detailed town plan of Hawick 1857-1858, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Hawick 1857-1858, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
msgstr "Plans de ville Ordnance Survey, Inverness 1867-1868 (NLS)"
@@ -27151,6 +27586,8 @@ msgid ""
"Detailed town plan of Inverness 1867-1868, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville d’Inverness 1867-1868, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Irvine 1859 (NLS)"
msgstr "Plans de ville Ordnance Survey, Irvine 1859 (NLS)"
@@ -27158,6 +27595,8 @@ msgstr "Plans de ville Ordnance Survey, Irvine 1859 (NLS)"
msgid ""
"Detailed town plan of Irvine 1859, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville d’Irvine 1859, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Jedburgh 1858 (NLS)"
msgstr "Plans de ville Ordnance Survey, Jedburgh 1858 (NLS)"
@@ -27166,6 +27605,8 @@ msgid ""
"Detailed town plan of Jedburgh 1858, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Jedburgh 1858, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Kelso 1857 (NLS)"
msgstr "Plans de ville Ordnance Survey, Kelso 1857 (NLS)"
@@ -27173,6 +27614,8 @@ msgstr "Plans de ville Ordnance Survey, Kelso 1857 (NLS)"
msgid ""
"Detailed town plan of Kelso 1857, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville de Kelso 1857, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
msgstr "Plans de ville Ordnance Survey, Kilmarnock 1857-1859 (NLS)"
@@ -27181,6 +27624,8 @@ msgid ""
"Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Kilmarnock 1857-1859, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
msgstr "Plans de ville Ordnance Survey, Kirkcaldy 1855 (NLS)"
@@ -27189,6 +27634,8 @@ msgid ""
"Detailed town plan of Kirkcaldy 1855, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Kirkcaldy 1855, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
msgstr "Plans de ville Ordnance Survey, Kirkcaldy 1894 (NLS)"
@@ -27197,6 +27644,8 @@ msgid ""
"Detailed town plan of Kirkcaldy 1894, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Kirkcaldy 1894, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
msgstr "Plans de ville Ordnance Survey, Kirkcudbright 1850 (NLS)"
@@ -27205,6 +27654,8 @@ msgid ""
"Detailed town plan of Kirkcudbright 1850, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Kirkcudbright 1850, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
msgstr "Plans de ville Ordnance Survey, Kirkcudbright 1893 (NLS)"
@@ -27213,6 +27664,8 @@ msgid ""
"Detailed town plan of Kirkcudbright 1893, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Kirkcudbright 1893, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
msgstr "Plans de ville Ordnance Survey, Kirkintilloch 1859 (NLS)"
@@ -27221,6 +27674,8 @@ msgid ""
"Detailed town plan of Kirkintilloch 1859, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Kirkintilloch 1859, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
msgstr "Plans de ville Ordnance Survey, Kirriemuir 1861 (NLS)"
@@ -27229,6 +27684,8 @@ msgid ""
"Detailed town plan of Kirriemuir 1861, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Kirriemuir 1861, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Lanark 1858 (NLS)"
msgstr "Plans de ville Ordnance Survey, Lanark 1858 (NLS)"
@@ -27236,6 +27693,8 @@ msgstr "Plans de ville Ordnance Survey, Lanark 1858 (NLS)"
msgid ""
"Detailed town plan of Lanark 1858, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville de Lanark 1858, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Linlithgow 1856 (NLS)"
msgstr "Plans de ville Ordnance Survey, Linlithgow 1856 (NLS)"
@@ -27244,6 +27703,8 @@ msgid ""
"Detailed town plan of Linlithgow 1856, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Linlithgow 1856, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
msgstr "Plans de ville Ordnance Survey, Mayole 1856-1857 (NLS)"
@@ -27252,6 +27713,8 @@ msgid ""
"Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Maybole 1856-1857, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
msgstr "Plans de ville Ordnance Survey, Montrose 1861-1862 (NLS)"
@@ -27260,6 +27723,8 @@ msgid ""
"Detailed town plan of Montrose 1861-1862, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Montrose 1861-1862, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Musselburgh 1853 (NLS)"
msgstr "Plans de ville Ordnance Survey, Musselburgh 1853 (NLS)"
@@ -27268,6 +27733,8 @@ msgid ""
"Detailed town plan of Musselburgh 1853, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Musselburgh 1853, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Musselburgh 1893 (NLS)"
msgstr "Plans de ville Ordnance Survey, Musselburgh 1893 (NLS)"
@@ -27276,6 +27743,8 @@ msgid ""
"Detailed town plan of Musselburgh 1893, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Musselburgh 1893, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
msgstr "Plans de ville Ordnance Survey, Nairn 1867-1868 (NLS)"
@@ -27284,6 +27753,8 @@ msgid ""
"Detailed town plan of Nairn 1867-1868, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Nairn 1867-1868, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "Plans de ville Ordnance Survey, Oban 1867-1868 (NLS)"
@@ -27292,6 +27763,8 @@ msgid ""
"Detailed town plan of Oban 1867-1868, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville d’Oban 1867-1868, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Paisley 1858 (NLS)"
msgstr ""
@@ -27299,6 +27772,8 @@ msgstr ""
msgid ""
"Detailed town plan of Paisley 1858, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville de Paisley 1858, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "Plans de ville Ordnance Survey, Peebles 1856 (NLS)"
@@ -27306,6 +27781,8 @@ msgstr "Plans de ville Ordnance Survey, Peebles 1856 (NLS)"
msgid ""
"Detailed town plan of Peebles 1856, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville de Peebles 1856, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Perth 1860 (NLS)"
msgstr "Plans de ville Ordnance Survey, Perth 1860 (NLS)"
@@ -27313,6 +27790,8 @@ msgstr "Plans de ville Ordnance Survey, Perth 1860 (NLS)"
msgid ""
"Detailed town plan of Perth 1860, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville de Perth 1860, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Peterhead 1868 (NLS)"
msgstr "Plans de ville Ordnance Survey, Peterhead 1868 (NLS)"
@@ -27321,6 +27800,8 @@ msgid ""
"Detailed town plan of Peterhead 1868, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Peterhead 1868, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
msgstr "Plans de ville Ordnance Survey, Port Glasgow 1856-1857 (NLS)"
@@ -27329,6 +27810,8 @@ msgid ""
"Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library "
"of Scotland."
msgstr ""
+"Plan détaillé de la ville de Port Glasgow 1856-1857, avec la permission de "
+"la Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
msgstr "Plans de ville Ordnance Survey, Portobello 1893-1894 (NLS)"
@@ -27337,6 +27820,8 @@ msgid ""
"Detailed town plan of Portobello 1893-1894, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Portobello 1893-1894, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
msgstr "Plans de ville Ordnance Survey, Rothesay 1862-1863 (NLS)"
@@ -27345,6 +27830,8 @@ msgid ""
"Detailed town plan of Rothesay 1862-1863, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Rothesay 1862-1863, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Selkirk 1865 (NLS)"
msgstr "Plans de ville Ordnance Survey, Selkirk 1865 (NLS)"
@@ -27352,6 +27839,8 @@ msgstr "Plans de ville Ordnance Survey, Selkirk 1865 (NLS)"
msgid ""
"Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville de Selkirk 1865, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, St Andrews 1854 (NLS)"
msgstr "Plans de ville Ordnance Survey, St Andrews 1854 (NLS)"
@@ -27360,6 +27849,8 @@ msgid ""
"Detailed town plan of St Andrews 1854, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de St Andrews 1854, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, St Andrews 1893 (NLS)"
msgstr "Plans de ville Ordnance Survey, St Andrews 1893 (NLS)"
@@ -27368,6 +27859,8 @@ msgid ""
"Detailed town plan of St Andrews 1893, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de St Andrews 1893, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Stirling 1858 (NLS)"
msgstr "Plans de ville Ordnance Survey, Stirling 1858 (NLS)"
@@ -27376,6 +27869,8 @@ msgid ""
"Detailed town plan of Stirling 1858, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Stirling 1858, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Stonehaven 1864 (NLS)"
msgstr "Plans de ville Ordnance Survey, Stonehaven 1864 (NLS)"
@@ -27384,6 +27879,8 @@ msgid ""
"Detailed town plan of Stonehaven 1864, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Stonehaven 1864, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Stranraer 1847 (NLS)"
msgstr "Plans de ville Ordnance Survey, Stranraer 1847 (NLS)"
@@ -27392,6 +27889,8 @@ msgid ""
"Detailed town plan of Stranraer 1847, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Stranraer 1847, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
msgstr "Plans de ville Ordnance Survey, Stranraer 1863-1877 (NLS)"
@@ -27400,6 +27899,8 @@ msgid ""
"Detailed town plan of Stranraer 1863-1877, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Stranraer 1863-1877, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Stranraer 1893 (NLS)"
msgstr "Plans de ville Ordnance Survey, Stranraer 1893 (NLS)"
@@ -27408,6 +27909,8 @@ msgid ""
"Detailed town plan of Stranraer 1893, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Stranraer 1893, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Strathaven 1858 (NLS)"
msgstr "Plans de ville Ordnance Survey, Strathaven 1858 (NLS)"
@@ -27416,6 +27919,8 @@ msgid ""
"Detailed town plan of Strathaven 1858, courtesy of National Library of "
"Scotland."
msgstr ""
+"Plan détaillé de la ville de Strathaven 1858, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Wick 1872 (NLS)"
msgstr "Plans de ville Ordnance Survey, Wick 1872 (NLS)"
@@ -27423,6 +27928,8 @@ msgstr "Plans de ville Ordnance Survey, Wick 1872 (NLS)"
msgid ""
"Detailed town plan of Wick 1872, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville de Wick 1872, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Wigtown 1848 (NLS)"
msgstr "Plans de ville Ordnance Survey, Wigtown 1848 (NLS)"
@@ -27430,6 +27937,8 @@ msgstr "Plans de ville Ordnance Survey, Wigtown 1848 (NLS)"
msgid ""
"Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville de Wigtown 1848, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "OS Town Plans, Wigtown 1894 (NLS)"
msgstr "Plans de ville Ordnance Survey, Wigtown 1894 (NLS)"
@@ -27437,6 +27946,8 @@ msgstr "Plans de ville Ordnance Survey, Wigtown 1894 (NLS)"
msgid ""
"Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland."
msgstr ""
+"Plan détaillé de la ville de Wigtown 1894, avec la permission de la "
+"Bibliothèque Nationale d’Écosse."
msgid "Landsat 233055"
msgstr "Landsat 233055"
@@ -27673,6 +28184,14 @@ msgstr "{0} sur un chemin. Devrait être employé sur un nœud."
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} sur un chemin. Devrait être employé dans une relation."
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr "{0} avec {1} sur un nœud. Retirer {0}."
@@ -27742,14 +28261,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -27802,11 +28313,11 @@ msgstr "valeur vide séparée par des points-virgules ''{0}''"
msgid "numerical key"
msgstr "clé numérique"
-msgid "layer tag with + sign"
-msgstr "Attribut layer avec un signe +"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "Le niveau doit être compris entre -5 et 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr "{0} doit être numérique avec des incréments optionnels de 0,5"
@@ -27926,6 +28437,8 @@ msgstr ""
msgid "wikipedia title should not start with a space after language code"
msgstr ""
+"le titre Wikipédia ne doit pas commencer par un espace après le code de la "
+"langue"
msgid "wikipedia title should not have ''{0}'' prefix"
msgstr ""
@@ -29241,13 +29754,13 @@ msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
msgstr ""
msgid "{0} imported images"
-msgstr ""
+msgstr "{0} images importées"
msgid "{0} downloaded images"
-msgstr ""
+msgstr "{0} images téléchargées"
msgid "{0} images in total"
-msgstr ""
+msgstr "{0} images au total"
msgid "{0} images in {1} sequences"
msgstr ""
@@ -29590,7 +30103,7 @@ msgid "Import exception"
msgstr ""
msgid "Could not import the image ''{0}''!"
-msgstr ""
+msgstr "Impossible d’importer l’image ''{0}''!"
msgid "Could not import the directory ''{0}''!"
msgstr ""
@@ -29674,7 +30187,7 @@ msgid "Could not open the URL {0} in a browser"
msgstr ""
msgid "Downloading map objects…"
-msgstr ""
+msgstr "Téléchargement des objets de la carte…"
msgid "All map objects loaded."
msgstr "Tous les objets sont téléchargés."
@@ -29770,7 +30283,7 @@ msgid "No images found"
msgstr "Aucune image trouvée"
msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr ""
+msgstr "Vous avez chargé avec succès {0} images sur mapillary.com"
msgid "Finished upload"
msgstr "Envoi terminé"
@@ -30395,7 +30908,7 @@ msgid "Tags:"
msgstr "Attributs :"
msgid "Source:"
-msgstr ""
+msgstr "Source:"
msgid "Name:"
msgstr "Nom :"
@@ -30565,7 +31078,7 @@ msgid "Debugging mode will write images for each processing step."
msgstr "Le mode débogage écrira des images à chaque étape du traitement."
msgid "Please choose the address type"
-msgstr ""
+msgstr "Veuillez choisir le type d’adresse"
msgid ""
"<html>We could not automatically determine whether <strong>{0}</strong> "
@@ -30899,7 +31412,7 @@ msgid "Download from Cadastre"
msgstr ""
msgid "Objects:"
-msgstr ""
+msgstr "Objets:"
msgid "Select to download buildings in the selected download area."
msgstr ""
@@ -30955,11 +31468,14 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
msgid "Diffusion restriction"
-msgstr ""
+msgstr "Restriction de diffusion"
msgid "Cadastre Edigeo files"
msgstr ""
@@ -31538,7 +32054,7 @@ msgid "below"
msgstr ""
msgid "Maximum Distance"
-msgstr ""
+msgstr "Distance maximum"
msgid "Centroid Distance"
msgstr ""
@@ -31626,7 +32142,7 @@ msgid "Advanced Example"
msgstr ""
msgid "<Please select data>"
-msgstr ""
+msgstr "<Veuillez sélectionner des données>"
msgid "Configure conflation settings"
msgstr "Configurer les paramétres d’assemblage"
@@ -31635,13 +32151,13 @@ msgid "Generate matches"
msgstr "Générer les correspondances"
msgid "Merging"
-msgstr ""
+msgstr "Fusion en cours"
msgid "Reference:"
-msgstr ""
+msgstr "Référence:"
msgid "Subject:"
-msgstr ""
+msgstr "Sujet:"
msgid "Selections must be made for both reference and subject."
msgstr ""
@@ -31684,10 +32200,10 @@ msgid "Disambiguating"
msgstr ""
msgid "One to One"
-msgstr ""
+msgstr "Un à un"
msgid "Distance"
-msgstr ""
+msgstr "Distance"
msgid "Standard"
msgstr ""
@@ -32497,10 +33013,10 @@ msgid "Export file system path already exists but is not a directory."
msgstr ""
msgid "Failed to create export directory: {0}"
-msgstr ""
+msgstr "Échec de la création du répertoire d’exportation: {0}"
msgid "Failed to create export directory."
-msgstr ""
+msgstr "Échec de la création du répertoire d’exportation."
msgid "Append cache name"
msgstr ""
@@ -32521,7 +33037,7 @@ msgid "File system path the tiles are exported to."
msgstr ""
msgid "Export directory:"
-msgstr ""
+msgstr "Répertoire d’exportation:"
msgid "Append cache name to export directory."
msgstr ""
@@ -32901,9 +33417,6 @@ msgstr "Supprimer ceci"
msgid "Delete this&older"
msgstr "Supprimer ceci et plus ancien"
-msgid "km/h"
-msgstr "km/h"
-
msgid "Track name: "
msgstr "Nom de la trace : "
@@ -34449,6 +34962,9 @@ msgstr "nombre positif ou sans valeur"
msgid "Speed:"
msgstr "Vitesse :"
+msgid "km/h"
+msgstr "km/h"
+
msgid "direction"
msgstr "direction"
@@ -34789,10 +35305,10 @@ msgid "Incomplete Members"
msgstr ""
msgid "Do you want to make the roundabout round?"
-msgstr ""
+msgstr "Voulez-vous arrondir le rond-point?"
msgid "Roundabout round"
-msgstr ""
+msgstr "Rond-point arrondi."
msgid "Do you want to download referrers of platforms and stop positions?"
msgstr "Voulez-vous télécharger les références de plateformes et des arrêts?"
@@ -34823,13 +35339,13 @@ msgstr ""
msgid "{0} direction error"
msgid_plural "{0} direction errors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} erreur de direction"
+msgstr[1] "{0} erreurs de direction"
msgid "{0} road type error"
msgid_plural "{0} road type errors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} erreur de type de route"
+msgstr[1] "{0} erreurs de type de route"
msgid "How do you want to proceed?"
msgstr ""
@@ -34844,10 +35360,10 @@ msgid "PT: There is a gap in the "
msgstr ""
msgid "PT: Stop_position is not part of a way"
-msgstr ""
+msgstr "PT: La position d’arrêt ne fait pas partie d’un chemin"
msgid "PT: Platform should not be part of a way"
-msgstr ""
+msgstr "PT: La plate-forme ne devrait pas faire partie d’un chemin"
msgid "PT: Stop position or platform is not part of a stop area relation"
msgstr ""
@@ -35746,6 +36262,12 @@ msgstr "Sélectionner un seul objet"
msgid "Select a map object"
msgstr "Sélectionner un objet cartographique"
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
@@ -38196,7 +38718,7 @@ msgid "Search Wikidata items"
msgstr ""
msgid "Target key: "
-msgstr ""
+msgstr "Clé cible: "
msgid "Search Wikipedia category"
msgstr ""
@@ -38285,7 +38807,7 @@ msgid "help"
msgstr ""
msgid "Server: "
-msgstr ""
+msgstr "Serveur: "
msgid "Wikidata+OSM server"
msgstr ""
diff --git a/i18n/po/ga.po b/i18n/po/ga.po
index fda69fe..e8e2ad1 100644
--- a/i18n/po/ga.po
+++ b/i18n/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2015-05-17 11:43+0000\n"
"Last-Translator: Thorsten <Unknown>\n"
"Language-Team: Irish <ga at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:42+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -2910,24 +2910,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2994,18 +2976,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3519,6 +3496,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4187,6 +4182,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4874,6 +4872,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5001,6 +5018,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5298,6 +5320,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8039,6 +8064,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10527,6 +10555,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10545,6 +10723,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13964,6 +14147,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15338,6 +15530,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15981,6 +16179,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16029,6 +16231,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16955,12 +17193,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16973,9 +17205,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17747,6 +17976,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18456,9 +18691,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20654,24 +20886,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20697,9 +20911,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20717,6 +20928,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20818,9 +21048,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20983,18 +21210,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21107,6 +21337,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21884,6 +22160,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22232,6 +22511,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22837,9 +23119,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23083,6 +23375,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23095,7 +23390,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23172,6 +23467,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23498,6 +23800,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23513,6 +23818,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23817,6 +24125,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24740,6 +25051,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24787,10 +25101,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24799,6 +25113,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24860,6 +25182,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25799,6 +26124,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25865,14 +26198,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25923,10 +26248,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28686,6 +29011,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30488,9 +30816,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31924,6 +32249,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33159,6 +33487,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/gl.po b/i18n/po/gl.po
index 3babf9e..7cd236b 100644
--- a/i18n/po/gl.po
+++ b/i18n/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2016-01-01 15:11+0000\n"
"Last-Translator: Marcos Lans <Unknown>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:42+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: gl\n"
"X-Poedit-Language: Galician\n"
@@ -3078,24 +3078,6 @@ msgstr "Valor incorrecto de latitude «{0}»"
msgid "Illegal longitude value ''{0}''"
msgstr "Valor incorrecto de lonxitude «{0}»"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3171,18 +3153,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "Estilo de pintura {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Capa: {0}"
-msgid "Failed to persist preferences to ''{0}''"
-msgstr ""
+msgid "Paint style {0}: {1}"
+msgstr "Estilo de pintura {0}: {1}"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3721,6 +3698,24 @@ msgstr "texto"
msgid "areatext"
msgstr "área de texto"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4393,6 +4388,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "O multipolígono non está pechado"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -5083,6 +5081,25 @@ msgstr "Cargando a configuración de imaxes…"
msgid "usage"
msgstr "uso"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "opcións"
@@ -5218,6 +5235,11 @@ msgstr "Estabelecendo os valores predeterminados"
msgid "Creating main GUI"
msgstr "Creando Interface (GUI) principal"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5517,6 +5539,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8368,6 +8393,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10918,6 +10946,156 @@ msgstr "(o URL era: "
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10936,6 +11114,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14449,6 +14632,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Saltar descarga"
@@ -15861,6 +16053,12 @@ msgstr "Motocicleta"
msgid "Motorcar"
msgstr "Automóbil"
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Referencia"
@@ -16504,6 +16702,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16552,6 +16754,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr "Material"
+
+msgid "plastic"
+msgstr "plástico"
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr "pedra"
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr "Peso máximo (t)"
@@ -17478,12 +17716,6 @@ msgstr "Barreiras"
msgid "Block"
msgstr "Bloque"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "pedra"
-
msgid "Bollard"
msgstr "Bolardo"
@@ -17496,9 +17728,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr "plástico"
-
msgid "Cycle Barrier"
msgstr "Barreira para bicicletas"
@@ -18271,6 +18500,12 @@ msgstr "Mestura 1/25 (mofa/moped)"
msgid "1/50 mix (mofa/moped)"
msgstr "Mestura 1/50 (mofa/moped)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18980,9 +19215,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "Zoo"
@@ -21178,24 +21410,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -21221,9 +21435,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -21241,6 +21452,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -21342,9 +21572,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21507,18 +21734,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr "Poste"
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21631,6 +21861,52 @@ msgstr "Campo de batalla"
msgid "Palaeontological Site"
msgstr "Sitio paleontolóxico"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monumento"
@@ -22408,6 +22684,9 @@ msgstr ""
msgid "Suburb"
msgstr "Suburbio"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22756,6 +23035,9 @@ msgstr "Horticultura"
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -23361,9 +23643,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23607,6 +23899,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23619,7 +23914,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23696,6 +23991,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -24022,6 +24324,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -24037,6 +24342,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -24341,6 +24649,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Catastro"
@@ -25264,6 +25575,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -25311,10 +25625,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -25323,6 +25637,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -25384,6 +25706,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -26323,6 +26648,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -26389,14 +26722,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -26447,10 +26772,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -29243,6 +29568,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -31061,9 +31389,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr "Nome do camiño: "
@@ -32505,6 +32830,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33742,6 +34070,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/he.po b/i18n/po/he.po
index b1e1e31..a4384e7 100644
--- a/i18n/po/he.po
+++ b/i18n/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2017-06-04 17:31+0000\n"
"Last-Translator: SwiftFast <Unknown>\n"
"Language-Team: Hebrew <he at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:43+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: he\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2923,24 +2923,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3007,18 +2989,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "סגנון ציור {0}: {1}"
-
msgid "Layer: {0}"
msgstr "שיכבה: {0}"
-msgid "Failed to persist preferences to ''{0}''"
-msgstr ""
+msgid "Paint style {0}: {1}"
+msgstr "סגנון ציור {0}: {1}"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3535,6 +3512,24 @@ msgstr "טקסט"
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4205,6 +4200,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4894,6 +4892,25 @@ msgstr "טוען הגדרות תמונות אוויריות"
msgid "usage"
msgstr "שימוש"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "אפשרויות"
@@ -5021,6 +5038,11 @@ msgstr "קביעת ברירות מחדל"
msgid "Creating main GUI"
msgstr "יוצר ממשקי גרפי ראשי"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5318,6 +5340,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8068,6 +8093,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10569,6 +10597,156 @@ msgstr "(הכתובת היתה: "
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10587,6 +10765,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14006,6 +14189,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15382,6 +15574,12 @@ msgstr "אופנוע"
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "התייחסות"
@@ -16025,6 +16223,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16073,6 +16275,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr "משקל מירבי (טונות)"
@@ -16999,12 +17237,6 @@ msgstr "מחסומים"
msgid "Block"
msgstr "מחסום"
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -17017,9 +17249,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17791,6 +18020,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18500,9 +18735,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "גן חיות"
@@ -20698,24 +20930,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20741,9 +20955,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20761,6 +20972,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20862,9 +21092,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21027,18 +21254,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21151,6 +21381,52 @@ msgstr "שדה קרב"
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "אנדרטה"
@@ -21928,6 +22204,9 @@ msgstr ""
msgid "Suburb"
msgstr "פרבר"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22276,6 +22555,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22881,9 +23163,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23127,6 +23419,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23139,7 +23434,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23216,6 +23511,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23542,6 +23844,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23557,6 +23862,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23861,6 +24169,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24784,6 +25095,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24831,10 +25145,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24843,6 +25157,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24904,6 +25226,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25843,6 +26168,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25909,14 +26242,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25967,10 +26292,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28730,6 +29055,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30532,9 +30860,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31972,6 +32297,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33207,6 +33535,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/hi.po b/i18n/po/hi.po
index 99d0e70..a6c1ded 100644
--- a/i18n/po/hi.po
+++ b/i18n/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2009-11-14 16:28+0000\n"
"Last-Translator: nipunreddevil <nipunreddevil at gmail.com>\n"
"Language-Team: Hindi <hi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:44+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: hi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/hr.po b/i18n/po/hr.po
index 094818e..5e1db7d 100644
--- a/i18n/po/hr.po
+++ b/i18n/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2016-01-04 15:56+0000\n"
"Last-Translator: gogo <trebelnik2 at gmail.com>\n"
"Language-Team: Croatian <hr at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:57+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:00+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: hr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3015,24 +3015,6 @@ msgstr "Nedozvoljena vrijednost zemljopisne širine ''{0}''"
msgid "Illegal longitude value ''{0}''"
msgstr "Nedozvoljena vrijednost zemljopisne dužine ''{0}''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3099,18 +3081,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr "Sloj: {0}"
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3627,6 +3604,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4295,6 +4290,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4984,6 +4982,25 @@ msgstr "Učitavnje postavka slika"
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5111,6 +5128,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr "Kreiranje glavog GUI"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5408,6 +5430,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8162,6 +8187,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10678,6 +10706,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10696,6 +10874,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14115,6 +14298,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15489,6 +15681,12 @@ msgstr "Motorcikl"
msgid "Motorcar"
msgstr "Automobil"
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -16132,6 +16330,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16180,6 +16382,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr "Max. težina (t)"
@@ -17106,12 +17344,6 @@ msgstr "Prepreke (Barriers)"
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -17124,9 +17356,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr "Biciklistička prepreka (Cycle Barrier)"
@@ -17898,6 +18127,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18607,9 +18842,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20805,24 +21037,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20848,9 +21062,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20868,6 +21079,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20969,9 +21199,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21134,18 +21361,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21258,6 +21488,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -22035,6 +22311,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22383,6 +22662,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22988,9 +23270,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23234,6 +23526,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23246,7 +23541,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23323,6 +23618,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23649,6 +23951,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23664,6 +23969,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23968,6 +24276,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24891,6 +25202,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24938,10 +25252,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24950,6 +25264,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -25011,6 +25333,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25950,6 +26275,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -26016,14 +26349,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -26074,10 +26399,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28837,6 +29162,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30639,9 +30967,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -32079,6 +32404,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33314,6 +33642,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/ht.po b/i18n/po/ht.po
index 77a5c5f..c94e546 100644
--- a/i18n/po/ht.po
+++ b/i18n/po/ht.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2010-03-11 21:17+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Haitian; Haitian Creole <ht at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:43+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/hu.po b/i18n/po/hu.po
index 5f97ee0..8f96dce 100644
--- a/i18n/po/hu.po
+++ b/i18n/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2017-09-30 19:17+0000\n"
"Last-Translator: Gábor Babos <Unknown>\n"
"Language-Team: Hungarian <kde-l10n-hu at kde.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: 2017-10-01 04:31+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: hu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3164,24 +3164,6 @@ msgstr "Rossz széleségi érték: ''{0}''"
msgid "Illegal longitude value ''{0}''"
msgstr "Rossz hosszúsági érték: ''{0}''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Nem sikerült létrehozni a hiányző cache könyvtárat: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Nem sikerült létrehozni a hiányzó cache könyvtárat: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Nem lehetséges a(z) {0} ideiglenes fájl törlése"
@@ -3266,22 +3248,15 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "Rajz stílus {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Réteg: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Rajz stílus {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Nem sikerült elmenteni a beállításokat az alábbi helyre: ''{0}''"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"IPv6 kapcsolat engedélyezésének megpróbálása, IPv6 preferálása IPv4-gyel "
-"szemben (csak az indítás korai fázisában működik)."
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr "A {0} beállítás törölve, mivel már nincs használatban."
@@ -3833,6 +3808,24 @@ msgstr "szöveg"
msgid "areatext"
msgstr "területszöveg"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Nem sikerült létrehozni a hiányző cache könyvtárat: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Nem sikerült létrehozni a hiányzó cache könyvtárat: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Várt elem: \"{0}\", kapott érték: \"{1}\""
@@ -4524,6 +4517,9 @@ msgstr "Terület típus van a külső vonalon"
msgid "Multipolygon is not closed"
msgstr "A multipoligon nem zárt"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr "A multipoligon gyűrűknek közös pontja(i) van(nak)"
@@ -5245,6 +5241,25 @@ msgstr "Légifelvétel-beállítások betöltése"
msgid "usage"
msgstr "használat"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "beállítások"
@@ -5384,6 +5399,13 @@ msgstr "Alapértelmezett beállítások"
msgid "Creating main GUI"
msgstr "Felhasználói felület betöltése"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"IPv6 kapcsolat engedélyezésének megpróbálása, IPv6 preferálása IPv4-gyel "
+"szemben (csak az indítás korai fázisában működik)."
+
msgid "Updating plugins"
msgstr "Bővítények frissítése"
@@ -5701,6 +5723,9 @@ msgstr "Nagyít"
msgid "Shrink"
msgstr "Kicsinyít"
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8687,6 +8712,9 @@ msgstr ""
"objektummal:<br>''{1}''.<br>Kérlek előbb ezt az ütközést oldd meg, majd "
"próbáld újra.</html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr "A kijelölt kapcsolattagoknak megfelelő objektumok kijelölése"
@@ -11463,6 +11491,156 @@ msgstr "(Az URL: "
msgid "Select the map painting styles"
msgstr "Térképrajz stílusának kijelölése"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11486,6 +11664,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Nem sikerült értelmezni a térképstílusokat itt: \"{0}\". Hiba: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "A kép nem található ''{0}''"
@@ -15310,6 +15493,15 @@ msgstr "Réteg kihagyása és folytatás"
msgid "expected .jos file inside .joz archive"
msgstr "a .jos fájl elvárt a .joz archívumon belül"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Letöltés kihagyása"
@@ -16901,6 +17093,12 @@ msgstr "Motorkerékpár"
msgid "Motorcar"
msgstr "Gépkocsi"
+msgid "Minimum age"
+msgstr "Korhatár"
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Azonosító"
@@ -17548,6 +17746,10 @@ msgid "platform"
msgstr "tengeri platformon"
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr "kis épület"
@@ -17596,6 +17798,42 @@ msgstr "gőz"
msgid "vacuum"
msgstr "vákum"
+msgid "Material"
+msgstr "Anyag"
+
+msgid "plastic"
+msgstr "műanyag"
+
+msgid "steel"
+msgstr "acél"
+
+msgid "stone"
+msgstr "kő"
+
+msgid "Location transition"
+msgstr "Elhelyezkedés: átmenet"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Feszültségfokozat (kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Fázisok"
+
msgid "Max. weight (tonnes)"
msgstr "Súlykorlátozás (tonna)"
@@ -18542,12 +18780,6 @@ msgstr "Akadályok"
msgid "Block"
msgstr "Kőtömb"
-msgid "Material"
-msgstr "Anyag"
-
-msgid "stone"
-msgstr "kő"
-
msgid "Bollard"
msgstr "Terelőoszlop"
@@ -18560,9 +18792,6 @@ msgstr "kiemelkedő"
msgid "removable"
msgstr "eltávolítható"
-msgid "plastic"
-msgstr "műanyag"
-
msgid "Cycle Barrier"
msgstr "Kerékpárakadály (labirintkorlát)"
@@ -19337,6 +19566,12 @@ msgstr "1:25 keverék (moped)"
msgid "1/50 mix (mofa/moped)"
msgstr "1:50 keverék (moped)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr "Üzemanyagkártyák:"
@@ -20049,9 +20284,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Mozivásznak száma"
-msgid "Minimum age"
-msgstr "Korhatár"
-
msgid "Zoo"
msgstr "Állatkert"
@@ -22250,24 +22482,6 @@ msgctxt "power"
msgid "industrial"
msgstr "ipari"
-msgid "Power rating (kVA/MVA)"
-msgstr "Feszültségfokozat (kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "Gázszigetelt"
@@ -22293,9 +22507,6 @@ msgctxt "power"
msgid "yes"
msgstr "igen"
-msgid "Phases"
-msgstr "Fázisok"
-
msgid "Power Switchgear"
msgstr "Kapcsolóállomás"
@@ -22315,6 +22526,25 @@ msgstr "Összekötő kábel (állomásokon belül)"
msgid "Power Switch"
msgstr "Szakaszoló"
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr "Egyenirányító"
@@ -22418,9 +22648,6 @@ msgstr "csöves"
msgid "solid"
msgstr "tömör"
-msgid "steel"
-msgstr "acél"
-
msgctxt "color"
msgid "red/white"
msgstr "piros/fehér"
@@ -22583,18 +22810,21 @@ msgstr "Hármas torony"
msgid "Incomplete tower"
msgstr "Félkész torony"
-msgid "Location transition"
-msgstr "Elhelyezkedés: átmenet"
-
msgid "Pole"
msgstr "Villanyoszlop"
-msgid "Pole with Transformer"
-msgstr "Villanyoszlop transzformátorral"
+msgid "Pole with Switch"
+msgstr ""
msgid "Pole Attributes:"
msgstr "Villanyoszlop tulajdonságai:"
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr "Villanyoszlop transzformátorral"
+
msgid "Transformer Attributes:"
msgstr "Transzformátor tulajdonságai:"
@@ -22707,6 +22937,52 @@ msgstr "Csatatér"
msgid "Palaeontological Site"
msgstr "Őslénytani lelőhely"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monumentális, épületszerű emlékmű"
@@ -23484,6 +23760,9 @@ msgstr "Különálló lakhely"
msgid "Suburb"
msgstr "Jelentős városrész"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "Környék"
@@ -23851,6 +24130,9 @@ msgstr "Üvegházi kertészet"
msgid "Plant Nursery"
msgstr "Faiskola"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr "Akvakultúra"
@@ -24461,11 +24743,21 @@ msgstr "Útvonalak"
msgid "Bicycle Route"
msgstr "Kerékpáros útvonal"
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
-msgstr "országos"
+msgstr ""
+
+msgctxt "network"
+msgid "regional"
+msgstr ""
+msgctxt "network"
msgid "local"
-msgstr "helyi"
+msgstr ""
msgid "Mountain Biking Route"
msgstr "Hegyikerékpáros útvonal"
@@ -24707,6 +24999,9 @@ msgstr "OpenStreetMap GPS-nyomvonalak"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr "Az OpenStreetMapre feltöltött nyilvános GPS-nyomvonalak"
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr "Tömegközlekedés (ÖPNV)"
@@ -24719,8 +25014,8 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr "Stamen Terep"
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
-msgstr "Kambodzsa, Laosz, Thaiföld, Vietnam, Mianmar kétnyelvű"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT map (fedettség)"
@@ -24798,6 +25093,13 @@ msgstr ""
"Nyár végi felvételek, amelyeket a rendes forrásokat erősen eltakarhatják a "
"felhők és a hó (valós színű)"
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr "imagico.de OSM képek térképezéshez: Dél-Transzantarktiszi-hegység"
@@ -25126,6 +25428,9 @@ msgstr "URBIS 2015 légifelvétel"
msgid "URBIS 2016 aerial imagery"
msgstr "URBIS 2016 légifotó"
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW(allonie) PICC numerical imagery"
@@ -25141,6 +25446,9 @@ msgstr "SPW(allonie) 2012-2013 légifelvétel"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 légifelvétel"
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -25446,6 +25754,9 @@ msgstr "BDOrtho IGN"
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Cadastre"
@@ -26386,6 +26697,9 @@ msgstr "Fiez Ortofotó 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr "Basel-Stadt kanton 2015"
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr "Basel-Landschaft kanton 10cm (2015)"
@@ -26434,11 +26748,11 @@ msgstr "USGS topográfiai térképek"
msgid "USGS Large Scale Imagery"
msgstr "USGS Large Scale Imagery"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012 utak rátét"
+msgid "TIGER Roads 2012"
+msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "Új és elcsúszott utak TIGER (2015)"
+msgid "TIGER Roads 2014"
+msgstr ""
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -26446,6 +26760,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcellák"
@@ -26507,6 +26829,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr "San Juan Metro Area: 2013 USACE ortofotók"
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr "WA San Juan megye légifelvétele"
@@ -27476,6 +27801,14 @@ msgstr "{0} vonalon. Ponton kellene használni."
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} egy vonalon van. Egy kapcsolatban kellene használni"
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr "{0} és {1} együtt egy ponton. Távolítsd el ezt: {0}."
@@ -27546,14 +27879,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -27608,11 +27933,11 @@ msgstr "üres érték a pontosvesszővel elválasztott \"{0}\" címkében"
msgid "numerical key"
msgstr "numerikus kulcs"
-msgid "layer tag with + sign"
-msgstr "réteg címke + jellel"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "a rétegnek -5 és 5 között kell lennie"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr "{0} csak számokat tartalmazhat, szükség szerint .5 lépésekben"
@@ -30589,6 +30914,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -32440,9 +32768,6 @@ msgstr "Töröld ezt"
msgid "Delete this&older"
msgstr "Töröld ezt és a régebbieket"
-msgid "km/h"
-msgstr "km/h"
-
msgid "Track name: "
msgstr "Nyomvonal neve: "
@@ -33959,6 +34284,9 @@ msgstr "pozitív szám, vagy üres"
msgid "Speed:"
msgstr "Sebesség:"
+msgid "km/h"
+msgstr "km/h"
+
msgid "direction"
msgstr "irány"
@@ -35232,6 +35560,12 @@ msgstr "Csak egy objektum kijelölése"
msgid "Select a map object"
msgstr "Térképobjektum kijelölése"
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/hy.po b/i18n/po/hy.po
index 5e98f8c..9c51c42 100644
--- a/i18n/po/hy.po
+++ b/i18n/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2011-04-13 21:51+0000\n"
"Last-Translator: Gev777 <Unknown>\n"
"Language-Team: Armenian <hy at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:32+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:35+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: hy\n"
msgid "Cancel"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr "Ինտերֆեյսի ստեղծում"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/ia.po b/i18n/po/ia.po
index bf805c2..2523911 100644
--- a/i18n/po/ia.po
+++ b/i18n/po/ia.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2011-08-29 01:02+0000\n"
"Last-Translator: Emilio Sepulveda <Unknown>\n"
"Language-Team: Interlingua <ia at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:45+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: ia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/id.po b/i18n/po/id.po
index 9b2edf6..9ba8a4c 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: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2016-03-10 03:36+0000\n"
"Last-Translator: Ezagren <ezagren at gmail.com>\n"
"Language-Team: Indonesian <id at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:46+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: id\n"
"X-Language: id_ID\n"
@@ -3087,24 +3087,6 @@ msgstr "Nilai lintang tidak sah ''{0}''"
msgid "Illegal longitude value ''{0}''"
msgstr "Nilai bujur tidak sah \"{0}\""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Gagal untuk membuat direktori cache yang hilang: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3179,18 +3161,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "Gaya Gambar {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Layer: {0}"
-msgid "Failed to persist preferences to ''{0}''"
-msgstr ""
+msgid "Paint style {0}: {1}"
+msgstr "Gaya Gambar {0}: {1}"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3736,6 +3713,24 @@ msgstr "teks"
msgid "areatext"
msgstr "teks area"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Gagal untuk membuat direktori cache yang hilang: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4421,6 +4416,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "Multipoligon tidak menutup"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -5125,6 +5123,25 @@ msgstr "Memuat Preferensi citra"
msgid "usage"
msgstr "penggunaan"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "Pilihan"
@@ -5260,6 +5277,11 @@ msgstr "Pengaturan standar"
msgid "Creating main GUI"
msgstr "Membuat GUI Utama"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr "Memperbaharui plugin"
@@ -5560,6 +5582,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8429,6 +8454,9 @@ msgstr ""
"objek<br>''{1}''.<br>Silahkan selesaikan konflik ini terlebih dahulu, lalu "
"coba lagi.</html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr "memilih objek yang dipilih relasi member"
@@ -11103,6 +11131,156 @@ msgstr "(URL adalah: "
msgid "Select the map painting styles"
msgstr "memilih model pewarnaan peta"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11122,6 +11300,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Gagal untuk menemukan gambar \"{0}\""
@@ -14839,6 +15022,15 @@ msgstr "Lewati layer dan selanjutnya"
msgid "expected .jos file inside .joz archive"
msgstr "Diharapkan berkas .jos di dalam arsip .joz"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Lewatkan unduh"
@@ -16332,6 +16524,12 @@ msgstr "Sepeda motor"
msgid "Motorcar"
msgstr "Mobil"
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Referensi"
@@ -16975,6 +17173,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -17023,6 +17225,42 @@ msgstr "uap"
msgid "vacuum"
msgstr "vakum"
+msgid "Material"
+msgstr "Bahan"
+
+msgid "plastic"
+msgstr "plastik"
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr "batu"
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr "Berat Maksimum (ton)"
@@ -17958,12 +18196,6 @@ msgstr "Halangan"
msgid "Block"
msgstr "Blok"
-msgid "Material"
-msgstr "Bahan"
-
-msgid "stone"
-msgstr "batu"
-
msgid "Bollard"
msgstr "Tonggak Penambat Kapal"
@@ -17976,9 +18208,6 @@ msgstr "meningkat"
msgid "removable"
msgstr "dapat dihapus"
-msgid "plastic"
-msgstr "plastik"
-
msgid "Cycle Barrier"
msgstr "Halangan Sepeda"
@@ -18750,6 +18979,12 @@ msgstr "Campuran 1/25 (mofa/mofed)"
msgid "1/50 mix (mofa/moped)"
msgstr "Campuran 1/50 (mofa/mofed)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -19459,9 +19694,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "Kebun Binatang"
@@ -21657,24 +21889,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -21700,9 +21914,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -21720,6 +21931,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -21821,9 +22051,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21986,18 +22213,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr "Tiang"
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -22110,6 +22340,52 @@ msgstr "Tempat pertempuran"
msgid "Palaeontological Site"
msgstr "Situs Palaeontological"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monumen"
@@ -22887,6 +23163,9 @@ msgstr "Tertinggal/terisolasi"
msgid "Suburb"
msgstr "pinggiran kota"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "lingkungan"
@@ -23235,6 +23514,9 @@ msgstr "Rumah Hijau"
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -23842,9 +24124,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -24088,6 +24380,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -24100,7 +24395,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -24177,6 +24472,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -24503,6 +24805,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -24518,6 +24823,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -24822,6 +25130,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Kadaster"
@@ -25745,6 +26056,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -25792,10 +26106,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -25804,6 +26118,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -25865,6 +26187,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -26804,6 +27129,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -26870,14 +27203,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -26928,10 +27253,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
-msgstr "tag layer dengan tanda +"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -29899,6 +30224,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -31794,9 +32122,6 @@ msgstr "Hapus ini"
msgid "Delete this&older"
msgstr "Hapus ini dan yang lama"
-msgid "km/h"
-msgstr "km/jam"
-
msgid "Track name: "
msgstr "Nama jalur: "
@@ -33322,6 +33647,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr "km/jam"
+
msgid "direction"
msgstr ""
@@ -34584,6 +34912,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/is.po b/i18n/po/is.po
index c0f79c0..675badf 100644
--- a/i18n/po/is.po
+++ b/i18n/po/is.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2015-11-06 00:32+0000\n"
"Last-Translator: Stefán Örvar Sigmundsson <stefan.orvar.sigmundsson at emi.is>\n"
"Language-Team: Icelandic <is at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:45+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: is\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2928,24 +2928,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3012,18 +2994,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr "Lag: {0}"
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3539,6 +3516,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4207,6 +4202,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4894,6 +4892,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5023,6 +5040,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr "Bý til aðal notandaviðmót"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5320,6 +5342,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8065,6 +8090,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10563,6 +10591,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10581,6 +10759,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14013,6 +14196,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Ekki sækja"
@@ -15390,6 +15582,12 @@ msgstr "Vélhjól"
msgid "Motorcar"
msgstr "Bifreið"
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Tilvísun"
@@ -16033,6 +16231,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16081,6 +16283,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr "Hámarksþyngt (í tonnum)"
@@ -17007,12 +17245,6 @@ msgstr "Tálmar"
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -17025,9 +17257,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17799,6 +18028,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18508,9 +18743,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "Dýragarður"
@@ -20706,24 +20938,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20749,9 +20963,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20769,6 +20980,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20870,9 +21100,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21035,18 +21262,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21159,6 +21389,52 @@ msgstr "Vígvöllur"
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Minnismerki"
@@ -21936,6 +22212,9 @@ msgstr ""
msgid "Suburb"
msgstr "Hverfi"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22284,6 +22563,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22889,9 +23171,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23135,6 +23427,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23147,7 +23442,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23224,6 +23519,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23550,6 +23852,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23565,6 +23870,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23869,6 +24177,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24792,6 +25103,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24839,10 +25153,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24851,6 +25165,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24912,6 +25234,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25851,6 +26176,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25917,14 +26250,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25975,10 +26300,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28739,6 +29064,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30541,9 +30869,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31977,6 +32302,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33212,6 +33540,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/it.po b/i18n/po/it.po
index 00c3dc3..df7d8cf 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: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-09-30 12:55+0000\n"
-"Last-Translator: Don-vip <Unknown>\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-24 12:58+0000\n"
+"Last-Translator: Moire <Unknown>\n"
"Language-Team: Italian <talk-it at lists.openstreetmap.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-10-01 04:32+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: it\n"
"X-Language: it_IT\n"
"X-Source-Language: en\n"
@@ -3220,25 +3220,6 @@ msgstr "Valore ''''{0}'''' non valido per la latitudine"
msgid "Illegal longitude value ''{0}''"
msgstr "Valore ''''{0}'''' non valido per la longitudine"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Fallita la creazione della cartella cache mancante: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-"<html>Fallita la creazione della cartella mancante della cache: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Impossibile cancellare il file temporaneo {0}"
@@ -3324,22 +3305,15 @@ msgstr "Impossibile caricare il file di cache: {0}"
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr "Impossibile cancellare il file predefinito di cache difettoso: {0}"
-msgid "Paint style {0}: {1}"
-msgstr "Stile di disegno {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Livello: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Stile di disegno {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Fallita la persistenza delle preferenze su ''{0}''"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Prova ad abilitare IPv6 network, preferire IPv6 su IPv4 (funziona solo sulla "
-"prima messa in servizio)."
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr ""
"L''impostazione delle preferenze {0} è stata rimossa dal momento che non è "
@@ -3917,6 +3891,25 @@ msgstr "testo"
msgid "areatext"
msgstr "testo dell''area"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Fallita la creazione della cartella cache mancante: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+"<html>Fallita la creazione della cartella mancante della cache: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Atteso elemento ''{0}'', ma ottenuto ''{1}''"
@@ -4624,6 +4617,9 @@ msgstr "Stile di area in un percorso esterno (multipoligono)"
msgid "Multipolygon is not closed"
msgstr "Il multi-poligono non è chiuso"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr "Anelli del Multipoligono condividono dei nodi"
@@ -5355,6 +5351,25 @@ msgstr "Caricamento delle preferenze delle immagini aeree"
msgid "usage"
msgstr "uso"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "opzioni"
@@ -5496,6 +5511,13 @@ msgstr "Impostazioni predefinite"
msgid "Creating main GUI"
msgstr "Creazione dell''interfaccia principale"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Prova ad abilitare IPv6 network, preferire IPv6 su IPv4 (funziona solo sulla "
+"prima messa in servizio)."
+
msgid "Updating plugins"
msgstr "Aggiornamento estensioni"
@@ -5819,6 +5841,9 @@ msgstr "Allarga"
msgid "Shrink"
msgstr "Restringi"
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8880,6 +8905,9 @@ msgstr ""
"l''oggetto<br>''{1}''.<br>Si prega di risolvere prima questo conflitto, e "
"poi di riprovare.</html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr "Seleziona gli oggetti per i membri della relazione selezionati"
@@ -9699,7 +9727,7 @@ msgstr ""
"Scegli \"Salva\" per salvare il livello nel file specificato a sinistra."
msgid "I would like someone to review my edits."
-msgstr ""
+msgstr "Vorrei che qualcuno controllasse queste modifiche"
msgid "Provide a brief comment for the changes you are uploading:"
msgstr "Crea un breve commento ai cambiamenti che sta caricando:"
@@ -11691,6 +11719,156 @@ msgstr "(URL: "
msgid "Select the map painting styles"
msgstr "Seleziona gli stili di disegno della mappa"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11718,6 +11896,11 @@ msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
"Fallita l''analisi degli stili Mappaint da ''{0}''. L''errore è stato: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Impossibile trovare l''immagine ''{0}''"
@@ -15666,6 +15849,15 @@ msgstr "Tralascia il livello e continua"
msgid "expected .jos file inside .joz archive"
msgstr "era atteso un file .jos all''interno dell''archivio .joz"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Tralascia lo scaricamento"
@@ -17281,6 +17473,12 @@ msgstr "Motocicletta"
msgid "Motorcar"
msgstr "Automobile"
+msgid "Minimum age"
+msgstr "Età minima"
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Riferimento"
@@ -17928,6 +18126,10 @@ msgid "platform"
msgstr "piattaforma"
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr "chiosco"
@@ -17976,6 +18178,42 @@ msgstr "vapore"
msgid "vacuum"
msgstr "vuoto"
+msgid "Material"
+msgstr "Materiale"
+
+msgid "plastic"
+msgstr "plastica"
+
+msgid "steel"
+msgstr "acciaio"
+
+msgid "stone"
+msgstr "pietra"
+
+msgid "Location transition"
+msgstr "Location transition"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Potenza (kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Fasi"
+
msgid "Max. weight (tonnes)"
msgstr "Peso massimo (tonnellate)"
@@ -18924,12 +19162,6 @@ msgstr "Barriere"
msgid "Block"
msgstr "Blocco"
-msgid "Material"
-msgstr "Materiale"
-
-msgid "stone"
-msgstr "pietra"
-
msgid "Bollard"
msgstr "Colonnina"
@@ -18942,9 +19174,6 @@ msgstr "a scomparsa"
msgid "removable"
msgstr "rimovibile"
-msgid "plastic"
-msgstr "plastica"
-
msgid "Cycle Barrier"
msgstr "Barriera per biciclette"
@@ -19723,6 +19952,12 @@ msgstr "Miscela 1/25 (mofa/moped)"
msgid "1/50 mix (mofa/moped)"
msgstr "Miscela 1/50 (mofa/moped)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr "Fuel cards:"
@@ -20433,9 +20668,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Numero di schermi"
-msgid "Minimum age"
-msgstr "Età minima"
-
msgid "Zoo"
msgstr "Zoo"
@@ -22631,24 +22863,6 @@ msgctxt "power"
msgid "industrial"
msgstr "industriale"
-msgid "Power rating (kVA/MVA)"
-msgstr "Potenza (kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "Isolamento a gas"
@@ -22674,9 +22888,6 @@ msgctxt "power"
msgid "yes"
msgstr "si"
-msgid "Phases"
-msgstr "Fasi"
-
msgid "Power Switchgear"
msgstr "Quadro elettrico"
@@ -22697,6 +22908,25 @@ msgstr "Stallo elettrico"
msgid "Power Switch"
msgstr "Interruttore elettrico"
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr "Convertitore di potenza"
@@ -22798,9 +23028,6 @@ msgstr "tubolare"
msgid "solid"
msgstr "solido"
-msgid "steel"
-msgstr "acciaio"
-
msgctxt "color"
msgid "red/white"
msgstr "rosso/bianco"
@@ -22963,18 +23190,21 @@ msgstr "Pilone triplo"
msgid "Incomplete tower"
msgstr "Torre incompleta"
-msgid "Location transition"
-msgstr "Location transition"
-
msgid "Pole"
msgstr "Palo"
-msgid "Pole with Transformer"
-msgstr "Palo con trasformatore"
+msgid "Pole with Switch"
+msgstr ""
msgid "Pole Attributes:"
msgstr "Attributi del palo:"
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr "Palo con trasformatore"
+
msgid "Transformer Attributes:"
msgstr "Attributi del trasformatore:"
@@ -23087,6 +23317,52 @@ msgstr "Campo di battaglia"
msgid "Palaeontological Site"
msgstr "Sito paleontologico"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monumento"
@@ -23864,6 +24140,9 @@ msgstr "Insediamento rurale isolato"
msgid "Suburb"
msgstr "Quartiere"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "Zona"
@@ -24229,6 +24508,9 @@ msgstr "Coltivazioni in serra"
msgid "Plant Nursery"
msgstr "Vivaio"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr "Acquacoltura"
@@ -24839,11 +25121,21 @@ msgstr "Itinerari"
msgid "Bicycle Route"
msgstr "Percorso ciclabile"
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
-msgstr "nazionale"
+msgstr ""
+
+msgctxt "network"
+msgid "regional"
+msgstr ""
+msgctxt "network"
msgid "local"
-msgstr "locale"
+msgstr ""
msgid "Mountain Biking Route"
msgstr "Percorso per MTB"
@@ -25085,6 +25377,9 @@ msgstr "Tracce GPS OpenStreetMap"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr "Tracce GPS pubbliche caricate su OpenStreetMap."
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr "Trasporto pubblico locale (TPL)"
@@ -25097,8 +25392,8 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
-msgstr "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingue"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (sovrapposta)"
@@ -25174,6 +25469,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -25500,6 +25802,9 @@ msgstr "URBIS 2015 foto aeree"
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW(allonie) PICC immagini numeriche"
@@ -25515,6 +25820,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr "TEC linee di autobus"
@@ -25820,6 +26128,9 @@ msgstr "BDOrtho IGN"
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Catasto"
@@ -26744,6 +27055,9 @@ msgstr "Fiez Orthophoto 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr "Cantone della città di Basilea 2015"
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -26791,11 +27105,11 @@ msgstr "USGS Mappe topografiche"
msgid "USGS Large Scale Imagery"
msgstr "USGS Large Scale Imagery"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
+msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "TIGER Roads nuova o disallineata (2015)"
+msgid "TIGER Roads 2014"
+msgstr ""
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -26806,6 +27120,14 @@ msgstr ""
"Census. A livelli di zoom inferiori, modifiche a partire dal 2006 tranne "
"quelle già incorporate in OpenStreetMap"
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
@@ -26867,6 +27189,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -27838,6 +28163,14 @@ msgstr "{0} per una via. Si dovrebbe usare per un nodo."
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} su un percorso. Dovrebbe essere usato in una relazione"
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -27904,14 +28237,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -27964,11 +28289,11 @@ msgstr "valore vuoto in elenco separato da virgola ''{0}''"
msgid "numerical key"
msgstr "tasto numerico"
-msgid "layer tag with + sign"
-msgstr "etichetta di livello con simbolo +"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "il livello dovrebbe essere compreso tra -5 e 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr ""
@@ -29622,7 +29947,7 @@ msgid "Move to picture''s location with next/previous buttons"
msgstr ""
msgid "Preview images when hovering its icon"
-msgstr ""
+msgstr "Anteprima delle immagini quando il mouse passa sopra la loro icona"
msgid "Cut off sequences at download bounds"
msgstr ""
@@ -31064,6 +31389,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -33000,9 +33328,6 @@ msgstr "Elimina questo"
msgid "Delete this&older"
msgstr "Elimina questo e il più vecchio"
-msgid "km/h"
-msgstr "km/h"
-
msgid "Track name: "
msgstr "Nome del tracciato: "
@@ -34314,7 +34639,7 @@ msgid "Loading..."
msgstr "Caricamento in corso..."
msgid "PDF file preview"
-msgstr "Anteprima del file PDF"
+msgstr ""
msgid "Loaded"
msgstr "Caricato"
@@ -34555,6 +34880,9 @@ msgstr "numero positivo o vuoto"
msgid "Speed:"
msgstr "Velocità:"
+msgid "km/h"
+msgstr "km/h"
+
msgid "direction"
msgstr "direzione"
@@ -35834,6 +36162,12 @@ msgstr "Selezionare un solo oggetto"
msgid "Select a map object"
msgstr "Selezionare un oggetto mappa"
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/ja.po b/i18n/po/ja.po
index 7f342e9..ffd506a 100644
--- a/i18n/po/ja.po
+++ b/i18n/po/ja.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-09-12 04:45+0000\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-15 17:23+0000\n"
"Last-Translator: fujimoto <fujimoto at internet.ne.jp>\n"
"Language-Team: Japanese <tr at openstreetmap.jp>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:47+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"X-Poedit-Country: JAPAN\n"
"Language: ja\n"
"X-Poedit-Language: Japanese\n"
@@ -458,7 +458,7 @@ msgid "Download data"
msgstr "データのダウンロード"
msgid "Download map data from a server of your choice"
-msgstr ""
+msgstr "あなたが選択したサーバから地図データをダウンロード"
msgid ""
"<html>This action will require {0} individual<br>download requests. Do you "
@@ -2340,7 +2340,7 @@ msgid "MapCSS selector"
msgstr "MapCSS セレクタ"
msgid "Selection settings"
-msgstr ""
+msgstr "選択設定"
msgid "Additional settings"
msgstr "その他の設定"
@@ -2930,24 +2930,6 @@ msgstr "誤った緯度の値 ''{0}''"
msgid "Illegal longitude value ''{0}''"
msgstr "誤った経度の値 ''{0}''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "キャッシュディレクトリ{0}の作成に失敗しました"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>存在しないキャッシュディレクトリ: {0} の作成に失敗</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "一時ファイル {0} を削除できません"
@@ -3016,20 +2998,15 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "描画スタイル {0}:{1}"
-
msgid "Layer: {0}"
msgstr "レイヤー: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "描画スタイル {0}:{1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "設定を''{0}''に保存できませんでした"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr "IPv6 ネットワークを有効にし、 IPv4 よりも IPv6 を優先してみます（最初のスタートアップ時のみ）。"
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr "設定 {0} はもう使われていないので、除かれました。"
@@ -3543,6 +3520,24 @@ msgstr "テキスト"
msgid "areatext"
msgstr "エリアテキスト"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr "<html>存在しないユーザーデータディレクトリ {0} の作成に失敗しました。</html>"
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "キャッシュディレクトリ{0}の作成に失敗しました"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>存在しないキャッシュディレクトリ: {0} の作成に失敗</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "''{0}'' 要素が必要ですが、 ''{1}'' が現れました"
@@ -3739,7 +3734,7 @@ msgid "Custom Projection"
msgstr "独自の投影法"
msgid "Error: {0}"
-msgstr ""
+msgstr "エラー： {0}"
msgid "JOSM projection command line interface"
msgstr ""
@@ -3751,7 +3746,7 @@ msgid "Converts coordinates from one coordinate reference system to another."
msgstr ""
msgid "Options"
-msgstr ""
+msgstr "オプション"
msgid "Show this help"
msgstr "このヘルプの表示"
@@ -3766,7 +3761,7 @@ msgid "Switch order of output coordinates (east/north, lon/lat)"
msgstr ""
msgid "<crs>"
-msgstr ""
+msgstr "<crs>"
msgid ""
"The format for input and output coordinate reference system is similar to "
@@ -4212,6 +4207,9 @@ msgstr "outerウェイにエリアスタイルがあります"
msgid "Multipolygon is not closed"
msgstr "マルチポリゴンが閉じられていません"
+msgid "Self-intersecting polygon ring"
+msgstr "自身で交差するポリゴンの輪"
+
msgid "Multipolygon rings share node(s)"
msgstr "マルチポリゴンの輪がノードを共有している"
@@ -4858,7 +4856,7 @@ msgstr "JOSMは間もなくこのバージョンでは動作しなくなりま
msgid ""
"You may face critical Java bugs; we highly recommend you to update to Java "
"{0}."
-msgstr ""
+msgstr "Java {0} に"
msgid "Would you like to update now ?"
msgstr "今すぐ更新しますか？"
@@ -4902,6 +4900,25 @@ msgstr "画像設定を読み込み中"
msgid "usage"
msgstr "使用法"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "オプション"
@@ -5031,6 +5048,11 @@ msgstr "デフォルト値を設定中"
msgid "Creating main GUI"
msgstr "メインGUIを作成中"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr "IPv6 ネットワークを有効にし、 IPv4 よりも IPv6 を優先してみます（最初のスタートアップ時のみ）。"
+
msgid "Updating plugins"
msgstr "プラグインを更新中"
@@ -5329,6 +5351,9 @@ msgstr "拡大"
msgid "Shrink"
msgstr "縮小"
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8102,6 +8127,9 @@ msgstr ""
"<html>レイヤー ''{0}'' "
"には既に次のオブジェクトの競合があります<br>''{1}''。<br>最初に競合を解決してからやり直してください。</html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr "選択中のリレーションメンバーのオブジェクトを選択"
@@ -10657,6 +10685,156 @@ msgstr "(URLは： "
msgid "Select the map painting styles"
msgstr "地図の描画スタイルを選択してください"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10674,6 +10852,11 @@ msgstr "''{0}''から地図描画スタイルの読み込みに失敗しまし
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "''{0}''から地図描画スタイルの解析に失敗しました。エラー: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "イメージ ''{0}'' が見つかりません"
@@ -14185,6 +14368,15 @@ msgstr "レイヤーをスキップして継続"
msgid "expected .jos file inside .joz archive"
msgstr ".jozアーカイブの中に.josファイルがありません"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "ダウンロードをスキップ"
@@ -15611,6 +15803,12 @@ msgstr "バイク"
msgid "Motorcar"
msgstr "自動車"
+msgid "Minimum age"
+msgstr "最低年齢制限"
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "参照記号"
@@ -16254,6 +16452,10 @@ msgid "platform"
msgstr "海上"
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr "小型"
@@ -16302,6 +16504,42 @@ msgstr "蒸気"
msgid "vacuum"
msgstr "真空"
+msgid "Material"
+msgstr "素材"
+
+msgid "plastic"
+msgstr "プラスチック"
+
+msgid "steel"
+msgstr "鉄"
+
+msgid "stone"
+msgstr "石"
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr "変換能力(kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700kVA"
+
+msgid "12500 kVA"
+msgstr "12500kVA"
+
+msgid "15 MVA"
+msgstr "15MVA"
+
+msgid "50 MVA"
+msgstr "50MVA"
+
+msgid "100 MVA"
+msgstr "100MVA"
+
+msgid "Phases"
+msgstr "相数"
+
msgid "Max. weight (tonnes)"
msgstr "最大重量(t)"
@@ -17228,12 +17466,6 @@ msgstr "柵"
msgid "Block"
msgstr "ブロック"
-msgid "Material"
-msgstr "素材"
-
-msgid "stone"
-msgstr "石"
-
msgid "Bollard"
msgstr "車止め杭"
@@ -17246,9 +17478,6 @@ msgstr "ライジングボラード"
msgid "removable"
msgstr "取り外し可"
-msgid "plastic"
-msgstr "プラスチック"
-
msgid "Cycle Barrier"
msgstr "自転車止め"
@@ -18022,6 +18251,12 @@ msgstr "25:1混合油(モペッド等)"
msgid "1/50 mix (mofa/moped)"
msgstr "50:1混合油(モペッド等)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr "給油カード:"
@@ -18731,9 +18966,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "スクリーン数"
-msgid "Minimum age"
-msgstr "最低年齢制限"
-
msgid "Zoo"
msgstr "動物園"
@@ -20929,24 +21161,6 @@ msgctxt "power"
msgid "industrial"
msgstr "工場内"
-msgid "Power rating (kVA/MVA)"
-msgstr "変換能力(kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700kVA"
-
-msgid "12500 kVA"
-msgstr "12500kVA"
-
-msgid "15 MVA"
-msgstr "15MVA"
-
-msgid "50 MVA"
-msgstr "50MVA"
-
-msgid "100 MVA"
-msgstr "100MVA"
-
msgid "Gas insulated"
msgstr "ガス絶縁"
@@ -20972,9 +21186,6 @@ msgctxt "power"
msgid "yes"
msgstr "変圧・変換器"
-msgid "Phases"
-msgstr "相数"
-
msgid "Power Switchgear"
msgstr "スイッチギア"
@@ -20992,6 +21203,25 @@ msgstr "構内回線"
msgid "Power Switch"
msgstr "開閉器"
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr "整流器"
@@ -21093,9 +21323,6 @@ msgstr "筒状"
msgid "solid"
msgstr "電柱"
-msgid "steel"
-msgstr "鉄"
-
msgctxt "color"
msgid "red/white"
msgstr "赤/白"
@@ -21258,18 +21485,21 @@ msgstr "3連形"
msgid "Incomplete tower"
msgstr "未使用あり"
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr "電柱"
-msgid "Pole with Transformer"
-msgstr "変電器つきの電柱"
+msgid "Pole with Switch"
+msgstr ""
msgid "Pole Attributes:"
msgstr "電柱の属性:"
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr "変電器つきの電柱"
+
msgid "Transformer Attributes:"
msgstr "変電器の属性:"
@@ -21382,6 +21612,52 @@ msgstr "古戦場"
msgid "Palaeontological Site"
msgstr "化石サイト"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "記念堂"
@@ -22159,6 +22435,9 @@ msgstr "一軒家"
msgid "Suburb"
msgstr "大字・地区"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "小字"
@@ -22508,6 +22787,9 @@ msgstr "温室領域"
msgid "Plant Nursery"
msgstr "苗床"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -23113,9 +23395,19 @@ msgstr "ルート"
msgid "Bicycle Route"
msgstr "自転車ルート"
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23359,6 +23651,9 @@ msgstr "OpenStreetMap GPS トレース"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr "Public Transport (ÖPNV)"
@@ -23371,7 +23666,7 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23448,6 +23743,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23774,6 +24076,9 @@ msgstr "URBIS 2015 aerial imagery"
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW(allonie) PICC numerical imagery"
@@ -23789,6 +24094,9 @@ msgstr "SPW(allonie) 2012-2013 aerial imagery"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 aerial imagery"
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -24093,6 +24401,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Cadastre"
@@ -25018,6 +25329,9 @@ msgstr "Fiez Orthophoto 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -25065,11 +25379,11 @@ msgstr "USGS Topographic Maps"
msgid "USGS Large Scale Imagery"
msgstr "USGS Large Scale Imagery"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
+msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
+msgstr ""
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -25077,6 +25391,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
@@ -25138,6 +25460,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -26079,6 +26404,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr "{0}はウェイ上にあります。リレーションの中で使用してください"
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -26145,14 +26478,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -26203,11 +26528,11 @@ msgstr ""
msgid "numerical key"
msgstr "テンキー"
-msgid "layer tag with + sign"
-msgstr "layerタグに+記号がある"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "layerは-5～5の範囲でなければならない"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr ""
@@ -29106,6 +29431,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30961,9 +31289,6 @@ msgstr "これを削除"
msgid "Delete this&older"
msgstr "これより古いものを削除"
-msgid "km/h"
-msgstr "km/h"
-
msgid "Track name: "
msgstr "トラック名: "
@@ -32414,6 +32739,9 @@ msgstr ""
msgid "Speed:"
msgstr "速度:"
+msgid "km/h"
+msgstr "km/h"
+
msgid "direction"
msgstr "方向"
@@ -33657,6 +33985,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/ka.po b/i18n/po/ka.po
index 19565c5..80eae8c 100644
--- a/i18n/po/ka.po
+++ b/i18n/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2011-12-16 00:14+0000\n"
"Last-Translator: datogogishvili <Unknown>\n"
"Language-Team: Georgian <ka at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:41+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:43+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: ka\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2916,24 +2916,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3000,18 +2982,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3525,6 +3502,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4193,6 +4188,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4880,6 +4878,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5007,6 +5024,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr "ინტერფეისის შექმნა"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5304,6 +5326,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8045,6 +8070,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10533,6 +10561,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10551,6 +10729,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13970,6 +14153,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15344,6 +15536,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15987,6 +16185,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16035,6 +16237,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16961,12 +17199,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16979,9 +17211,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17753,6 +17982,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18462,9 +18697,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20660,24 +20892,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20703,9 +20917,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20723,6 +20934,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20824,9 +21054,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20989,18 +21216,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21113,6 +21343,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21890,6 +22166,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22238,6 +22517,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22843,9 +23125,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23089,6 +23381,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23101,7 +23396,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23178,6 +23473,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23504,6 +23806,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23519,6 +23824,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23823,6 +24131,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24746,6 +25057,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24793,10 +25107,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24805,6 +25119,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24866,6 +25188,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25805,6 +26130,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25871,14 +26204,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25929,10 +26254,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28692,6 +29017,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30494,9 +30822,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31930,6 +32255,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33165,6 +33493,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/km.po b/i18n/po/km.po
index c15c99f..3690c8c 100644
--- a/i18n/po/km.po
+++ b/i18n/po/km.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2015-01-27 10:25+0000\n"
"Last-Translator: Sophea Sok <sksophea at gmail.com>\n"
"Language-Team: Khmer <km at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:47+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3076,24 +3076,6 @@ msgstr "តម្លៃរយៈទទឹងមិនត្រឹមត
msgid "Illegal longitude value ''{0}''"
msgstr "តម្លៃរយៈបណ្ដោយមិនត្រឹមត្រូវ ''{0}''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "បានបរាជ័យក្នុងការបង្កើតថតឃ្លាំងសម្ងាត់ដែលបាត់៖ {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>បានបរាជ័យក្នុងការបង្កើតថតឃ្លាំងសម្ងាត់៖ {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3176,20 +3158,15 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "រចនាប័ទ្មលាបពណ៌ {0}: {1}"
-
msgid "Layer: {0}"
msgstr "ស្រទាប់៖ {0}"
+msgid "Paint style {0}: {1}"
+msgstr "រចនាប័ទ្មលាបពណ៌ {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "បានបរាជ័យក្នុងការបន្តចំណូលចិត្ត ''{0}''"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr "ការកំណត់ចំណូលចិត្ត {0} ត្រូវបានលុបចេញដោយសារវាលែងប្រើ។"
@@ -3743,6 +3720,24 @@ msgstr "អត្ថបទ"
msgid "areatext"
msgstr "ផ្ទៃអត្ថបទ"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "បានបរាជ័យក្នុងការបង្កើតថតឃ្លាំងសម្ងាត់ដែលបាត់៖ {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>បានបរាជ័យក្នុងការបង្កើតថតឃ្លាំងសម្ងាត់៖ {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4430,6 +4425,9 @@ msgstr "រចនាប័ទ្មផ្ទៃនៅលើផ្ល
msgid "Multipolygon is not closed"
msgstr "ពហុកោណចម្រុះគឺមិនបានបិទ"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -5145,6 +5143,25 @@ msgstr "កំពុងផ្ទុករូបភាពចំណូល
msgid "usage"
msgstr "ប្រើប្រាស់"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "ជម្រើស"
@@ -5281,6 +5298,11 @@ msgstr "ការកំណត់លំនាំដើម"
msgid "Creating main GUI"
msgstr "បង្កើត GUI ដើម"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr "ការធ្វើបច្ចុប្បន្នភាពកម្មវិធីជំនួយ"
@@ -5589,6 +5611,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8545,6 +8570,9 @@ msgstr ""
"<html>ស្រទាប់ ''{0}'' មានការប៉ះទង្គិចសម្រាប់វត្ថុរួចហើយ<br>''{1}'' "
"។<br>សូមដោះស្រាយការប៉ះទង្គិចជាមុន រួចព្យាយាមម្ដងទៀត។</html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr "ជ្រើសវត្ថុសម្រាប់សមាជិកទំនាក់ទំនងដែលបានជ្រើស"
@@ -11259,6 +11287,156 @@ msgstr "(URL គឺ៖ "
msgid "Select the map painting styles"
msgstr "ជ្រើសរចនាប័ទ្មគំនូរផែនទី"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11281,6 +11459,11 @@ msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
"បានបរាជ័យក្នុងការញែករចនាប័ទ្មគំនូរផែនទីពី ''{0}'' ។ កំហុសគឺ៖ {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "បានបរាជ័យកំណត់ទីតាំងរូបភាព ''{0}''"
@@ -15120,6 +15303,15 @@ msgstr "រំលងស្រទាប់ រួចបន្ត"
msgid "expected .jos file inside .joz archive"
msgstr "ឯកសារ .jos ដែលបានរំពឹងទុកខាងក្នុងប័ណ្ណសារ .joz"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "រំលងការទាញយក"
@@ -16665,6 +16857,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -17308,6 +17506,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -17356,6 +17558,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -18282,12 +18520,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -18300,9 +18532,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -19074,6 +19303,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -19783,9 +20018,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -21981,24 +22213,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -22024,9 +22238,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -22044,6 +22255,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -22145,9 +22375,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -22310,18 +22537,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -22434,6 +22664,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -23211,6 +23487,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -23559,6 +23838,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -24164,9 +24446,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -24410,6 +24702,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -24422,7 +24717,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -24499,6 +24794,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -24825,6 +25127,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -24840,6 +25145,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -25144,6 +25452,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -26067,6 +26378,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -26114,10 +26428,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -26126,6 +26440,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -26187,6 +26509,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -27126,6 +27451,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -27192,14 +27525,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -27250,10 +27575,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -30099,6 +30424,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -31901,9 +32229,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -33337,6 +33662,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -34572,6 +34900,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/ko.po b/i18n/po/ko.po
index 5388244..7b1ea8d 100644
--- a/i18n/po/ko.po
+++ b/i18n/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2017-05-17 08:29+0000\n"
"Last-Translator: Glados <Unknown>\n"
"Language-Team: Korean <ko at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:48+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: ko\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2897,24 +2897,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2981,18 +2963,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3503,6 +3480,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4171,6 +4166,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4857,6 +4855,25 @@ msgstr "사진 환경 설정을 불러오는 중"
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -4986,6 +5003,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5283,6 +5305,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8034,6 +8059,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10530,6 +10558,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10548,6 +10726,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13987,6 +14170,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15363,6 +15555,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "참조"
@@ -16006,6 +16204,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16054,6 +16256,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16980,12 +17218,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16998,9 +17230,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17772,6 +18001,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18481,9 +18716,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20679,24 +20911,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20722,9 +20936,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20742,6 +20953,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20843,9 +21073,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21008,18 +21235,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21132,6 +21362,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21909,6 +22185,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22257,6 +22536,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22862,9 +23144,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23108,6 +23400,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23120,7 +23415,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23197,6 +23492,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23523,6 +23825,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23538,6 +23843,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23842,6 +24150,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24765,6 +25076,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24812,10 +25126,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24824,6 +25138,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24885,6 +25207,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25824,6 +26149,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25890,14 +26223,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25948,10 +26273,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28715,6 +29040,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30517,9 +30845,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31953,6 +32278,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33188,6 +33516,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/ku.po b/i18n/po/ku.po
index 6ec72e0..3feca43 100644
--- a/i18n/po/ku.po
+++ b/i18n/po/ku.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2017-01-31 19:32+0000\n"
"Last-Translator: Rokar ✌ <Unknown>\n"
"Language-Team: Kurdish <ku at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:48+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -2910,24 +2910,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2994,18 +2976,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3519,6 +3496,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4187,6 +4182,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4874,6 +4872,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5001,6 +5018,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5298,6 +5320,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8039,6 +8064,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10527,6 +10555,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10545,6 +10723,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13964,6 +14147,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15338,6 +15530,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15981,6 +16179,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16029,6 +16231,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16955,12 +17193,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16973,9 +17205,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17747,6 +17976,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18456,9 +18691,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20654,24 +20886,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20697,9 +20911,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20717,6 +20928,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20818,9 +21048,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20983,18 +21210,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21107,6 +21337,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21884,6 +22160,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22232,6 +22511,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22837,9 +23119,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23083,6 +23375,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23095,7 +23390,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23172,6 +23467,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23498,6 +23800,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23513,6 +23818,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23817,6 +24125,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24740,6 +25051,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24787,10 +25101,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24799,6 +25113,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24860,6 +25182,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25799,6 +26124,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25865,14 +26198,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25923,10 +26248,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28686,6 +29011,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30488,9 +30816,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31924,6 +32249,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33159,6 +33487,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/ky.po b/i18n/po/ky.po
index 2c4a7de..bc86ecd 100644
--- a/i18n/po/ky.po
+++ b/i18n/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2012-12-18 02:36+0000\n"
"Last-Translator: SimpleLeon <Unknown>\n"
"Language-Team: Kirghiz <ky at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:48+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -2910,24 +2910,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2994,18 +2976,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3519,6 +3496,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4187,6 +4182,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4874,6 +4872,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5001,6 +5018,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5298,6 +5320,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8039,6 +8064,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10527,6 +10555,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10545,6 +10723,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13964,6 +14147,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15338,6 +15530,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15981,6 +16179,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16029,6 +16231,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16955,12 +17193,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16973,9 +17205,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17747,6 +17976,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18456,9 +18691,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20654,24 +20886,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20697,9 +20911,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20717,6 +20928,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20818,9 +21048,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20983,18 +21210,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21107,6 +21337,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21884,6 +22160,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22232,6 +22511,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22837,9 +23119,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23083,6 +23375,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23095,7 +23390,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23172,6 +23467,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23498,6 +23800,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23513,6 +23818,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23817,6 +24125,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24740,6 +25051,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24787,10 +25101,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24799,6 +25113,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24860,6 +25182,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25799,6 +26124,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25865,14 +26198,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25923,10 +26248,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28686,6 +29011,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30488,9 +30816,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31924,6 +32249,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33159,6 +33487,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/lb.po b/i18n/po/lb.po
index 1b3a5a6..7c21bb0 100644
--- a/i18n/po/lb.po
+++ b/i18n/po/lb.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2016-04-28 18:56+0000\n"
"Last-Translator: Charel <ceilenbecker at gmail.com>\n"
"Language-Team: Luxembourgish <lb at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:50+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}:D''Optioun \"{1}\" ass net eendeiteg"
@@ -2910,24 +2910,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2994,18 +2976,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3519,6 +3496,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4187,6 +4182,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4874,6 +4872,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5001,6 +5018,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5298,6 +5320,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8039,6 +8064,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10527,6 +10555,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10545,6 +10723,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13964,6 +14147,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15338,6 +15530,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15981,6 +16179,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16029,6 +16231,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16955,12 +17193,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16973,9 +17205,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17747,6 +17976,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18456,9 +18691,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20654,24 +20886,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20697,9 +20911,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20717,6 +20928,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20818,9 +21048,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20983,18 +21210,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21107,6 +21337,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21884,6 +22160,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22232,6 +22511,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22837,9 +23119,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23083,6 +23375,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23095,7 +23390,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23172,6 +23467,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23498,6 +23800,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23513,6 +23818,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23817,6 +24125,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24740,6 +25051,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24787,10 +25101,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24799,6 +25113,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24860,6 +25182,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25799,6 +26124,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25865,14 +26198,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25923,10 +26248,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28686,6 +29011,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30488,9 +30816,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31924,6 +32249,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33159,6 +33487,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/lo.po b/i18n/po/lo.po
index d4da53a..9361dd8 100644
--- a/i18n/po/lo.po
+++ b/i18n/po/lo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2009-09-15 10:06+0000\n"
"Last-Translator: Anousone <Unknown>\n"
"Language-Team: Lao <lo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:49+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr "ສ້າງໜ້າຕາຫຼັກ"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/lt.po b/i18n/po/lt.po
index 83ad004..c58895e 100644
--- a/i18n/po/lt.po
+++ b/i18n/po/lt.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-10-02 19:29+0000\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-28 18:34+0000\n"
"Last-Translator: Aurimas Fišeras <Unknown>\n"
"Language-Team: Lithuanian <lt at li.org>\n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-10-03 04:33+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: lt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -248,7 +248,7 @@ msgid "Please select at least three nodes."
msgstr "Parinkite bent tris taškus"
msgid "Can not align a polygon. Abort."
-msgstr "Nepavyksta lygiuoti poligoną. Nutraukti."
+msgstr "Nepavyksta lygiuoti daugiakampio. Nutraukti."
msgid "Intersection of three or more ways can not be solved. Abort."
msgstr "Trijų ar daugiau kelių susikirtimo išspręsti negalima. Nutraukti."
@@ -3191,25 +3191,6 @@ msgstr "Netinkama platumos reikšmė „{0}“"
msgid "Illegal longitude value ''{0}''"
msgstr "Netinkama ilgumos reikšmė „{0}“"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr "Nepavyko sukurti trūkstamo nustatymų aplanko: {0}"
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr "<html>Nepavyko sukurti trūkstamo nustatymų aplanko: {0}</html>"
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr "Nepavyko sukurti trūkstamo naudotojo duomenų aplanko: {0}"
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-"<html>Nepavyko sukurti trūkstamo naudotojo duomenų aplanko: {0}</html>"
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Nepavyko sukurti trūkstamą podėlio aplanką: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Nepavyko sukurti trūkstamo podėlio aplanko: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Nepavyko pašalinti laikino failo {0}"
@@ -3291,22 +3272,15 @@ msgstr "Nepavyko įkelti numatyto podėlio failo: {0}"
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr "Nepavyko pašalinti klaidingo numatytųjų reikšmių podėlio failo: {0}"
-msgid "Paint style {0}: {1}"
-msgstr "Paišymo stilius {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Sluoksnis: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Paišymo stilius {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Nepavyko išlaikyti nustatymo „{0}“"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Pabandykite įjungti IPv6 tinklą, teikdami pirmenybę IPv6 prieš IPv4 (veikia "
-"tik pradiniame etape)"
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr "Nustatymas {0} buvo pašalintas, nes jis daugiau nenaudojamas."
@@ -3868,6 +3842,25 @@ msgstr "tekstas"
msgid "areatext"
msgstr "ploto tekstas"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr "Nepavyko sukurti trūkstamo nustatymų aplanko: {0}"
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr "<html>Nepavyko sukurti trūkstamo nustatymų aplanko: {0}</html>"
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr "Nepavyko sukurti trūkstamo naudotojo duomenų aplanko: {0}"
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+"<html>Nepavyko sukurti trūkstamo naudotojo duomenų aplanko: {0}</html>"
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Nepavyko sukurti trūkstamą podėlio aplanką: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Nepavyko sukurti trūkstamo podėlio aplanko: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Tikėtąsi elemento ''{0}'', bet gauta ''{1}''"
@@ -4268,7 +4261,7 @@ msgstr "Ieško klaidų pagal API galimybes"
msgid ""
"Way contains more than {0} nodes. It should be replaced by a multipolygon"
-msgstr "Kelyje yra daugiau nei {0} taškų. Jį reikia pakeisti multipoligonu"
+msgstr "Kelyje yra daugiau nei {0} taškų. Jį reikėtų pakeisti multipoligonu"
msgid "Way contains more than {0} nodes. It should be split or simplified"
msgstr ""
@@ -4563,6 +4556,9 @@ msgstr "Ploto stilius išoriniame kelyje"
msgid "Multipolygon is not closed"
msgstr "Neuždaras multipoligonas"
+msgid "Self-intersecting polygon ring"
+msgstr "Save kertantis daugiakampis žiedas"
+
msgid "Multipolygon rings share node(s)"
msgstr "Multipoligono žiedai dalinasi taškais"
@@ -5272,6 +5268,27 @@ msgstr "Įkeliamos vaizdų nuostatos"
msgid "usage"
msgstr "naudojimas"
+msgid "commands"
+msgstr "komandos"
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr "paleisti JOSM (numatytoji, vykdoma nenurodžius komandos)"
+
+msgid "render data and save the result to an image file"
+msgstr "atvaizduoti duomenis ir išsaugoti rezultatą paveiksle"
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr "konvertuoti koordinates iš vienos koordinačių sistemos į kitą"
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+"Jei reikia daugiau informacijos apie komandas {0} ir {1}, vykdykite jas su "
+"parametru {2}."
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr "Likusi šio žinyno puslapio dalis dokumentuoja komandą {0}."
+
msgid "options"
msgstr "parinktys"
@@ -5410,6 +5427,13 @@ msgstr "Nustatomos numatytosios reikšmės"
msgid "Creating main GUI"
msgstr "Kuriama pagrindinė grafinė sąsaja"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Pabandykite įjungti IPv6 tinklą, teikdami pirmenybę IPv6 prieš IPv4 (veikia "
+"tik pradiniame etape)"
+
msgid "Updating plugins"
msgstr "Atnaujinami papildiniai"
@@ -5732,6 +5756,9 @@ msgstr "Išplėsti"
msgid "Shrink"
msgstr "Sutraukti"
+msgid "Show downloaded area"
+msgstr "Rodyti atsiųstą plotą"
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8721,6 +8748,9 @@ msgstr ""
"<html>Sluoksnyje „{0}“ jau yra objekto „{1}“ konfliktas.<br>Prašome iš "
"pradžių išspręsti šį konfliktą<br>ir tada bandyti dar kartą.</html>"
+msgid "Select the currently edited relation"
+msgstr "Pažymėti dabar redaguojamą ryšį"
+
msgid "Select objects for selected relation members"
msgstr "Pažymėti objektus pažymėtiems ryšio nariams"
@@ -11511,6 +11541,184 @@ msgstr "(URL buvo: "
msgid "Select the map painting styles"
msgstr "Parinkite žemėlapio paišymo stilius"
+msgid "Error - file not found: ''{0}''"
+msgstr "Klaida - failas nerastas: „{0}“"
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr "Tikėtasi sveikojo skaičiaus parametrui {0}, bet gauta „{1}“"
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr "Tikėtasi teigiamo sveikojo skaičiaus parametrui {0}, bet gauta „{1}“"
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr "Nepavyko išnagrinėti parametro {0}: {1}"
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+"Tikėtasi rakto ir reikšmės atskirtų simboliu „:“ parametrui {0}, bet gauta "
+"„{1}“"
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+"Tikėtasi slankiojo kablelio skaičiaus parametrui {0}, bet gauta „{1}“"
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+"Tikėtasi dviejų koordinačių atskirtų kableliu parametrui {0}, bet gauta „{1}“"
+
+msgid "In option {0}: {1}"
+msgstr "Parametre {0}: {1}"
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+"Tikėtasi teigiamo slankiojo kablelio skaičiaus parametrui {0}, bet gauta "
+"„{1}“"
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr "Tikėtasi teigiamo sveikojo skaičiaus parametrui {0}, bet gauta „{1}“"
+
+msgid "JOSM rendering command line interface"
+msgstr "JOSM atvaizdavimo tekstinė sąsaja"
+
+msgid "Renders data and saves the result to an image file."
+msgstr "Atvaizduoja duomenis ir išsaugo rezultatą paveikslo faile."
+
+msgid "Input data file name (.osm)"
+msgstr "Įvesties duomenų failo vardas (.osm)"
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr "Išvesties paveikslo failo vardas (.png); numatytasis „{0}“"
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr "Stiliaus failas naudojamas atvaizdavimui (.mapcss arba .zip)"
+
+msgid "This option can be repeated to load multiple styles."
+msgstr "Šis parametras gali būti kartojamas keletui stilių įkelti."
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+"Stiliaus nustatymas (JOSM prieinama stilių sąrašo dialogo lango "
+"kontekstiniame meniu)"
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr "Taikoma paskutiniam stiliui įkeltam su {0} parinktimi."
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+"Parenka pritraukimą atvaizdavimui. (sveikasis skaičius, 0=visa žemė, "
+"18=gatvių lygis)"
+
+msgid "Select the map scale"
+msgstr "Parenka žemėlapio mastelį"
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+"Reikšmė 10000 reiškia mastelį 1:10000 (1 cm žemėlapyje lygus 100 m ant "
+"žemės; skiriamoji geba: 96 taškai colyje)"
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr "Parinktys {0} ir {1} yra tarpusavyje nesuderinamos."
+
+msgid "Area to render, default value is ''{0}''"
+msgstr "Plotas atvaizdavimui, numatytoji reikšmė „{0}“"
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+"Su raktažodžiu „{0}“ bus naudojamas atsiųstas plotas .osm įvesties faile "
+"(jei įrašytas)."
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr "Nurodo atvaizdavimo ploto apatinį kairįjį kampą"
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+"Naudojama kartu su ploto ir aukščio parinktimis atvaizduojamo ploto "
+"nustatymui,"
+
+msgid "Width of the rendered area, in meter"
+msgstr "Atvaizduojamo ploto plotis metrais"
+
+msgid "Height of the rendered area, in meter"
+msgstr "Atvaizduojamo ploto aukštis metrais"
+
+msgid "Width of the target image, in pixel"
+msgstr "Atvaizduojamo ploto plotis pikseliais"
+
+msgid "Height of the target image, in pixel"
+msgstr "Atvaizduojamo ploto aukštis pikseliais"
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr "Naudotina projekcija, numatytoji reikšmė „{0}“ (web-Mercator)"
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+"Didžiausias paveikslėlio plotis/aukštis pikseliais („{0}“ – be limito), "
+"numatytoji reikšmė: {1}"
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+"Atvaizduojamam plotui ir masteliui nurodyti parinktys gali būti "
+"kombinuojamos įvairiais būdais"
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+"Jei nenurodyta nei „{0}“, nei „{1}“, taikoma numatytoji reikšmė {2} ir "
+"naudojamos atsiųsto ploto ribos .osm įvesties faile."
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+"Duotas argumentas {0}, bet mastelis negali būti nustatytas iš likusių "
+"argumentų"
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr "Duotas argumentas {0}, tikėtasi {1} arba {2}"
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr "{0} veiksena, bet osm duomenų įvesties faile nerastos ribos"
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+"Nepavyko nustatyti mastelio, tikėtasi vienos iš parinkčių {0}, {1}, {2} arba "
+"{3}"
+
+msgid "Missing argument - input data file ({0})"
+msgstr "Trūksta argumento – įvesties duomenų failo ({0})"
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ".osm duomenų faile „{0}“ – "
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr "Trūksta argumento – tikėtasi bent vieno stiliaus ({0})"
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+"Paveikslėlio matmenys ({0}x{1}) viršija didžiausią paveikslėlio dydį {2} "
+"(naudokite parinktį {3} limitui pakeisti)"
+
+msgid "Style setting not found: ''{0}''"
+msgstr "Stiliaus nustatymas nerastas: „{0}“"
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11536,6 +11744,11 @@ msgstr "Nepavyko įkelti žemėlapio paišymo stilių iš „{0}“. Klaida buvo
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Nepavyko išnagrinėti žemėlapio paišymo stilių iš „{0}“. Klaida: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Nepavyko lokalizuoti piešinio ''{0}''"
@@ -15314,6 +15527,15 @@ msgstr "Praleisti sluoksnį ir tęsti"
msgid "expected .jos file inside .joz archive"
msgstr "tikėtasi .jos failo, .joz archyvo viduje"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr "Nepavyko sukurti trūkstamo papildinių nustatymų aplanko: {0}"
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr "Nepavyko sukurti trūkstamo papildinių naudotojo duomenų aplanko: {0}"
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr "Nepavyko sukurti trūkstamo papildinių podėlio aplanko: {0}"
+
msgid "Skip download"
msgstr "Praleisti atsisiuntimą"
@@ -16931,6 +17153,12 @@ msgstr "Motociklai"
msgid "Motorcar"
msgstr "Automobiliai"
+msgid "Minimum age"
+msgstr "Mažiausias amžius"
+
+msgid "Maximum age"
+msgstr "Didžiausias amžius"
+
msgid "Reference"
msgstr "Nuoroda"
@@ -16938,7 +17166,7 @@ msgid "Operator"
msgstr "Operatorius"
msgid "Service Times"
-msgstr ""
+msgstr "Paslaugų teikimo laikas"
msgid "Opening Hours"
msgstr "Darbo valandos"
@@ -16950,7 +17178,7 @@ msgid "yes"
msgstr "taip"
msgid "limited"
-msgstr ""
+msgstr "ribotas"
msgid "no"
msgstr "ne"
@@ -17010,52 +17238,52 @@ msgid "sandwich"
msgstr "sumuštiniai"
msgid "coffee_shop"
-msgstr ""
+msgstr "kava"
msgid "sushi"
msgstr "suši"
msgid "steak_house"
-msgstr ""
+msgstr "kepsniai"
msgid "fish_and_chips"
msgstr ""
msgid "chicken"
-msgstr ""
+msgstr "vištiena"
msgid "american"
-msgstr ""
+msgstr "amerikietiška"
msgid "ice_cream"
msgstr "ledai"
msgid "international"
-msgstr ""
+msgstr "tarptautinė"
msgid "seafood"
msgstr "jūros_produktai"
msgid "spanish"
-msgstr ""
+msgstr "ispaniška"
msgid "vietnamese"
-msgstr ""
+msgstr "vietnamietiška"
msgid "fish"
-msgstr ""
+msgstr "žuvis"
msgid "noodle"
-msgstr ""
+msgstr "makaronai"
msgid "barbecue"
-msgstr ""
+msgstr "barbekiu"
msgid "vegetarian"
-msgstr ""
+msgstr "vegetariška"
msgid "korean"
-msgstr ""
+msgstr "korėjietiška"
msgid "Internet access"
msgstr "Interneto prieiga"
@@ -17076,16 +17304,16 @@ msgid "Smoking"
msgstr "Rūkantiems"
msgid "dedicated"
-msgstr ""
+msgstr "specialiai"
msgid "separated"
-msgstr ""
+msgstr "atskirai"
msgid "isolated"
msgstr "izoliuotas"
msgid "outside"
-msgstr ""
+msgstr "lauke"
msgid "Height (meters)"
msgstr "Aukštis (metrais)"
@@ -17110,15 +17338,15 @@ msgstr "Sportas"
msgctxt "sport"
msgid "multi"
-msgstr ""
+msgstr "daug"
msgctxt "sport"
msgid "archery"
-msgstr ""
+msgstr "šaudymas_iš_lanko"
msgctxt "sport"
msgid "athletics"
-msgstr ""
+msgstr "atletika"
msgctxt "sport"
msgid "american_football"
@@ -17142,15 +17370,15 @@ msgstr "paplūdimio tinklinis"
msgctxt "sport"
msgid "billiards"
-msgstr ""
+msgstr "biliardas"
msgctxt "sport"
msgid "boules"
-msgstr ""
+msgstr "bočė"
msgctxt "sport"
msgid "bowls"
-msgstr ""
+msgstr "žolės_kamuolys"
msgctxt "sport"
msgid "canadian_football"
@@ -17158,47 +17386,47 @@ msgstr "kanadietiškas_futbolas"
msgctxt "sport"
msgid "canoe"
-msgstr ""
+msgstr "kanojos"
msgctxt "sport"
msgid "climbing"
-msgstr ""
+msgstr "laipiojimas"
msgctxt "sport"
msgid "cricket"
-msgstr ""
+msgstr "kriketas"
msgctxt "sport"
msgid "croquet"
-msgstr ""
+msgstr "kroketas"
msgctxt "sport"
msgid "cycling"
-msgstr ""
+msgstr "dviračiai"
msgctxt "sport"
msgid "dog_racing"
-msgstr ""
+msgstr "šunų_lenktynės"
msgctxt "sport"
msgid "equestrian"
-msgstr ""
+msgstr "jojimas"
msgctxt "sport"
msgid "field_hockey"
-msgstr ""
+msgstr "žolės_riedulys"
msgctxt "sport"
msgid "gaelic_games"
-msgstr ""
+msgstr "gėlų_žaidimai"
msgctxt "sport"
msgid "golf"
-msgstr ""
+msgstr "golfas"
msgctxt "sport"
msgid "gymnastics"
-msgstr ""
+msgstr "gimnastika"
msgctxt "sport"
msgid "handball"
@@ -17206,39 +17434,39 @@ msgstr "rankinis"
msgctxt "sport"
msgid "horse_racing"
-msgstr ""
+msgstr "žirgų_lenktynės"
msgctxt "sport"
msgid "ice_hockey"
-msgstr ""
+msgstr "ledo_ritulys"
msgctxt "sport"
msgid "karting"
-msgstr ""
+msgstr "kartingas"
msgctxt "sport"
msgid "model_aerodrome"
-msgstr ""
+msgstr "modelių_aerodromas"
msgctxt "sport"
msgid "motocross"
-msgstr ""
+msgstr "motokrosas"
msgctxt "sport"
msgid "motor"
-msgstr ""
+msgstr "motorų"
msgctxt "sport"
msgid "pelota"
-msgstr ""
+msgstr "pelota"
msgctxt "sport"
msgid "racquet"
-msgstr ""
+msgstr "rakečių"
msgctxt "sport"
msgid "rc_car"
-msgstr ""
+msgstr "rc_modeliai"
msgctxt "sport"
msgid "rugby_league"
@@ -17250,7 +17478,7 @@ msgstr "regbio_sąjunga"
msgctxt "sport"
msgid "running"
-msgstr ""
+msgstr "bėgimas"
msgctxt "sport"
msgid "safety_training"
@@ -17262,19 +17490,19 @@ msgstr "šaudymas"
msgctxt "sport"
msgid "skateboard"
-msgstr ""
+msgstr "riedlentė"
msgctxt "sport"
msgid "ice_skating"
-msgstr ""
+msgstr "čiuožimas_ant_ledo"
msgctxt "sport"
msgid "roller_skating"
-msgstr ""
+msgstr "riedučiai"
msgctxt "sport"
msgid "soccer"
-msgstr ""
+msgstr "futbolas"
msgctxt "sport"
msgid "swimming"
@@ -17282,11 +17510,11 @@ msgstr "plaukimas"
msgctxt "sport"
msgid "table_tennis"
-msgstr ""
+msgstr "stalo_tenisas"
msgctxt "sport"
msgid "tennis"
-msgstr ""
+msgstr "tenisas"
msgctxt "sport"
msgid "volleyball"
@@ -17294,39 +17522,39 @@ msgstr "tinklinis"
msgctxt "sport"
msgid "9pin"
-msgstr ""
+msgstr "9_kėglių_boulingas"
msgctxt "sport"
msgid "10pin"
-msgstr ""
+msgstr "boulingas"
msgid "Fee"
msgstr "Mokestis"
msgid "06:00-20:00"
-msgstr ""
+msgstr "06:00-20:00"
msgid "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
-msgstr ""
+msgstr "Pr-Pn 09:00-18:00, Št 08:00-14:00"
msgid "May-Sep 09:30-12:30,14:15-19:30"
-msgstr ""
+msgstr "Geg-Rug 09:30-12:30, 14:15-19:30"
msgctxt "parking"
msgid "multi-storey"
-msgstr ""
+msgstr "daugiaaukštis"
msgctxt "parking"
msgid "surface"
-msgstr ""
+msgstr "paviršius"
msgctxt "parking"
msgid "underground"
-msgstr ""
+msgstr "požeminis"
msgctxt "parking"
msgid "rooftop"
-msgstr ""
+msgstr "ant_stogo"
msgid "Reference number"
msgstr "Nuorodos numeris"
@@ -17347,22 +17575,22 @@ msgid "Time Limit (minutes)"
msgstr "Laiko limitas (minutėmis)"
msgid "Supervised"
-msgstr ""
+msgstr "Prižiūrimas"
msgid "General Access"
-msgstr ""
+msgstr "Bendra prieiga"
msgid "destination"
-msgstr ""
+msgstr "paskirtis"
msgid "delivery"
msgstr "pristatymas"
msgid "agricultural"
-msgstr ""
+msgstr "agrikultūra"
msgid "forestry"
-msgstr ""
+msgstr "miškininkystė"
msgid "Population"
msgstr "Populiacija"
@@ -17398,187 +17626,193 @@ msgid "Taxon"
msgstr "Taksonas"
msgid "broadleaved"
-msgstr ""
+msgstr "plačialapiai"
msgid "needleleaved"
-msgstr ""
+msgstr "spygliuočiai"
msgid "mixed"
-msgstr ""
+msgstr "įvairūs"
msgid "leafless"
-msgstr ""
+msgstr "belapiai"
msgid "Cycle"
-msgstr ""
+msgstr "Ciklas"
msgid "deciduous"
-msgstr ""
+msgstr "nukrentantys"
msgid "Plants that are leafless for a certain period during the year."
-msgstr ""
+msgstr "Augalai, kurie yra belapiai tam tikrą periodą metuose."
msgid "evergreen"
-msgstr ""
+msgstr "visžaliai"
msgid "Plants that are never entirely without green foliage."
msgstr "Augalai, kurie niekada nebūna be žalios lapijos"
msgid "semi_deciduous"
-msgstr ""
+msgstr "pusiau_nukrentantys"
msgid ""
"Plants that lose their foliage for a very short period, when old leaves fall "
"off and new foliage growth is starting."
msgstr ""
+"Augalai, kurie yra belapiai labai trumpą laiką, kai seni lapai nukrenta, o "
+"nauja lapija pradeda augti."
msgid "semi_evergreen"
-msgstr ""
+msgstr "pusiau_visžaliai"
msgid ""
"Plants that lose most, but not all, of their foliage for a fraction of the "
"year."
-msgstr ""
+msgstr "Augalai, kurie praranda didžiąją dalį lapijos dalį laiko metuose."
msgid "Habitat with evergreen and deciduous vegetation."
-msgstr ""
+msgstr "Arealas su visžaliais ir periodiškai numetančiais lapus augalais."
msgid "bahai"
-msgstr ""
+msgstr "bahajų_tikėjimas"
msgid "buddhist"
-msgstr ""
+msgstr "budizmas"
msgid "christian"
-msgstr ""
+msgstr "krikščionybė"
msgid "hindu"
-msgstr ""
+msgstr "induizmas"
msgid "jain"
-msgstr ""
+msgstr "džainizmas"
msgid "jewish"
-msgstr ""
+msgstr "judaizmas"
msgid "muslim"
-msgstr ""
+msgstr "islamas"
msgid "shinto"
msgstr "sintoizmas"
msgid "sikh"
-msgstr ""
+msgstr "sikhizmas"
msgid "spiritualist"
-msgstr ""
+msgstr "spiritualizmas"
msgid "taoist"
-msgstr ""
+msgstr "daoizmas"
msgid "unitarian"
-msgstr ""
+msgstr "unitarizmas"
msgid "zoroastrian"
-msgstr ""
+msgstr "zoroastrizmas"
msgid "Denomination"
msgstr "Denominacija"
msgid "anglican"
-msgstr ""
+msgstr "anglikonų"
msgid "baptist"
-msgstr ""
+msgstr "baptistų"
msgid "catholic"
-msgstr ""
+msgstr "katalikų"
msgid "evangelical"
-msgstr ""
+msgstr "evangelikų"
msgid "greek_catholic"
-msgstr ""
+msgstr "graikų_katalikų"
msgid "jehovahs_witness"
-msgstr ""
+msgstr "jehovos_liuditojų"
msgid "lutheran"
-msgstr ""
+msgstr "liuteronų"
msgid "methodist"
-msgstr ""
+msgstr "metodistų"
msgid "mormon"
-msgstr ""
+msgstr "mormonų"
msgid "old_catholic"
-msgstr ""
+msgstr "senosios_katalikų"
msgid "orthodox"
-msgstr ""
+msgstr "stačiatikių"
msgid "pentecostal"
-msgstr ""
+msgstr "penkiasdešimtininkų"
msgid "presbyterian"
-msgstr ""
+msgstr "presbiterionų"
msgid "protestant"
-msgstr ""
+msgstr "protestantų"
msgid "quaker"
-msgstr ""
+msgstr "kvakerių"
msgid "roman_catholic"
-msgstr ""
+msgstr "romos_katalikų"
msgid "shia"
-msgstr ""
+msgstr "šiitų"
msgid "sunni"
-msgstr ""
+msgstr "sunitų"
msgid "750000;200000"
-msgstr ""
+msgstr "750000;200000"
msgid "110000;20000"
-msgstr ""
+msgstr "110000;20000"
msgid "Branch operator"
msgstr ""
msgid "Amount of Cables"
-msgstr ""
+msgstr "Kabelių skaičius"
msgid "Amount of circuits"
-msgstr ""
+msgstr "Grandinių skaičius"
msgid "Location"
msgstr "Vieta"
msgctxt "power"
msgid "outdoor"
-msgstr ""
+msgstr "lauke"
msgctxt "power"
msgid "indoor"
-msgstr ""
+msgstr "viduje"
msgctxt "power"
msgid "underground"
-msgstr ""
+msgstr "po_žeme"
msgctxt "power"
msgid "platform"
-msgstr ""
+msgstr "platforma"
+
+msgctxt "power"
+msgid "rooftop"
+msgstr "ant_stogo"
msgctxt "power"
msgid "kiosk"
-msgstr ""
+msgstr "kioskas"
msgid "Start date"
-msgstr ""
+msgstr "Pradžios data"
msgid "Output forms of energy:"
msgstr ""
@@ -17622,6 +17856,42 @@ msgstr "garai"
msgid "vacuum"
msgstr "vakuumas"
+msgid "Material"
+msgstr "Medžiaga"
+
+msgid "plastic"
+msgstr "plastmasė"
+
+msgid "steel"
+msgstr "plienas"
+
+msgid "stone"
+msgstr "akmuo"
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Elektros galia (kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Fazės"
+
msgid "Max. weight (tonnes)"
msgstr "Ribota masė (tonos)"
@@ -17632,13 +17902,13 @@ msgid "Intermittent"
msgstr "Protarpinis"
msgid "Seasonal"
-msgstr ""
+msgstr "Sezoninis"
msgid "In the tidal range"
-msgstr ""
+msgstr "Potvynio ir atoslūgio zonoje"
msgid "culvert"
-msgstr ""
+msgstr "pralaida"
msgid "Water access rules:"
msgstr "Vandens prieigos taisyklės:"
@@ -17659,7 +17929,7 @@ msgid "Canoe"
msgstr ""
msgid "Substance"
-msgstr ""
+msgstr "Medžiaga"
msgid "water"
msgstr "vanduo"
@@ -17677,23 +17947,23 @@ msgid "sewage"
msgstr "nuotėkos"
msgid "Support"
-msgstr ""
+msgstr "Suportas"
msgctxt "mounting/support"
msgid "pole"
-msgstr ""
+msgstr "stulpas"
msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr ""
+msgstr "ant_sienos"
msgctxt "mounting/support"
msgid "billboard"
-msgstr ""
+msgstr "reklamos_stendas"
msgctxt "mounting/support"
msgid "ground"
-msgstr ""
+msgstr "žemė"
msgid "IATA"
msgstr "IATA"
@@ -17702,10 +17972,10 @@ msgid "ICAO"
msgstr "ICAO"
msgid "Car brand"
-msgstr ""
+msgstr "Automobilių markė"
msgid "Motorcycle brand"
-msgstr ""
+msgstr "Motociklų markė"
msgid "From (initial stop)"
msgstr "Iš (pradinė stotelė)"
@@ -17761,13 +18031,13 @@ msgid "Motorway"
msgstr "Automagistralė/Greitkelis"
msgid "Destination"
-msgstr ""
+msgstr "Tikslas"
msgid "Destination reference"
-msgstr ""
+msgstr "Tikslo nuoroda"
msgid "Placement"
-msgstr ""
+msgstr "Padėtis"
msgid "left_of:1"
msgstr ""
@@ -18548,12 +18818,6 @@ msgstr "Barjerai"
msgid "Block"
msgstr "Blokas"
-msgid "Material"
-msgstr "Medžiaga"
-
-msgid "stone"
-msgstr "akmuo"
-
msgid "Bollard"
msgstr "Stulpas"
@@ -18566,9 +18830,6 @@ msgstr "kylantis"
msgid "removable"
msgstr "pašalinamas"
-msgid "plastic"
-msgstr "plastmasė"
-
msgid "Cycle Barrier"
msgstr "Dviračių barjeras"
@@ -19340,6 +19601,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -20049,9 +20316,6 @@ msgstr ""
msgid "Number of screens"
msgstr "Ekranų skaičius"
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "Zoologijos sodas"
@@ -22247,24 +22511,6 @@ msgctxt "power"
msgid "industrial"
msgstr "industrinė"
-msgid "Power rating (kVA/MVA)"
-msgstr "Elektros galia (kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -22290,9 +22536,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -22310,6 +22553,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -22411,9 +22673,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -22576,18 +22835,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -22700,6 +22962,52 @@ msgstr "Mūšio laukas"
msgid "Palaeontological Site"
msgstr "Paleontologijos vieta"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monumentas"
@@ -23477,6 +23785,9 @@ msgstr "Vienkiemis"
msgid "Suburb"
msgstr "Priemiestis"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "Mikrorajonas"
@@ -23837,6 +24148,9 @@ msgstr "Sodininkystės šiltnamis"
msgid "Plant Nursery"
msgstr "Augalų daigynas"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr "Akvakultūra"
@@ -24003,7 +24317,7 @@ msgid "National name"
msgstr ""
msgid "International name"
-msgstr ""
+msgstr "Tarptautinis pavadinimas"
msgid "Official name"
msgstr "Oficialus pavadinimas"
@@ -24442,9 +24756,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr "tarptautinis"
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -24688,6 +25012,9 @@ msgstr "OpenStreetMap GPS trasos"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr "Viešasis transportas (ÖPNV)"
@@ -24700,7 +25027,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -24777,6 +25104,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -25103,6 +25437,9 @@ msgstr "URBIS 2015 aeronuotraukos"
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW(allonie) PICC numerinės nuotraukos"
@@ -25118,6 +25455,9 @@ msgstr "SPW(allonie) 2012-2013 aeronuotraukos"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 aeronuotraukos"
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -25422,6 +25762,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr "Bordo, Prancūzija - 2012"
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Cadastre"
@@ -26349,6 +26692,9 @@ msgstr "Fyzo Orthophoto 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -26396,10 +26742,10 @@ msgstr "USGS Topographic Maps"
msgid "USGS Large Scale Imagery"
msgstr "USGS Large Scale Imagery"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012 kelių perdanga"
+msgid "TIGER Roads 2012"
+msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -26408,6 +26754,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 parceliai"
@@ -26469,6 +26823,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -27416,6 +27773,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr "{0} kartu su {1} ant taško. Pašalinkite {0}."
@@ -27485,14 +27850,6 @@ msgid ""
msgstr ""
"{0} yra žyma vandens keliui. Vandens plotui žymėti naudokite {1} + {2}."
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -27503,7 +27860,7 @@ msgid "abbreviated street name"
msgstr "sutrumpintas gatvės pavadinimas"
msgid "wrong highway tag on a node"
-msgstr ""
+msgstr "neteisinga kelio žyma ant taško"
msgid "wrong crossing tag on a way"
msgstr ""
@@ -27546,10 +27903,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -30366,6 +30723,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -32197,9 +32557,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr "km/h"
-
msgid "Track name: "
msgstr "Trasos pavadinimas: "
@@ -33654,6 +34011,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr "km/h"
+
msgid "direction"
msgstr ""
@@ -34896,6 +35256,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
@@ -37178,7 +37544,7 @@ msgstr ""
"Rasti mokslo įstaigas mažiausiai 2 km, daugiausiai 3 km nuo pažymėjimo centro"
msgid "Show/hide Wikosm snippet list"
-msgstr ""
+msgstr "Rodyti/slėpti Wikosm fragmentų sąrašą"
msgid "help"
msgstr ""
diff --git a/i18n/po/lv.po b/i18n/po/lv.po
index 69f31e4..6a2b602 100644
--- a/i18n/po/lv.po
+++ b/i18n/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2012-10-03 22:16+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Latvian <lv at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:49+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: lv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2922,24 +2922,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3006,18 +2988,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr "Slānis: {0}"
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3531,6 +3508,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4199,6 +4194,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4885,6 +4883,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5012,6 +5029,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr "Izveidoju galveno saskarni"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5309,6 +5331,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8050,6 +8075,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10542,6 +10570,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10560,6 +10738,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13979,6 +14162,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15353,6 +15545,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15996,6 +16194,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16044,6 +16246,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16970,12 +17208,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16988,9 +17220,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17762,6 +17991,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18471,9 +18706,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20669,24 +20901,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20712,9 +20926,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20732,6 +20943,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20833,9 +21063,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20998,18 +21225,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21122,6 +21352,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21899,6 +22175,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22247,6 +22526,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22852,9 +23134,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23098,6 +23390,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23110,7 +23405,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23187,6 +23482,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23513,6 +23815,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23528,6 +23833,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23832,6 +24140,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24755,6 +25066,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24802,10 +25116,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24814,6 +25128,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24875,6 +25197,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25814,6 +26139,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25880,14 +26213,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25938,10 +26263,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28701,6 +29026,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30503,9 +30831,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31939,6 +32264,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33174,6 +33502,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/mk.po b/i18n/po/mk.po
index 0b81306..b93f01e 100644
--- a/i18n/po/mk.po
+++ b/i18n/po/mk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2013-05-11 04:37+0000\n"
"Last-Translator: Bojan Jankuloski <bojan.jankuloski at gmail.com>\n"
"Language-Team: Macedonian <mk at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:51+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: mk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2913,24 +2913,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2997,18 +2979,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3522,6 +3499,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4190,6 +4185,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4878,6 +4876,25 @@ msgstr "Ги покревам нагодувањата за подлогата"
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5005,6 +5022,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr "Создавање на главниот графички интерфејс"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5302,6 +5324,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8043,6 +8068,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10531,6 +10559,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10549,6 +10727,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13969,6 +14152,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15343,6 +15535,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15986,6 +16184,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16034,6 +16236,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16960,12 +17198,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16978,9 +17210,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17752,6 +17981,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18461,9 +18696,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20659,24 +20891,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20702,9 +20916,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20722,6 +20933,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20823,9 +21053,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20988,18 +21215,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21112,6 +21342,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21889,6 +22165,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22237,6 +22516,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22842,9 +23124,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23088,6 +23380,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23100,7 +23395,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23177,6 +23472,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23503,6 +23805,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23518,6 +23823,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23822,6 +24130,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24745,6 +25056,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24792,10 +25106,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24804,6 +25118,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24865,6 +25187,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25804,6 +26129,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25870,14 +26203,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25928,10 +26253,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28691,6 +29016,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30493,9 +30821,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31929,6 +32254,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33164,6 +33492,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/mr.po b/i18n/po/mr.po
index 671160c..7032310 100644
--- a/i18n/po/mr.po
+++ b/i18n/po/mr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2015-05-24 23:45+0000\n"
"Last-Translator: Singleton <singleton47+ubuntuone at live.com>\n"
"Language-Team: Marathi <mr at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:51+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: mr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2939,24 +2939,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3023,18 +3005,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "रंगशैली {0}: {1}"
-
msgid "Layer: {0}"
msgstr "थर: {0}"
-msgid "Failed to persist preferences to ''{0}''"
-msgstr ""
+msgid "Paint style {0}: {1}"
+msgstr "रंगशैली {0}: {1}"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3548,6 +3525,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4216,6 +4211,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4903,6 +4901,25 @@ msgstr ""
msgid "usage"
msgstr "वापर"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "पर्याय"
@@ -5030,6 +5047,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5327,6 +5349,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8068,6 +8093,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10566,6 +10594,156 @@ msgstr "(URL होती: "
msgid "Select the map painting styles"
msgstr "नकाशासाठी रंगशैली निवडा"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10584,6 +10762,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14004,6 +14187,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15378,6 +15570,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -16021,6 +16219,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16069,6 +16271,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16995,12 +17233,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -17013,9 +17245,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17787,6 +18016,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18496,9 +18731,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20694,24 +20926,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20737,9 +20951,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20757,6 +20968,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20858,9 +21088,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21023,18 +21250,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21147,6 +21377,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21924,6 +22200,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22272,6 +22551,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22877,9 +23159,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23123,6 +23415,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23135,7 +23430,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23212,6 +23507,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23538,6 +23840,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23553,6 +23858,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23857,6 +24165,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24780,6 +25091,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24827,10 +25141,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24839,6 +25153,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24900,6 +25222,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25839,6 +26164,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25905,14 +26238,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25963,10 +26288,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28726,6 +29051,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30528,9 +30856,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31964,6 +32289,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33199,6 +33527,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/ms.po b/i18n/po/ms.po
index 2213092..c5f01c1 100644
--- a/i18n/po/ms.po
+++ b/i18n/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2011-12-11 22:14+0000\n"
"Last-Translator: abuyop <Unknown>\n"
"Language-Team: Malay <ms at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:52+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: ms\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr "Membina GUI utama"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/nb.po b/i18n/po/nb.po
index fdc5628..f2aa731 100644
--- a/i18n/po/nb.po
+++ b/i18n/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2017-09-21 13:42+0000\n"
"Last-Translator: Anders Lyngvi Fougner <Unknown>\n"
"Language-Team: Norwegian Bokmal <nb at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:53+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: nb\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3021,24 +3021,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3105,18 +3087,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "Tegnestil {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Lag: {0}"
-msgid "Failed to persist preferences to ''{0}''"
-msgstr ""
+msgid "Paint style {0}: {1}"
+msgstr "Tegnestil {0}: {1}"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3634,6 +3611,24 @@ msgstr "tekst"
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4304,6 +4299,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4998,6 +4996,25 @@ msgstr "Laster bildeinstillinger"
msgid "usage"
msgstr "bruk"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "innstillinger"
@@ -5125,6 +5142,11 @@ msgstr "Setter standardverdier"
msgid "Creating main GUI"
msgstr "Bygger opp hovedskjermbilde"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5422,6 +5444,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8192,6 +8217,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10736,6 +10764,156 @@ msgstr "(URL var: "
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10754,6 +10932,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14210,6 +14393,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Hopp over nedlasting"
@@ -15594,6 +15786,12 @@ msgstr "Motorsykkel"
msgid "Motorcar"
msgstr "Motorkjøretøy"
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Veinummer"
@@ -16237,6 +16435,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16285,6 +16487,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr "Material"
+
+msgid "plastic"
+msgstr "plast"
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr "stein"
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr "Maksvekt (tonn)"
@@ -17211,12 +17449,6 @@ msgstr "Stengsel"
msgid "Block"
msgstr "Steinblokk"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "stein"
-
msgid "Bollard"
msgstr "Sperresøyle"
@@ -17229,9 +17461,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr "plast"
-
msgid "Cycle Barrier"
msgstr "Halvbommer"
@@ -18003,6 +18232,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18712,9 +18947,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "Zoologisk hage"
@@ -20910,24 +21142,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20953,9 +21167,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20973,6 +21184,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -21074,9 +21304,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21239,18 +21466,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21363,6 +21593,52 @@ msgstr "Slagmark"
msgid "Palaeontological Site"
msgstr "Paleontologisk sted"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monument"
@@ -22140,6 +22416,9 @@ msgstr ""
msgid "Suburb"
msgstr "Forstad/bydel"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "Nabolag"
@@ -22488,6 +22767,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -23097,9 +23379,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23343,6 +23635,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23355,7 +23650,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23432,6 +23727,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23758,6 +24060,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23773,6 +24078,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -24077,6 +24385,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Matrikkel"
@@ -25000,6 +25311,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -25047,10 +25361,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -25059,6 +25373,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -25120,6 +25442,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -26065,6 +26390,14 @@ msgstr "{0} på en linje. Bør brukes på en node."
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} på en linje. Bør brukes på en relasjon."
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -26131,14 +26464,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -26189,10 +26514,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28973,6 +29298,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30795,9 +31123,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -32242,6 +32567,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33477,6 +33805,12 @@ msgstr "Velg kun ett objekt"
msgid "Select a map object"
msgstr "Velg et kartobjekt"
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/nds.po b/i18n/po/nds.po
index 7f34516..844fe31 100644
--- a/i18n/po/nds.po
+++ b/i18n/po/nds.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2009-11-29 09:01+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: German, Low <nds at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:52+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2910,24 +2910,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2994,18 +2976,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3519,6 +3496,24 @@ msgstr "Text"
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4187,6 +4182,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4874,6 +4872,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5001,6 +5018,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5298,6 +5320,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8039,6 +8064,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10527,6 +10555,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10545,6 +10723,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13964,6 +14147,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15338,6 +15530,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15981,6 +16179,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16029,6 +16231,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16955,12 +17193,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16973,9 +17205,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17747,6 +17976,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18456,9 +18691,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20654,24 +20886,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20697,9 +20911,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20717,6 +20928,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20818,9 +21048,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20983,18 +21210,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21107,6 +21337,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21884,6 +22160,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22232,6 +22511,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22837,9 +23119,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23083,6 +23375,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23095,7 +23390,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23172,6 +23467,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23498,6 +23800,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23513,6 +23818,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23817,6 +24125,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24740,6 +25051,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24787,10 +25101,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24799,6 +25113,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24860,6 +25182,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25799,6 +26124,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25865,14 +26198,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25923,10 +26248,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28686,6 +29011,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30488,9 +30816,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31924,6 +32249,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33159,6 +33487,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/nl.po b/i18n/po/nl.po
index 98624e1..7396d3e 100644
--- a/i18n/po/nl.po
+++ b/i18n/po/nl.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-10-01 13:00+0000\n"
-"Last-Translator: Don-vip <Unknown>\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-23 14:48+0000\n"
+"Last-Translator: DiGro <Unknown>\n"
"Language-Team: Dutch\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-10-02 04:31+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:41+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: nl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -120,11 +120,11 @@ msgid_plural ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
msgstr[0] ""
-"U staat op het punt om {0} browservenster te starten.<br>Dit kan u scherm "
-"volzetten met browservensters<br>en kan enige tijd vergen."
+"U staat op het punt om {0} browservenster te starten.<br>Dit kan uw scherm "
+"vol zetten met browservensters<br>en kan enige tijd vergen."
msgstr[1] ""
-"U staat op het punt om {0} browservensters te starten.<br>Dit kan u scherm "
-"volzetten met browservensters<br>en kan enige tijd vergen."
+"U staat op het punt om {0} browservensters te starten.<br>Dit kan uw scherm "
+"vol zetten met browservensters<br>en kan enige tijd vergen."
msgid "Continue"
msgstr "Doorgaan"
@@ -3207,25 +3207,6 @@ msgstr "Ongeldige waarde ''{0}'' voor breedtegraad"
msgid "Illegal longitude value ''{0}''"
msgstr "Ongeldige waarde ''{0}'' voor lengtegraad"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr "Maken van ontbrekende map voor voorkeuren mislukt: {0}"
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr "<html>Maken van ontbrekende map voor voorkeuren mislukt: {0}</html>"
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr "Maken van ontbrekende map voor gebruikersgegevens mislukt: {0}"
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-"<html>Maken van ontbrekende map voor gebruikersgegevens mislukt: {0}</html>"
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Maken van ontbrekende cache-map: {0} mislukt"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Maken van ontbrekende cachemap: {0} mislukt</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Onmogelijk tijdelijk bestand te verwijderen {0}"
@@ -3311,22 +3292,15 @@ msgstr "Laden van standaard cachebestand: {0} mislukt."
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr "Verwijderen van beschadigd standaard cachebestand: {0} mislukt."
-msgid "Paint style {0}: {1}"
-msgstr "Tekenstijl {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Laag: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Tekenstijl {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Behouden van voorkeuren voor ''{0}'' mislukt"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Probeer netwerk IPv6 in te schakelen, voorkeur voor IPv6 boven IPv4 (werkt "
-"alleen bij eerste opstarten)."
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr ""
"Instelling van voorkeur {0} is verwijderd omdat hij niet langer wordt "
@@ -3895,6 +3869,25 @@ msgstr "tekst"
msgid "areatext"
msgstr "tekst voor gebied"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr "Maken van ontbrekende map voor voorkeuren mislukt: {0}"
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr "<html>Maken van ontbrekende map voor voorkeuren mislukt: {0}</html>"
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr "Maken van ontbrekende map voor gebruikersgegevens mislukt: {0}"
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+"<html>Maken van ontbrekende map voor gebruikersgegevens mislukt: {0}</html>"
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Maken van ontbrekende cache-map: {0} mislukt"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Maken van ontbrekende cachemap: {0} mislukt</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Verwacht element ''{0}'', maar kreeg ''{1}''"
@@ -4602,6 +4595,9 @@ msgstr "Stijl voor gebied op buitenste weg"
msgid "Multipolygon is not closed"
msgstr "Multipolygoon is niet gesloten"
+msgid "Self-intersecting polygon ring"
+msgstr "Zelfkruisende polygoonring"
+
msgid "Multipolygon rings share node(s)"
msgstr "Ringen van multipolygonen delen kno(o)p(en)"
@@ -5327,6 +5323,30 @@ msgstr "Afbeeldingsvoorkeuren laden"
msgid "usage"
msgstr "gebruik"
+msgid "commands"
+msgstr "opdrachten"
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+"start JOSM (standaard, uitgevoerd indien geen opdracht is gespecificeerd)"
+
+msgid "render data and save the result to an image file"
+msgstr "render gegevens en sla het resultaat op in een afbeeldingsbestand"
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+"converteer coördinaten van het ene coördinaten referentie systeem naar een "
+"ander"
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+"Voor details over de opdrachten {0} en {1}, voer ze uit met de optie {2}."
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+"Het resterende gedeelte van deze Helppagina documenteert de opdracht {0}."
+
msgid "options"
msgstr "opties"
@@ -5467,6 +5487,13 @@ msgstr "Standaarden instellen"
msgid "Creating main GUI"
msgstr "Hoofdscherm aanmaken"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Probeer netwerk IPv6 in te schakelen, voorkeur voor IPv6 boven IPv4 (werkt "
+"alleen bij eerste opstarten)."
+
msgid "Updating plugins"
msgstr "Bijwerken plugins"
@@ -5789,6 +5816,9 @@ msgstr "Vergroten"
msgid "Shrink"
msgstr "Verkleinen"
+msgid "Show downloaded area"
+msgstr "Gedownl;oade gebied tonen"
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8849,6 +8879,9 @@ msgstr ""
"<html>Laag ''{0}'' heeft al een conflict voor object<br/>''{1}''.<br/>Los "
"dat conflict eerst op en probeer het dan opnieuw.</html>"
+msgid "Select the currently edited relation"
+msgstr "De momenteel bewerkte relatie selecteren"
+
msgid "Select objects for selected relation members"
msgstr "Selecteer objecten voor de geselecteerde leden van de relatie"
@@ -11661,6 +11694,187 @@ msgstr "(URL was: "
msgid "Select the map painting styles"
msgstr "Selecteer de maptekenstijlen"
+msgid "Error - file not found: ''{0}''"
+msgstr "Fout - bestand niet gevonden: ''{0}''"
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr "Verwachte een geheel getal voor optie {0}, maar kreeg ''{1}''"
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr "Verwachte een geheel getal >= 0 voor optie {0}, maar kreeg ''{1}''"
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr "Niet mogelijk te parsen {0} parameter: {1}"
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+"Verwachte sleutel en waarde, gescheiden door teken '':'' voor optie {0}, "
+"maar kreeg ''{1}''"
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+"Verwachte een getal met zwevende komma voor optie {0}, maar kreeg ''{1}''"
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+"Verwachte twee coördinaten, gescheiden dor komma, voor optie {0}, maar kreeg "
+"''{1}''"
+
+msgid "In option {0}: {1}"
+msgstr "In optie {0}: {1}"
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+"Verwachte getal met zwevende komma > 0 voor optie {0}, maar kreeg ''{1}''"
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr "Verwachte geheel getal > 0 voor optie {0}, maar kreeg ''{1}''"
+
+msgid "JOSM rendering command line interface"
+msgstr "JOSM renderen interface voor de opdrachtregel"
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+"Rendert gegevens en slaat het resultaat op in een afbeeldingsbestand."
+
+msgid "Input data file name (.osm)"
+msgstr "Invoergegevens bestandsnaam (.osm)"
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr "Naam uitvoer afbeeldingsbestand (.png); standaard ''{0}''"
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr "Stijlbestand om te gebruiken voor renderen (.mapcss of .zip)"
+
+msgid "This option can be repeated to load multiple styles."
+msgstr "Deze optie mag worden herhaald om meerdere stijlen te laden."
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+"Instelling voor stijl (in JOSM toegankelijk via het contextmenu van het "
+"dialoogvenster Stijllijst)"
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr "Van toepassing op de laatst geladen stijl met de optie {0}."
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+"Zoomniveau voor renderen selecteren. (waarde geheel getal, 0=gehele aarde, "
+"18=straatniveau)"
+
+msgid "Select the map scale"
+msgstr "De kaartschaal selecteren"
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+"Een waarde van 10000 geeft een schaal van 1:10000 (1 cm op de kaart is "
+"gelijk aan 100 m op de grond; weergaveresolutie: 96 dpi)"
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr "Opties {0} en {1} sluiten elkaar uit."
+
+msgid "Area to render, default value is ''{0}''"
+msgstr "Te renderen gebied, standaard waarde is ''{0}''"
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+"Met sleutelwoord ''{0}'' zal het gedownloade gebied in het invoerbestand "
+".osm worden gebruikt (indien opgenomen)."
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr "Specificeer de linker onderzijde van het te redeneren gebied"
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+"Gebruikt in combinatie met opties breedte en hoogte om het te renderen "
+"gebied te bepalen."
+
+msgid "Width of the rendered area, in meter"
+msgstr "Breedte van het gerenderde gebied, in meters"
+
+msgid "Height of the rendered area, in meter"
+msgstr "Hoogte van het gerenderde gebied, in meters"
+
+msgid "Width of the target image, in pixel"
+msgstr "Breedte van de doelafbeelding, in pixels"
+
+msgid "Height of the target image, in pixel"
+msgstr "Hoogte van de doelafbeelding, in pixels"
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr "Te gebruiken projectie, standaard waarde ''{0}'' (web-Mercator)"
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+"Maximum breedte/hoogte afbeelding in pixels (''{0}'' betekent geen grens), "
+"standaard waarde: {1}"
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+"De opties mogen op verscheidene manieren worden gecombineerd om het "
+"gerenderde gebied en de schaal te specificeren."
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+"Indien ''{0}'' noch ''{1}'' zijn opgegeven, wordt de standaard waarde {2} "
+"effectief en worden de begrenzingen van het gedownloade gebied in het "
+"invoerbestand .osm gebruikt."
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+"Argument {0} opgegeven, maar schaal kan niet worden bepaald uit de "
+"resterende argumenten"
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr "Argument {0} opgegeven, verwachte {1} of {2}"
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+"Modus {0}, maar geen begrenzingen gevonden in invoerbestand van OSM-gegevens"
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+"Niet in staat schaal te bepalen, één van de opties {0}, {1}, {2} of {3} "
+"verwacht"
+
+msgid "Missing argument - input data file ({0})"
+msgstr "Ontbrekend argument - invoer gegevensbestand ({0})"
+
+msgid "In .osm data file ''{0}'' - "
+msgstr "In .osm gegevensbestand ''{0}'' - "
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr "Ontbrekend argument - ten minste één stijl verwacht ({0})"
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+"Dimensies afbeelding ({0}x{1}) overschrijden de maximale grootte voor de "
+"afbeelding {2} (gebruik optie {3} om de grens te wijzigen)"
+
+msgid "Style setting not found: ''{0}''"
+msgstr "Instelling voor stijl niet gevonden: ''{0}''"
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11684,6 +11898,11 @@ msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
"Parsen van Kaarttekenstijlen vanaf ''{0}'' mislukt. Exceptie was: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Lokaliseren van afbeelding ''{0}'' mislukt"
@@ -15572,6 +15791,16 @@ msgstr "Laag overslaan en doorgaan"
msgid "expected .jos file inside .joz archive"
msgstr "verwacht .jos-bestand binnen .joz-archief"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr "Maken van ontbrekende map voor voorkeuren van plug-in mislukt: {0}"
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+"Maken van ontbrekende map voor gebruikersgegevens van plug-in mislukt: {0}"
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr "Maken van ontbrekende map voor cache van plug-in mislukt: {0}"
+
msgid "Skip download"
msgstr "Downloaden overslaan"
@@ -17166,6 +17395,12 @@ msgstr "Motorfiets"
msgid "Motorcar"
msgstr "Vierwielige motorvoertuigen"
+msgid "Minimum age"
+msgstr "Minimumleeftijd"
+
+msgid "Maximum age"
+msgstr "Maximum leeftijd"
+
msgid "Reference"
msgstr "Referentie"
@@ -17815,6 +18050,10 @@ msgid "platform"
msgstr "platform"
msgctxt "power"
+msgid "rooftop"
+msgstr "dak"
+
+msgctxt "power"
msgid "kiosk"
msgstr "kiosk"
@@ -17863,6 +18102,42 @@ msgstr "stoom"
msgid "vacuum"
msgstr "vacuüm"
+msgid "Material"
+msgstr "Materiaal"
+
+msgid "plastic"
+msgstr "plastiek"
+
+msgid "steel"
+msgstr "staal"
+
+msgid "stone"
+msgstr "steen"
+
+msgid "Location transition"
+msgstr "Locatie transitie"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Stroomkracht (kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Fases"
+
msgid "Max. weight (tonnes)"
msgstr "Max. gewicht (ton)"
@@ -18809,12 +19084,6 @@ msgstr "Barrières"
msgid "Block"
msgstr "Blok"
-msgid "Material"
-msgstr "Materiaal"
-
-msgid "stone"
-msgstr "steen"
-
msgid "Bollard"
msgstr "Verkeerspaal"
@@ -18827,9 +19096,6 @@ msgstr "stijgend"
msgid "removable"
msgstr "verwijderbaar"
-msgid "plastic"
-msgstr "plastiek"
-
msgid "Cycle Barrier"
msgstr "Fietshekje"
@@ -19608,6 +19874,12 @@ msgstr "1/25 mix (tweetakt)"
msgid "1/50 mix (mofa/moped)"
msgstr "1/50 mix (tweetakt)"
+msgid "Additives:"
+msgstr "Toevoegingen:"
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr "Diesel Exhaust Fluid (AdBlue/AUS32)"
+
msgid "Fuel cards:"
msgstr "Brandstofkaarten:"
@@ -20320,9 +20592,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Aantal schermen"
-msgid "Minimum age"
-msgstr "Minimumleeftijd"
-
msgid "Zoo"
msgstr "Dierentuin"
@@ -22518,24 +22787,6 @@ msgctxt "power"
msgid "industrial"
msgstr "industrieel"
-msgid "Power rating (kVA/MVA)"
-msgstr "Stroomkracht (kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "Gas geïsoleerd"
@@ -22561,9 +22812,6 @@ msgctxt "power"
msgid "yes"
msgstr "Ja"
-msgid "Phases"
-msgstr "Fases"
-
msgid "Power Switchgear"
msgstr "Electriciteit schakelstation"
@@ -22583,6 +22831,25 @@ msgstr "Electriciteit groep"
msgid "Power Switch"
msgstr "Electriciteit schakelstation"
+msgid "Type of switch"
+msgstr "Type schakelaar"
+
+msgctxt "power"
+msgid "mechanical"
+msgstr "mechanisch"
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr "zekering"
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr "aarde"
+
msgid "Power Converter"
msgstr "Energie converter"
@@ -22684,9 +22951,6 @@ msgstr "buisvormig"
msgid "solid"
msgstr "vast"
-msgid "steel"
-msgstr "staal"
-
msgctxt "color"
msgid "red/white"
msgstr "rood/wit"
@@ -22849,18 +23113,21 @@ msgstr "Driedelige mast"
msgid "Incomplete tower"
msgstr "Onvolledige mast"
-msgid "Location transition"
-msgstr "Locatie transitie"
-
msgid "Pole"
msgstr "Electriciteitsmast"
-msgid "Pole with Transformer"
-msgstr "Mast met transformator"
+msgid "Pole with Switch"
+msgstr "Paal met schakelaar"
msgid "Pole Attributes:"
msgstr "Attributen voor masten:"
+msgid "Switch Attributes:"
+msgstr "Attributen schakelaar:"
+
+msgid "Pole with Transformer"
+msgstr "Mast met transformator"
+
msgid "Transformer Attributes:"
msgstr "Attributen voor transformator:"
@@ -22973,6 +23240,52 @@ msgstr "Historisch slagveld"
msgid "Palaeontological Site"
msgstr "Paleontologische opgraving"
+msgid "Grave"
+msgstr "Graf"
+
+msgid "Tomb"
+msgstr "Tombe"
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr "grafheuvel"
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr "in steen gehouwen tombe"
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr "ondergrondse tombe"
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr "oorlogs_graf"
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr "mausoleum"
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr "columbarium"
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr "crypte"
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr "pyramide"
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr "sarcofaag"
+
+msgctxt "tomb"
+msgid "vault"
+msgstr "kluis"
+
msgid "Monument"
msgstr "Monument"
@@ -23750,6 +24063,9 @@ msgstr "Afgelegen plaats"
msgid "Suburb"
msgstr "Deelgemeente"
+msgid "Quarter"
+msgstr "legering"
+
msgid "Neighbourhood"
msgstr "Buurt"
@@ -24109,6 +24425,9 @@ msgstr "Glastuinbouw"
msgid "Plant Nursery"
msgstr "Plantenkwekerij"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr "Watercultuur"
@@ -24174,11 +24493,11 @@ msgstr ""
msgctxt "industrial"
msgid "depot"
-msgstr ""
+msgstr "depot"
msgctxt "industrial"
msgid "distributor"
-msgstr ""
+msgstr "distributie"
msgctxt "industrial"
msgid "factory"
@@ -24719,9 +25038,19 @@ msgstr "Routes"
msgid "Bicycle Route"
msgstr "Fietsroute"
+msgctxt "network"
+msgid "international"
+msgstr "internationaal"
+
+msgctxt "network"
msgid "national"
msgstr "nationaal"
+msgctxt "network"
+msgid "regional"
+msgstr "regionaal"
+
+msgctxt "network"
msgid "local"
msgstr "lokaal"
@@ -24973,6 +25302,9 @@ msgstr "OpenStreetMap GPS-sporen"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr "Publieke GPS-sporen, geüpload naar OpenStreetMap."
+msgid "OpenTopoMap"
+msgstr "OpenTopoMap"
+
msgid "Public Transport (ÖPNV)"
msgstr "Public Transport (ÖPNV)"
@@ -24985,8 +25317,8 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr "Stamen Terrain"
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
-msgstr "Cambodja, Laos, Thailand, Vietnam, Myanmar tweetalig"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
+msgstr "Cambodja, Laos, Thailand, Vietnam, Maleisië, Myanmar tweetalig"
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -25064,6 +25396,14 @@ msgstr ""
"Afbeeldingen uit de late zomer waar bronnen gewoonlijk ernstig worden "
"beperkt door wolken en sneeuw (ware kleuren)"
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr "Gemeente Tirana (Open Labs GeoPortal)"
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+"Straten & gebouwen verschaft door de gemeente Tirana, gehostd door Open Labs"
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
@@ -25402,6 +25742,9 @@ msgstr "URBIS 2015 luchtfoto''s"
msgid "URBIS 2016 aerial imagery"
msgstr "URBIS 2016 luchtfoto’s"
+msgid "URBIS 2017 aerial imagery"
+msgstr "URBIS 2017 luchtfoto’s"
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW(allonie) PICC numerieke afbeeldingen"
@@ -25417,6 +25760,9 @@ msgstr "SPW(allonie) 2012-2013 luchtfoto’s"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 luchtfoto’s"
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr "TEC buslijnen"
@@ -25740,6 +26086,9 @@ msgstr "BDOrtho IGN"
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
+msgid "Bordeaux - 2016"
+msgstr "Bordeaux - 2016"
+
msgid "Cadastre"
msgstr "Kadaster"
@@ -26745,6 +27094,9 @@ msgstr "Fiez Orthophoto 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr "Kanton Basel-Stadt 2015"
+msgid "Kanton Basel-Stadt 2017"
+msgstr "Kanton Basel-Stadt 2017"
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr "Kanton Basel-Landschaft 10cm (2015)"
@@ -26797,11 +27149,11 @@ msgstr "USGS Topographic Maps"
msgid "USGS Large Scale Imagery"
msgstr "USGS Large Scale Imagery"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
+msgstr "TIGER Roads 2012"
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
+msgstr "TIGER Roads 2014"
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -26812,6 +27164,16 @@ msgstr ""
"zoomniveaus alleen wijzigingen sinds 2006 minus wijzigingen die al waren "
"verwerkt in OpenStreetMap"
+msgid "TIGER Roads 2017"
+msgstr "TIGER Roads 2017"
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+"Geel = Publieke domein kaartgegevens van US Census. Rood = Gegevens niet "
+"gevonden in OpenStreetMap"
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
@@ -26883,6 +27245,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr "San Juan Metro Area: 2013 USACE Orthophotos"
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr "PR/USVI 2017 NOAA Afbeeldingen orkaan Maria"
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr "WA 2013 aerial imagery for San Juan County"
@@ -28022,6 +28387,16 @@ msgstr "{0} op een weg. Zou moeten worden gebruikt op een knoop."
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} op een weg. Zou moeten worden gebruikt in een relatie"
+msgid "node connects highway and building"
+msgstr "knoop verbindt highway en building"
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+"Object op positie 0.00E 0.00N. Er is niets op deze positie, behalve een "
+"reeds eerder in kaart gebrachte weerboei."
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr "{0} samen met {1} op een knoop. Verwijder {0}."
@@ -28094,21 +28469,12 @@ msgstr ""
"{0} is de tag voor de lineaire waterweg. Gebruik in plaats daarvan {1} + {2} "
"om het watergebied te taggen."
-msgid "node connects highway and building"
-msgstr "knoop verbindt highway en building"
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-"Object op positie 0.00E 0.00N. Er is niets op deze positie, behalve een "
-"reeds eerder in kaart gebrachte weerboei."
-
msgid "Ferry route is not connected to the road network or branches."
msgstr "Ferryroute is niet verbonden met het wegennetwerk of takken daarvan."
msgid "Ferry route is not connected to a ferry terminal or branches."
msgstr ""
+"Veerroute is niet verbonden met een terminal voor het veer of aftakkingen."
msgid "abbreviated street name"
msgstr "afgekorte straatnaam"
@@ -28126,7 +28492,7 @@ msgid "highway without a reference"
msgstr "verkeersweg zonder een referentie"
msgid "Unspecific highway type"
-msgstr ""
+msgstr "Niet gespecificeerd type highway"
msgid "{0} used with {1}"
msgstr "{0} gebruikt met {1}"
@@ -28158,11 +28524,11 @@ msgstr "lege waarde in punt-kommagescheiden ''{0}''"
msgid "numerical key"
msgstr "numerieke toets"
-msgid "layer tag with + sign"
-msgstr "laagtag met een + teken"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "laag zou moeten liggen tussen -5 en 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr ""
@@ -31370,6 +31736,9 @@ msgid ""
msgstr ""
"<html>Er is niets geselecteerd.<br>Kies iets om te downloaden.</html>"
+msgid "Download cadastre data"
+msgstr "Gegevens van cadastre downloaden"
+
msgid "Recipient"
msgstr "Ontvanger"
@@ -33329,9 +33698,6 @@ msgstr "Verwijder dit"
msgid "Delete this&older"
msgstr "Verwijder deze&oudere"
-msgid "km/h"
-msgstr "km/u"
-
msgid "Track name: "
msgstr "Naam spoor: "
@@ -34875,6 +35241,9 @@ msgstr "positief getal of leeg"
msgid "Speed:"
msgstr "Snelheid:"
+msgid "km/h"
+msgstr "km/u"
+
msgid "direction"
msgstr "oriëntatie"
@@ -36179,6 +36548,12 @@ msgstr "Slechts één object selecteren"
msgid "Select a map object"
msgstr "Een kaartobject selecteren"
+msgid "Please enter minimal distance in metres"
+msgstr "Voer de minimale afstand in meters in"
+
+msgid "Please enter numeric angle in degrees"
+msgstr "Voer numerieke hoek in graden in"
+
msgid "Shape actions panel"
msgstr "Paneel Acties voor vormen"
diff --git a/i18n/po/nn.po b/i18n/po/nn.po
index a3cb1ab..23d95aa 100644
--- a/i18n/po/nn.po
+++ b/i18n/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2009-07-15 12:49+0000\n"
"Last-Translator: Skippern <Unknown>\n"
"Language-Team: Norwegian Nynorsk <nn at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:53+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: nn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/oc.po b/i18n/po/oc.po
index a9249f0..8899470 100644
--- a/i18n/po/oc.po
+++ b/i18n/po/oc.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2012-10-03 22:14+0000\n"
"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary at yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:53+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2917,24 +2917,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3001,18 +2983,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr "Calc : {0}"
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3526,6 +3503,24 @@ msgstr "tèxte"
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4194,6 +4189,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4882,6 +4880,25 @@ msgstr ""
msgid "usage"
msgstr "usatge"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "opcions"
@@ -5009,6 +5026,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr "Creacion de l’interfàcia grafica de l'utilizaire (GUI)"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5306,6 +5328,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8047,6 +8072,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10537,6 +10565,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10555,6 +10733,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13974,6 +14157,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15348,6 +15540,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15991,6 +16189,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16039,6 +16241,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16965,12 +17203,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16983,9 +17215,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17757,6 +17986,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18466,9 +18701,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20664,24 +20896,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20707,9 +20921,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20727,6 +20938,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20828,9 +21058,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20993,18 +21220,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21117,6 +21347,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21894,6 +22170,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22242,6 +22521,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22847,9 +23129,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23093,6 +23385,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23105,7 +23400,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23182,6 +23477,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23508,6 +23810,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23523,6 +23828,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23827,6 +24135,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24750,6 +25061,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24797,10 +25111,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24809,6 +25123,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24870,6 +25192,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25809,6 +26134,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25875,14 +26208,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25933,10 +26258,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28696,6 +29021,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30498,9 +30826,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31934,6 +32259,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33169,6 +33497,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/pa.po b/i18n/po/pa.po
index c2fc9f4..41b3b71 100644
--- a/i18n/po/pa.po
+++ b/i18n/po/pa.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2011-05-06 15:52+0000\n"
-"Last-Translator: A S Alam <aalam at users.sf.net>\n"
+"Last-Translator: A S Alam <alam.yellow at gmail.com>\n"
"Language-Team: Punjabi <pa at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:54+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: pa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/pl.po b/i18n/po/pl.po
index 13a5006..af2502e 100644
--- a/i18n/po/pl.po
+++ b/i18n/po/pl.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-10-03 03:32+0000\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-26 15:54+0000\n"
"Last-Translator: Daniel Koć <daniel at xn--ko-wla.pl>\n"
"Language-Team: polski <>\n"
"MIME-Version: 1.0\n"
@@ -17,8 +17,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-10-03 04:33+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: pl\n"
msgid "Cutting"
@@ -3226,26 +3226,6 @@ msgstr "Niewłaściwa wartość szerokości geograficznej „{0}”"
msgid "Illegal longitude value ''{0}''"
msgstr "Niewłaściwa wartość długości geograficznej „{0}”"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Nie udało się utworzyć brakującego katalogu pamięci podręcznej: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-"<html>Nie udało się utworzyć brakującego katalogu pamięci podręcznej: "
-"{0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Nie można usunąć pliku tymczasowego {0}"
@@ -3330,22 +3310,15 @@ msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
"Nie udało się usunąć uszkodzonego domyślnego pliku pamięci podręcznej: {0}"
-msgid "Paint style {0}: {1}"
-msgstr "Styl rysowania {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Warstwa: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Styl rysowania {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Nie udało się zapisać preferencji w „{0}''"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Proszę spróbować włączyć obsługę adresów IPv6 i preferuj adresy IPv6 nad "
-"IPv4 (działa tylko na początku rozruchu)."
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr "Ustawienie {0} zostało usunięte, ponieważ nie jest już używane."
@@ -3904,6 +3877,26 @@ msgstr "tekst"
msgid "areatext"
msgstr "obszar tekstowy"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Nie udało się utworzyć brakującego katalogu pamięci podręcznej: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+"<html>Nie udało się utworzyć brakującego katalogu pamięci podręcznej: "
+"{0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Oczekiwany element „{0}'', ale otrzymano „{1}”"
@@ -4597,6 +4590,9 @@ msgstr "Styl obszaru na linii zewnętrznej"
msgid "Multipolygon is not closed"
msgstr "Wielokąt złożony nie jest zamknięty"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr "Pierścienie wielokąta złożonego współdzielą węzły"
@@ -5311,6 +5307,25 @@ msgstr "Wczytywanie ustawień podkładów"
msgid "usage"
msgstr "użycie"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "opcje"
@@ -5445,6 +5460,13 @@ msgstr "Zapisywanie domyślnych ustawień"
msgid "Creating main GUI"
msgstr "Przygotowywanie interfejsu użytkownika"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Proszę spróbować włączyć obsługę adresów IPv6 i preferuj adresy IPv6 nad "
+"IPv4 (działa tylko na początku rozruchu)."
+
msgid "Updating plugins"
msgstr "Aktualizowanie wtyczek"
@@ -5764,6 +5786,9 @@ msgstr "Przybliż"
msgid "Shrink"
msgstr "Oddal"
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8744,6 +8769,9 @@ msgstr ""
"<html>Warstwa „{0}” jest w konflikcie z obiektem<br>„{1}”.<br>Proszę go "
"najpierw rozwiązać i spróbować ponownie.</html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr "Zaznacza obiekty odpowiadające zaznaczonym członkom relacji"
@@ -9514,7 +9542,7 @@ msgid "Check \"Save\" to save the layer to the file specified on the left."
msgstr "Zaznaczenie „Zapisz”, zapisze warstwę do pliku określonego po lewej."
msgid "I would like someone to review my edits."
-msgstr "Chcę żeby ktoś przejrzał moje zmiany"
+msgstr "Dołączenie prośby o sprawdzenie wprowadzonych zmian"
msgid "Provide a brief comment for the changes you are uploading:"
msgstr "Opis zmian wysyłanych do serwera:"
@@ -11508,6 +11536,156 @@ msgstr "(Adres URL był: "
msgid "Select the map painting styles"
msgstr "Wybierz style rysowania mapy"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11533,6 +11711,11 @@ msgstr "Nie udało się wczytać stylów Mappaint z „{0}”. Wyjątek: {1}"
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Nie udało się przetworzyć stylów Mappaint z „{0}”. Błąd: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Nie udało się zlokalizować obrazu „{0}''"
@@ -15182,6 +15365,15 @@ msgstr "Pomiń warstwę i kontynuuj"
msgid "expected .jos file inside .joz archive"
msgstr "oczekiwano pliku .jos wewnątrz archiwum .joz"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Pomiń pobieranie"
@@ -16750,6 +16942,12 @@ msgstr "Motocykle"
msgid "Motorcar"
msgstr "Samochody"
+msgid "Minimum age"
+msgstr "Wiek minimalny"
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Numer"
@@ -17397,6 +17595,10 @@ msgid "platform"
msgstr "platforma (morska)"
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr "kiosk"
@@ -17445,6 +17647,42 @@ msgstr "para wodna"
msgid "vacuum"
msgstr "próżnia"
+msgid "Material"
+msgstr "Materiał"
+
+msgid "plastic"
+msgstr "plastik"
+
+msgid "steel"
+msgstr "stal"
+
+msgid "stone"
+msgstr "kamień"
+
+msgid "Location transition"
+msgstr "Połączenie z kablem ziemnym"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Moc (kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Fazy"
+
msgid "Max. weight (tonnes)"
msgstr "Maksymalny ciężar (w tonach)"
@@ -18375,12 +18613,6 @@ msgstr "Przeszkody"
msgid "Block"
msgstr "Betonowy blok"
-msgid "Material"
-msgstr "Materiał"
-
-msgid "stone"
-msgstr "kamień"
-
msgid "Bollard"
msgstr "Słupek drogowy"
@@ -18393,9 +18625,6 @@ msgstr "podnoszony"
msgid "removable"
msgstr "możliwe do usunięcia"
-msgid "plastic"
-msgstr "plastik"
-
msgid "Cycle Barrier"
msgstr "Przegroda dla rowerzystów"
@@ -19168,6 +19397,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr "Karty paliwowe:"
@@ -19874,9 +20109,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Liczba ekranów"
-msgid "Minimum age"
-msgstr "Wiek minimalny"
-
msgid "Zoo"
msgstr "Zoo"
@@ -22068,24 +22300,6 @@ msgctxt "power"
msgid "industrial"
msgstr "Przemysłowa"
-msgid "Power rating (kVA/MVA)"
-msgstr "Moc (kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "Izolowana gazem"
@@ -22111,9 +22325,6 @@ msgctxt "power"
msgid "yes"
msgstr "Tak"
-msgid "Phases"
-msgstr "Fazy"
-
msgid "Power Switchgear"
msgstr "Rozdzielnia"
@@ -22133,6 +22344,25 @@ msgstr "Pole liniowe"
msgid "Power Switch"
msgstr "Łącznik"
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr "Konwerter napięcia (HVDC)"
@@ -22234,9 +22464,6 @@ msgstr "rurowa"
msgid "solid"
msgstr "wypełniona"
-msgid "steel"
-msgstr "stal"
-
msgctxt "color"
msgid "red/white"
msgstr "czerwono/biały"
@@ -22399,18 +22626,21 @@ msgstr "Potrójny"
msgid "Incomplete tower"
msgstr "Niekompletny"
-msgid "Location transition"
-msgstr "Połączenie z kablem ziemnym"
-
msgid "Pole"
msgstr "Słup"
-msgid "Pole with Transformer"
-msgstr "Słup z transformatorem"
+msgid "Pole with Switch"
+msgstr ""
msgid "Pole Attributes:"
msgstr "Atrybuty słupa:"
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr "Słup z transformatorem"
+
msgid "Transformer Attributes:"
msgstr "Atrybuty transformatora:"
@@ -22523,6 +22753,52 @@ msgstr "Pole bitwy"
msgid "Palaeontological Site"
msgstr "Wykopalisko paleontologiczne"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monument"
@@ -22837,7 +23113,7 @@ msgid "Variety Store"
msgstr "Sklep z różnościami"
msgid "Charity"
-msgstr ""
+msgstr "Dobroczynny"
msgid "Bookmaker"
msgstr "Bukmacher"
@@ -23300,6 +23576,9 @@ msgstr "Pojedyncze zabudowania"
msgid "Suburb"
msgstr "Dzielnica"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "Osiedle/Sąsiedztwo"
@@ -23649,6 +23928,9 @@ msgstr "Szklarnia ogrodnicza"
msgid "Plant Nursery"
msgstr "Szkółka roślin"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr "Akwakultura"
@@ -24260,9 +24542,19 @@ msgstr "Szlaki"
msgid "Bicycle Route"
msgstr "Szlak rowerowy"
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -24506,6 +24798,9 @@ msgstr "OpenStreetMap - ślady GPS"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr "Publiczne ślady GPS wysłane do OpenStreetMap."
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr "Transport publiczny (ÖPNV)"
@@ -24518,8 +24813,8 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
-msgstr "Kambodża, Laos, Tajlandia, Wietnam, Birma dwujęzyczne"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (nakładka)"
@@ -24595,6 +24890,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -24921,6 +25223,9 @@ msgstr "URBIS 2015 zdjęcia lotnicze"
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -24936,6 +25241,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -25240,6 +25548,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Kataster"
@@ -26163,6 +26474,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -26210,10 +26524,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -26222,6 +26536,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -26283,6 +26605,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -27227,6 +27552,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr "węzeł łączy drogę i budynek"
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -27293,14 +27626,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr "węzeł łączy drogę i budynek"
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -27351,11 +27676,11 @@ msgstr ""
msgid "numerical key"
msgstr "klucz w postaci wartości liczbowej"
-msgid "layer tag with + sign"
-msgstr "znacznik warstwy ze znakiem +"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "warstwa powinna być pomiędzy -5 a 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr ""
@@ -30201,6 +30526,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -32010,9 +32338,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr "km/h"
-
msgid "Track name: "
msgstr ""
@@ -33466,6 +33791,9 @@ msgstr ""
msgid "Speed:"
msgstr "Prędkość:"
+msgid "km/h"
+msgstr "km/h"
+
msgid "direction"
msgstr "kierunek"
@@ -34710,6 +35038,12 @@ msgstr "Wybierz tylko jeden obiekt"
msgid "Select a map object"
msgstr "Wybierz obiekt mapy"
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index 7197f69..ab563ef 100644
--- a/i18n/po/pt.po
+++ b/i18n/po/pt.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-09-28 11:56+0000\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-17 22:12+0000\n"
"Last-Translator: Rui <xande6ruz at yandex.com>\n"
"Language-Team: Portuguese <pt at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:55+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: pt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3211,24 +3211,6 @@ msgstr "Valor de latitude \"{0}\" incorreto"
msgid "Illegal longitude value ''{0}''"
msgstr "Valor de longitude \"{0}\" incorreto"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Não foi possível criar o diretório que falta da cache: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Não foi possível criar a pasta que falta da cache: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Não foi possível eliminar o ficheiro temporário {0}"
@@ -3314,22 +3296,15 @@ msgstr "Não foi possível carregar o ficheiro de cache padrão: {0}"
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "Estilo de pintura {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Camada: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Estilo de pintura {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Não foi possível manter as preferências em ''{0}''"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Tente ativar a rede IPv6, a preferir o IPv6 em vez de IPv4 (apenas funciona "
-"no início do JOSM)."
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr ""
"A definição {0} das preferências foi removida por não ser mais utilizada."
@@ -3404,7 +3379,7 @@ msgid "E"
msgstr "E"
msgid "Unable to parse as coordinate value: ''{0}''"
-msgstr ""
+msgstr "Não foi possível processar o valor da coordenada: ''{0}''"
msgid "Date of imagery: {0}"
msgstr "Data das imagens aéreas: {0}"
@@ -3472,6 +3447,8 @@ msgstr "Sem camadas definidas pelo documento getCapabilities: {0}"
msgid ""
"WMTS Parser error - start element {0} has different name than end element {2}"
msgstr ""
+"Erro de processamento WMTS - o elemento de início {0} tem um nome diferente "
+"do elemento de fim {2}"
msgid ""
"Can''t use layer {0} because no supported formats where found. Layer is "
@@ -3897,6 +3874,27 @@ msgstr "texto"
msgid "areatext"
msgstr "área_de_texto"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr "Não foi possível criar o diretório das preferências em falta: {0}"
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+"<html>Não foi possível criar o diretório das preferências em falta: "
+"{0}</html>"
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr "Não foi possível criar o diretório dos dados de utilizador: {0}"
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+"<html>Não foi possível criar o diretório dos dados de utilizador: {0}</html>"
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Não foi possível criar o diretório que falta da cache: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Não foi possível criar a pasta que falta da cache: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Era esperado o elemento ''{0}'', mas foi obtido ''{1}''"
@@ -4111,7 +4109,7 @@ msgid "Error: {0}"
msgstr "Erro: {0}"
msgid "JOSM projection command line interface"
-msgstr ""
+msgstr "Interface da linha de comandos da projeção JOSM"
msgid "Description"
msgstr "Descrição"
@@ -4130,10 +4128,10 @@ msgid "Switch input and output crs"
msgstr ""
msgid "Switch order of input coordinates (east/north, lon/lat)"
-msgstr ""
+msgstr "Inverter ordem de coordenadas de entrada (este/norte, lon/lat)"
msgid "Switch order of output coordinates (east/north, lon/lat)"
-msgstr ""
+msgstr "Inverter ordem das coordenadas de saída (este/norte, lon/lat)"
msgid "<crs>"
msgstr ""
@@ -4142,6 +4140,8 @@ msgid ""
"The format for input and output coordinate reference system is similar to "
"that of the PROJ.4 software."
msgstr ""
+"O formato para a entrada e saída do sistema de referências de coordenadas é "
+"similar ao programa PROJ.4"
msgid "[file]"
msgstr "[ficheiro]"
@@ -4571,7 +4571,7 @@ msgid "Area style way is not closed"
msgstr "A linha de área não está fechada"
msgid "No outer way for boundary"
-msgstr ""
+msgstr "Fronteira sem limite exterior"
msgid "No outer way for multipolygon"
msgstr "Multi-polígono sem linha exterior definida na relação"
@@ -4611,6 +4611,9 @@ msgstr "Etiqueta de área na linha de contorno deve estar na relação"
msgid "Multipolygon is not closed"
msgstr "O multi-polígono não está fechado"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4636,7 +4639,7 @@ msgid "No useful role for multipolygon member"
msgstr "Nenhuma função útil no membro do multi-polígono"
msgid "Non-Way in boundary"
-msgstr ""
+msgstr "Elemento não linha em fronteira"
msgid "Non-Way in multipolygon"
msgstr "Não-linha dentro de um multi-polígono"
@@ -4777,11 +4780,15 @@ msgstr "A relação está vazia"
msgid ""
"Role of relation member does not match expression ''{0}'' in template {1}"
msgstr ""
+"A função do membro da relação não corresponde à expressão ''{0}'' no modelo "
+"{1}"
msgid ""
"Type ''{0}'' of relation member with role ''{1}'' does not match accepted "
"types ''{2}'' in template {3}"
msgstr ""
+"O tipo ''{0}'' de função do membro da relação com a função ''{1}'' não "
+"corresponde aos tipos aceites ''{2}'' no modelo {3}"
msgid "<empty>"
msgstr "<vazio>"
@@ -5344,6 +5351,29 @@ msgstr "A carregar preferências de imagens de fundo"
msgid "usage"
msgstr "utilização"
+msgid "commands"
+msgstr "comandos"
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr "lançar JOSM (padrão, feito quando não é especificado nenhum comando)"
+
+msgid "render data and save the result to an image file"
+msgstr "renderizar os dados e gravar o resultado num ficheiro de imagem"
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+"converter as coordenadas de um sistema de referências de coordenadas para "
+"outro"
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+"Para mais informações sobre os comandos {0} e {1}, execute-os com a opção "
+"{2}."
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr "O resto desta página contém informação sobre o comando {0}."
+
msgid "options"
msgstr "opções"
@@ -5465,7 +5495,7 @@ msgid "Make sure you load some data if you use --selection."
msgstr "Tenha a certeza que carrega alguns dados se usar --selection."
msgid "Log level is at {0} ({1}, {2})"
-msgstr ""
+msgstr "O nível de registo está em {0} ({1}, {2})"
msgid "Plugin loading skipped"
msgstr "Carregamento de plug-ins ignorado"
@@ -5482,6 +5512,13 @@ msgstr "Definições de origem"
msgid "Creating main GUI"
msgstr "A criar a Interface de Utilização Gráfica principal"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Tente ativar a rede IPv6, a preferir o IPv6 em vez de IPv4 (apenas funciona "
+"no início do JOSM)."
+
msgid "Updating plugins"
msgstr "A atualizar os módulos"
@@ -5805,6 +5842,9 @@ msgstr "Aumentar"
msgid "Shrink"
msgstr "Diminuir"
+msgid "Show downloaded area"
+msgstr "Mostrar área descarregada"
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -7806,10 +7846,10 @@ msgstr ""
"Remover do painel de detalhes os conjuntos de alterações selecionados"
msgid "Update the changeset from the OSM server"
-msgstr "Atualizar o conjunto de alterações do servidor OSM"
+msgstr "Atualizar o conjunto de alterações do servidor do OpenStreetMap"
msgid "View changeset"
-msgstr ""
+msgstr "Ver conjunto de alterações"
msgid ""
"Select the primitives in the content of this changeset in the current data "
@@ -7852,13 +7892,15 @@ msgid "Download content"
msgstr "Descarregar conteúdo"
msgid "Download the changeset content from the OSM server"
-msgstr "Descarregar o conteúdo do conjunto de alterações do servidor OSM"
+msgstr ""
+"Descarregar o conteúdo do conjunto de alterações do servidor do OpenStreetMap"
msgid "Update content"
msgstr "Atualizar conteúdo"
msgid "Update the changeset content from the OSM server"
-msgstr "Atualiza o conteúdo do conjunto de alterações do servidor OSM"
+msgstr ""
+"Atualiza o conteúdo do conjunto de alterações do servidor do OpenStreetMap"
msgid "Changeset ID: "
msgstr "Identificador do Conjunto de Alterações: "
@@ -8625,7 +8667,7 @@ msgstr "refere-se a"
msgid "Cannot add {0} since it is not part of dataset"
msgstr ""
-"Não foi possível adicionar {0} uma vez que não faz parte do conjunto de dados"
+"Não é possível adicionar {0} uma vez que não faz parte do conjunto de dados"
msgid "Download referring relations"
msgstr "Descarregar relações referentes"
@@ -8836,6 +8878,9 @@ msgstr ""
"<html>A camada ''{0}'' já tem um conflito do objeto<br>''{1}''.<br>Resolva "
"este conflito primeiro e depois tente de novo.</html>"
+msgid "Select the currently edited relation"
+msgstr "Selecionar a relação editada atual"
+
msgid "Select objects for selected relation members"
msgstr "Selecionar objetos para os membros selecionados da relação"
@@ -9479,10 +9524,10 @@ msgid "Open a history browser with the history of this node"
msgstr "Abrir o navegador de históricos com o histórico deste nó"
msgid "View changeset in web browser"
-msgstr ""
+msgstr "Ver conjunto de alterações no navegador"
msgid "Open {0}"
-msgstr ""
+msgstr "Abrir {0}"
msgid "Way {0}"
msgstr "Linha {0}"
@@ -9494,13 +9539,13 @@ msgid "Object"
msgstr "Objeto"
msgid "Open Changeset Manager"
-msgstr ""
+msgstr "Abrir o Gestor de Conjuntos de Alterações"
msgid "Changeset comment"
-msgstr "Comentário do conjunto de dados"
+msgstr "Comentário do conjunto de alterações"
msgid "Changeset source"
-msgstr "Fonte das informações do conjunto de dados"
+msgstr "Fonte das informações do conjunto de alterações"
msgid "Imagery used"
msgstr "Imagens de satélite usadas"
@@ -9671,7 +9716,7 @@ msgstr ""
"diretório indicado."
msgid "I would like someone to review my edits."
-msgstr ""
+msgstr "Gostaria que alguém verificasse as minhas edições."
msgid "Provide a brief comment for the changes you are uploading:"
msgstr "Forneça por favor um comentário breve sobre as alterações que fez:"
@@ -10146,14 +10191,14 @@ msgstr "Preferências"
msgid "Decide how to upload the data and which changeset to use"
msgstr ""
-"Introduza o comentário das alterações no conjunto de dados e veja as "
-"informações gerais"
+"Configurar o comentário, a fonte e ver informações gerais do conjunto de "
+"alterações"
msgid "Tags of new changeset"
msgstr "Etiquetas"
msgid "Apply tags to the changeset data is uploaded to"
-msgstr "Editar manualmente as etiquetas do conjunto de dados"
+msgstr "Editar manualmente as etiquetas do conjunto de alterações"
msgid "Manage open changesets and select a changeset to upload to"
msgstr ""
@@ -10190,7 +10235,8 @@ msgstr ""
"fácil<br />a outros editores."
msgid "Please specify a changeset source"
-msgstr "Por favor especifique a origem das informações no conjunto de dados"
+msgstr ""
+"Por favor especifique a origem das informações do conjunto de alterações"
msgid ""
"You did not specify a source for your changes.<br />It is technically "
@@ -11639,6 +11685,174 @@ msgstr "(o URL era: "
msgid "Select the map painting styles"
msgstr "Selecione os estilos de visualização do mapa"
+msgid "Error - file not found: ''{0}''"
+msgstr "Erro - ficheiro não encontrado: ''{0}''"
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr "Esperado um número inteiro para a opção {0}, mas foi obtido ''{1}''"
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+"Esperado um número inteiro >= 0 para a opção {0}, mas foi obtido ''{1}''"
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr "Não foi possível processar o parâmetro {0} : {1}"
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+"Esperado o valor e chave, separados pelo caractere '':'' para a opção {0}, "
+"mas foi obtido ''{1}''"
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+"Esperadas duas coordenadas, separadas por vírgula, para a opção {0}, mas foi "
+"obtido ''{1}''"
+
+msgid "In option {0}: {1}"
+msgstr "Na opção {0}: {1}"
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+"Esperado um número inteiro > 0 para a opção {0}, mas foi obtido ''{1}''"
+
+msgid "JOSM rendering command line interface"
+msgstr "Interface de linha de comandos da renderização do JOSM"
+
+msgid "Renders data and saves the result to an image file."
+msgstr "Renderiza os dados e grava o resultado num ficheiro de imagem."
+
+msgid "Input data file name (.osm)"
+msgstr "Nome do ficheiro de entrada (.osm)"
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr "Ficheiro de estilo usado para renderização (.mapcss ou .zip)"
+
+msgid "This option can be repeated to load multiple styles."
+msgstr "Esta opção pode ser repetida para carregar vários estilos."
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr "Aplica-se ao último estilo carregado com a opção {0}."
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr "Selecione a escala do mapa"
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+"O valor 10000 equivale à escala 1:10000 (1 cm no mapa equivale a 100 m no "
+"solo; resolução de visualização: 96 dpi)"
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr "As opções {0} e {1} são mutualmente exclusivas."
+
+msgid "Area to render, default value is ''{0}''"
+msgstr "Área a renderizar, o valor padrão é ''{0}''"
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr "Especifique o canto esquerdo inferior da área de renderização."
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+"Usado em combinação com a largura e altura para determinar a área a "
+"renderizar."
+
+msgid "Width of the rendered area, in meter"
+msgstr "Largura da área de renderização, em metros"
+
+msgid "Height of the rendered area, in meter"
+msgstr "Altura da área de renderização, em metros"
+
+msgid "Width of the target image, in pixel"
+msgstr "Largura da imagem alvo, em píxeis"
+
+msgid "Height of the target image, in pixel"
+msgstr "Altura da imagem alvo, em píxeis"
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr "Projeção a usar, o valor padrão é ''{0}'' (web-Mercator)"
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+"Largura/altura máxima da imagem (''{0}'' siginifica sem limite), o valor "
+"padrão é: {1}"
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+"Para especificar a área de renderização e a escala, as opções podem ser "
+"combinadas de várias formas"
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr "Fornecido o argumento {0}, era esperado {1} ou {2}"
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+"Não foi possível determinar a escala, esperada uma das opções {0}, {1}, {2} "
+"ou {3}"
+
+msgid "Missing argument - input data file ({0})"
+msgstr "Argumento em falta - ficheiro de entrada de dados ({0})"
+
+msgid "In .osm data file ''{0}'' - "
+msgstr "No ficheiro de dados .osm ''{0}'' - "
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr "Falta argumento - esperado pelo menos um estilo ({0})"
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+"As dimensões da imagem ({0}x{1}) excedem o tamanho máximo da imagem {2} (use "
+"a opção {3} para alterar o limite)"
+
+msgid "Style setting not found: ''{0}''"
+msgstr "Definição do estilo não econtrada: ''{0}''"
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11667,6 +11881,11 @@ msgstr ""
"Ocorreu um erro ao processar os estilos de visualização do mapa ''{0}''. "
"Erro encontrado: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Não foi possível localizar a imagem ''{0}''"
@@ -15570,6 +15789,20 @@ msgstr "Ignorar camada e continuar"
msgid "expected .jos file inside .joz archive"
msgstr "ficheiro .jos esperado dentro do arquivo .joz"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+"Não foi possível criar o diretório em falta das preferências dos módulos: {0}"
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+"Não foi possível criar o diretório em falta dos dados de utilizador dos "
+"módulos: {0}"
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+"Não foi possível criar o diretório em falta dos ficheiros temporários dos "
+"módulos: {0}"
+
msgid "Skip download"
msgstr "Ignorar descarregamento"
@@ -16450,7 +16683,7 @@ msgstr ""
"''{2}''."
msgid "Unknown territory id: {0}"
-msgstr ""
+msgstr "Identificador desconhecido de território: {0}"
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
@@ -16601,7 +16834,7 @@ msgstr "residencial"
msgctxt "landuse"
msgid "greenfield"
-msgstr "campo com loteamento planeado"
+msgstr "terreno com loteamento planeado"
msgctxt "landuse"
msgid "village_green"
@@ -17167,6 +17400,12 @@ msgstr "Motorizada"
msgid "Motorcar"
msgstr "Automóvel"
+msgid "Minimum age"
+msgstr "Idade mínima"
+
+msgid "Maximum age"
+msgstr "Idade máxima"
+
msgid "Reference"
msgstr "Referência"
@@ -17814,6 +18053,10 @@ msgid "platform"
msgstr "plataforma"
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -17862,6 +18105,42 @@ msgstr "vapor"
msgid "vacuum"
msgstr "vácuo"
+msgid "Material"
+msgstr "Material"
+
+msgid "plastic"
+msgstr "plástico"
+
+msgid "steel"
+msgstr "aço"
+
+msgid "stone"
+msgstr "pedra"
+
+msgid "Location transition"
+msgstr "Local de transição"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Potência nominal (kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Fases"
+
msgid "Max. weight (tonnes)"
msgstr "Peso máximo (toneladas)"
@@ -18810,12 +19089,6 @@ msgstr "Barreiras"
msgid "Block"
msgstr "Bloco (cimento / pedra)"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "pedra"
-
msgid "Bollard"
msgstr "Pilar"
@@ -18828,9 +19101,6 @@ msgstr "pilar automático"
msgid "removable"
msgstr "removível"
-msgid "plastic"
-msgstr "plástico"
-
msgid "Cycle Barrier"
msgstr "Chicana Pedestre"
@@ -19606,6 +19876,12 @@ msgstr "Mistura 1:25 (ciclomotor)"
msgid "1/50 mix (mofa/moped)"
msgstr "Mistura 1:50 (ciclomotor)"
+msgid "Additives:"
+msgstr "Aditivos:"
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr "Cartões de combustível:"
@@ -20317,9 +20593,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Número de écrans"
-msgid "Minimum age"
-msgstr "Idade mínima"
-
msgid "Zoo"
msgstr "Jardim Zoológico"
@@ -22519,24 +22792,6 @@ msgctxt "power"
msgid "industrial"
msgstr "industrial"
-msgid "Power rating (kVA/MVA)"
-msgstr "Potência nominal (kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "Isolado a gás"
@@ -22562,9 +22817,6 @@ msgctxt "power"
msgid "yes"
msgstr "sim"
-msgid "Phases"
-msgstr "Fases"
-
msgid "Power Switchgear"
msgstr ""
@@ -22582,6 +22834,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr "Conversor de energia"
@@ -22683,9 +22954,6 @@ msgstr "tubular"
msgid "solid"
msgstr "sólida"
-msgid "steel"
-msgstr "aço"
-
msgctxt "color"
msgid "red/white"
msgstr "vermelho/branco"
@@ -22848,18 +23116,21 @@ msgstr "Torre tripla"
msgid "Incomplete tower"
msgstr "Torre incompleta"
-msgid "Location transition"
-msgstr "Local de transição"
-
msgid "Pole"
msgstr "Poste"
-msgid "Pole with Transformer"
-msgstr "Poste com Transformador"
+msgid "Pole with Switch"
+msgstr ""
msgid "Pole Attributes:"
msgstr "Atributos do Poste:"
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr "Poste com Transformador"
+
msgid "Transformer Attributes:"
msgstr "Atributos do Transformador:"
@@ -22972,6 +23243,52 @@ msgstr "Campo de Batalha"
msgid "Palaeontological Site"
msgstr "Sítio Paleontológico (Pré-história)"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monumento"
@@ -23749,6 +24066,9 @@ msgstr "Habitação Isolada"
msgid "Suburb"
msgstr "Subúrbio"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "Bairro"
@@ -24112,6 +24432,9 @@ msgstr "Estufa Hortícola"
msgid "Plant Nursery"
msgstr "Viveiro de Plantas"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr "Aquacultura"
@@ -24248,10 +24571,10 @@ msgid "Construction Area"
msgstr "Área em construção"
msgid "Brownfield"
-msgstr "Edifícios industriais em ruínas e contaminados"
+msgstr "Terreno industrial abandonado"
msgid "Greenfield"
-msgstr "Campo com loteamento planeado"
+msgstr "Terreno com loteamento planeado"
msgid "Landfill"
msgstr "Aterro Sanitário / Lixeira"
@@ -24723,11 +25046,21 @@ msgstr "Rotas"
msgid "Bicycle Route"
msgstr "Rota de Ciclismo"
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
-msgstr "nacional"
+msgstr ""
+
+msgctxt "network"
+msgid "regional"
+msgstr ""
+msgctxt "network"
msgid "local"
-msgstr "local"
+msgstr ""
msgid "Mountain Biking Route"
msgstr "Rota de Ciclismo de Montanha"
@@ -24979,6 +25312,9 @@ msgstr "Trilhos GPS no OpenStreetMap"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr "Trilhos GPS públicos enviados para o OpenStreetMap."
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr "Transportes Públicos (ÖPNV)"
@@ -24991,8 +25327,8 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr "Stamen Terrain"
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
-msgstr "Camboja, Laos, Tailândia, Vietname, Mianmar bilingue"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPublicTtransport Map (sobreposição)"
@@ -25070,6 +25406,13 @@ msgstr ""
"Imagens aéreas dos fins do Verão onde as fontes habituais são bastante "
"afetadas por nuvens e neve (cor verdadeira)"
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr "imagico.de imagens OSM para mapear: Montes Transantárticos do Sul"
@@ -25405,6 +25748,9 @@ msgstr "URBIS 2015 imagens aéreas"
msgid "URBIS 2016 aerial imagery"
msgstr "URBIS 2016 imagens aéreas"
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW(allonie) PICC numerical imagery"
@@ -25420,6 +25766,9 @@ msgstr "SPW(allonie) 2012-2013 imagens aéreas"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 imagens aéreas"
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr "TEC linhas de autocarros"
@@ -25737,6 +26086,9 @@ msgstr "BDOrtho IGN"
msgid "Bordeaux - 2012"
msgstr "Bordéus - 2012"
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Cadastro"
@@ -26665,6 +27017,9 @@ msgstr "Fiez Ortofoto 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -26712,11 +27067,11 @@ msgstr "USGS Mapas Topográficos"
msgid "USGS Large Scale Imagery"
msgstr "USGS Imagens de Satélite em Grande Escala"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012 Estradas sobrepostas"
+msgid "TIGER Roads 2012"
+msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "TIGER Estradas Novas e Desalinhadas (2015)"
+msgid "TIGER Roads 2014"
+msgstr ""
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -26724,6 +27079,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcelas"
@@ -26785,6 +27148,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -27736,6 +28102,14 @@ msgstr "{0} numa linha. Deve ser usado num nó."
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} numa linha. Deve ser usado numa relação"
+msgid "node connects highway and building"
+msgstr "nó ligado a uma estrada/rua e edifício"
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr "{0} junto com {1} num nó. Remover {0}."
@@ -27804,14 +28178,6 @@ msgstr ""
"{0} é a etiqueta para a hidrovia linear. Para áreas de água usar antes {1} + "
"{2}."
-msgid "node connects highway and building"
-msgstr "nó ligado a uma estrada/rua e edifício"
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -27865,11 +28231,11 @@ msgstr "valor vazio em separação por ponto e vírgula ''{0}''"
msgid "numerical key"
msgstr "chave numérica"
-msgid "layer tag with + sign"
-msgstr "etiqueta de nível (layer) com o sinal +"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "O valor da etiqueta layer (nível) deve estar entre -5 e 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr "{0} deve ter apenas números com incrementos de .5 opcionalmente"
@@ -31012,6 +31378,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -32950,9 +33319,6 @@ msgstr "Eliminar isto"
msgid "Delete this&older"
msgstr "Eliminar este e os mais antigos"
-msgid "km/h"
-msgstr "km/h"
-
msgid "Track name: "
msgstr "Nome do trilho GPS: "
@@ -34501,6 +34867,9 @@ msgstr "número positivo ou inteiro"
msgid "Speed:"
msgstr "Velocidade:"
+msgid "km/h"
+msgstr "km/h"
+
msgid "direction"
msgstr "direção"
@@ -35784,6 +36153,12 @@ msgstr "Selecione apenas 1 objeto"
msgid "Select a map object"
msgstr "Selecionar um objeto do mapa"
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
@@ -38275,24 +38650,24 @@ msgstr ""
"correspondente"
msgid "Download from Wikosm API"
-msgstr ""
+msgstr "Descarregar da API Wikosm"
msgid ""
"Find places of education at least 2km, and at most 3km from the center of "
"the selection"
-msgstr ""
+msgstr "Encontrar escolas à distância entre 2km a 3km do centro da seleção"
msgid "Show/hide Wikosm snippet list"
-msgstr ""
+msgstr "Mostrar/ocultar favoritos Wikosm"
msgid "help"
-msgstr ""
+msgstr "ajuda"
msgid "Server: "
-msgstr ""
+msgstr "Servidor: "
msgid "Wikidata+OSM server"
-msgstr ""
+msgstr "Wikidata+servidor OSM"
msgid "The Ultimate WMS Super-speed Turbo Challenge II"
msgstr "The Ultimate WMS Super-speed Turbo Challenge II"
diff --git a/i18n/po/pt_BR.po b/i18n/po/pt_BR.po
index cb22daa..e378d72 100644
--- a/i18n/po/pt_BR.po
+++ b/i18n/po/pt_BR.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-09-27 01:35+0000\n"
-"Last-Translator: André Marcelo Alvarenga <andrealvarenga at gmx.net>\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-24 19:40+0000\n"
+"Last-Translator: Nelson A. de Oliveira <naoliv at debian.org>\n"
"Language-Team: Português Brasileiro <gnome-pt_br-list at gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 05:04+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:07+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: pt_BR\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3168,24 +3168,6 @@ msgstr "Valor de latitude ilegal ''{0}''"
msgid "Illegal longitude value ''{0}''"
msgstr "Valor de longitude ilegal ''{0}''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Falha ao criar diretório de cache ausente: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Falha ao criar o diretório de cache que faltava: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Impossível deletar o arquivo temporário {0}"
@@ -3271,22 +3253,15 @@ msgstr "Falha ao ler o cache padrão de arquivos: {0}"
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr "Falha ao deletar o cache padrão defeituoso de arquivos: {0}"
-msgid "Paint style {0}: {1}"
-msgstr "Estilo de pintura {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Camada: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Estilo de pintura {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Falha para manter preferências em ''{0}''"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Tente ativar a rede IPv6, preferindo IPv6 ao IPv4 (funciona somente na "
-"inicialização)."
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr ""
"Configuração {0} das preferências foi removida pois não é mais usada."
@@ -3855,6 +3830,24 @@ msgstr "texto"
msgid "areatext"
msgstr "Área de texto"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Falha ao criar diretório de cache ausente: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Falha ao criar o diretório de cache que faltava: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Elemento esperado ''{0}'', mas obteve ''{1}''"
@@ -4551,6 +4544,9 @@ msgstr "Estilo da área em outra via"
msgid "Multipolygon is not closed"
msgstr "O multipolígono não está fechado"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr "Anéis de multipolígono compartilham nó(s)"
@@ -5266,6 +5262,25 @@ msgstr "Carregando preferências de imagens"
msgid "usage"
msgstr "uso"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "opções"
@@ -5405,6 +5420,13 @@ msgstr "Aplicando padrão"
msgid "Creating main GUI"
msgstr "Criando tela principal"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Tente ativar a rede IPv6, preferindo IPv6 ao IPv4 (funciona somente na "
+"inicialização)."
+
msgid "Updating plugins"
msgstr "Atualizando plugins"
@@ -5725,6 +5747,9 @@ msgstr "Ampliar"
msgid "Shrink"
msgstr "Reduzir"
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8727,6 +8752,9 @@ msgstr ""
"<html>Camada ''{0}'' já tem um conflito de objeto<br> ''{1}''.<br> Favor "
"resolver este conflito primeiro, em seguida, tente novamente. </html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
"Manter na Seleção apenas os objetos que fazem referência a membros "
@@ -11485,6 +11513,156 @@ msgstr "(A URL era: "
msgid "Select the map painting styles"
msgstr "Selecione os estilos de pintura do mapa"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11507,6 +11685,11 @@ msgstr "Falha ao carregar estilos Mappaint de ''{0}''. A exceção foi: {1}"
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Falha ao analisar estilos Mappaint de ''{0}''. Erro foi: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Falha ao localizar imagem ''{0}''"
@@ -15334,6 +15517,15 @@ msgstr "Ignorar camada e continuar"
msgid "expected .jos file inside .joz archive"
msgstr "esperado arquivo .jos dentro do arquivo .joz"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Pular o download"
@@ -16919,6 +17111,12 @@ msgstr "Motocicleta"
msgid "Motorcar"
msgstr "Automóvel"
+msgid "Minimum age"
+msgstr "Idade mínima"
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Referência"
@@ -17566,6 +17764,10 @@ msgid "platform"
msgstr "plataforma"
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr "kiosk"
@@ -17614,6 +17816,42 @@ msgstr "vapor"
msgid "vacuum"
msgstr "vácuo"
+msgid "Material"
+msgstr "Material"
+
+msgid "plastic"
+msgstr "plástico"
+
+msgid "steel"
+msgstr "aço"
+
+msgid "stone"
+msgstr "rocha"
+
+msgid "Location transition"
+msgstr "Localização transitória"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Potência (kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Fases"
+
msgid "Max. weight (tonnes)"
msgstr "Peso máximo (toneladas)"
@@ -18563,12 +18801,6 @@ msgstr "Barreiras"
msgid "Block"
msgstr "Bloco"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "rocha"
-
msgid "Bollard"
msgstr "Pilar"
@@ -18581,9 +18813,6 @@ msgstr "automático"
msgid "removable"
msgstr "removível"
-msgid "plastic"
-msgstr "plástico"
-
msgid "Cycle Barrier"
msgstr "Barreira para bicicletas"
@@ -19359,6 +19588,12 @@ msgstr "1/25 mix (mofa/moped)"
msgid "1/50 mix (mofa/moped)"
msgstr "1/50 mix (mofa/moped)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr "Fuel cards:"
@@ -20071,9 +20306,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Quantidade de telas"
-msgid "Minimum age"
-msgstr "Idade mínima"
-
msgid "Zoo"
msgstr "Zoológico"
@@ -22269,24 +22501,6 @@ msgctxt "power"
msgid "industrial"
msgstr "industrial"
-msgid "Power rating (kVA/MVA)"
-msgstr "Potência (kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "Isolado a gás"
@@ -22312,9 +22526,6 @@ msgctxt "power"
msgid "yes"
msgstr "sim"
-msgid "Phases"
-msgstr "Fases"
-
msgid "Power Switchgear"
msgstr "Comutação de energia"
@@ -22334,6 +22545,25 @@ msgstr "Power Bay"
msgid "Power Switch"
msgstr "Interruptor de alimentação"
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr "Conversor de energia"
@@ -22435,9 +22665,6 @@ msgstr "tubular"
msgid "solid"
msgstr "sólido"
-msgid "steel"
-msgstr "aço"
-
msgctxt "color"
msgid "red/white"
msgstr "Vermelho/branco"
@@ -22600,18 +22827,21 @@ msgstr "Torre tripla"
msgid "Incomplete tower"
msgstr "torre incompleta"
-msgid "Location transition"
-msgstr "Localização transitória"
-
msgid "Pole"
msgstr "Poste"
-msgid "Pole with Transformer"
-msgstr "Poste com transformador"
+msgid "Pole with Switch"
+msgstr ""
msgid "Pole Attributes:"
msgstr "Atributos do poste:"
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr "Poste com transformador"
+
msgid "Transformer Attributes:"
msgstr "Atributos do transformador:"
@@ -22724,6 +22954,52 @@ msgstr "Campo de Batalha"
msgid "Palaeontological Site"
msgstr "Sítio paleontológico"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monumento"
@@ -23501,6 +23777,9 @@ msgstr "Moradia isolada"
msgid "Suburb"
msgstr "Bairro"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "Vizinhança"
@@ -23868,6 +24147,9 @@ msgstr "Estufa de horticultura"
msgid "Plant Nursery"
msgstr "Viveiro de plantas"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr "Aquicultura"
@@ -24478,11 +24760,21 @@ msgstr "Rotas"
msgid "Bicycle Route"
msgstr "Rota de bicicleta"
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
-msgstr "nacional"
+msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
-msgstr "local"
+msgstr ""
msgid "Mountain Biking Route"
msgstr "Rota de Mountain Biking"
@@ -24724,6 +25016,9 @@ msgstr "OpenStreetMap GPS Traces"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr "Transportes Públicos (ÖPNV)"
@@ -24736,7 +25031,7 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -24813,6 +25108,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -25139,6 +25441,9 @@ msgstr "URBIS 2015 aerial imagery"
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW(allonie) PICC numerical imagery"
@@ -25154,6 +25459,9 @@ msgstr "SPW(allonie) 2012-2013 aerial imagery"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 aerial imagery"
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -25458,6 +25766,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Cadastro"
@@ -26384,6 +26695,9 @@ msgstr "Fiez Orthophoto 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -26431,11 +26745,11 @@ msgstr "USGS Topographic Maps"
msgid "USGS Large Scale Imagery"
msgstr "USGS Large Scale Imagery"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
+msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
+msgstr ""
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -26443,6 +26757,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
@@ -26504,6 +26826,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -27456,6 +27781,14 @@ msgstr "{0} em uma linha. Deveria ser usado em um ponto."
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} em uma via. Deveria ser utilizado em uma relação"
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -27481,7 +27814,7 @@ msgid "Overlapping Identical Landuses"
msgstr "Sobreposição de landuses idênticos"
msgid "isolated node which must be connected to a way"
-msgstr ""
+msgstr "nó isolado deve estar conectado em um caminho"
msgid "node connects waterway and bridge"
msgstr "pontos conectam via aquática e ponte"
@@ -27522,14 +27855,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -27581,11 +27906,11 @@ msgstr "valor vazio no separados por ponto e vírgula ''{0}''"
msgid "numerical key"
msgstr "chave númerica"
-msgid "layer tag with + sign"
-msgstr "tag da camada com sinal +"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "camada deve estar entre -5 e 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr ""
@@ -30653,6 +30978,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -32586,9 +32914,6 @@ msgstr "Excluir isso"
msgid "Delete this&older"
msgstr "Apagar esta&mais velha"
-msgid "km/h"
-msgstr "km/h"
-
msgid "Track name: "
msgstr "Nome da trilha: "
@@ -34121,6 +34446,9 @@ msgstr "número positivo ou vazio"
msgid "Speed:"
msgstr "Velocidade:"
+msgid "km/h"
+msgstr "km/h"
+
msgid "direction"
msgstr "direção"
@@ -35393,6 +35721,12 @@ msgstr "Selecione apenas um objeto"
msgid "Select a map object"
msgstr "Selecione um objeto de mapa"
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/rm.po b/i18n/po/rm.po
index d4d62c9..eb7de3e 100644
--- a/i18n/po/rm.po
+++ b/i18n/po/rm.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2009-06-21 19:14+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Raeto-Romance <rm at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n !=1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:56+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/ro.po b/i18n/po/ro.po
index e64e4d2..d6c04eb 100644
--- a/i18n/po/ro.po
+++ b/i18n/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JOSM\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2015-02-24 11:34+0000\n"
"Last-Translator: Ciprian <c1pr1an_43v3r at yahoo.com>\n"
"Language-Team: Romanian <gnomero-list at lists.sourceforge.net>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
"== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:56+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"X-Poedit-Country: ROMANIA\n"
"Language: ro\n"
"X-Poedit-Language: Romanian\n"
@@ -2963,24 +2963,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3047,18 +3029,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr "Strat: {0}"
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3574,6 +3551,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4242,6 +4237,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4929,6 +4927,25 @@ msgstr "Încărcarea preferințelor pentru fundal"
msgid "usage"
msgstr "utilizare"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "opţiuni"
@@ -5056,6 +5073,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr "Se creează interfața grafică"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5353,6 +5375,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8096,6 +8121,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10586,6 +10614,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10604,6 +10782,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14028,6 +14211,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15402,6 +15594,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -16045,6 +16243,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16093,6 +16295,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -17019,12 +17257,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -17037,9 +17269,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17811,6 +18040,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18520,9 +18755,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20718,24 +20950,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20761,9 +20975,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20781,6 +20992,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20882,9 +21112,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21047,18 +21274,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21171,6 +21401,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21948,6 +22224,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22296,6 +22575,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22901,9 +23183,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23147,6 +23439,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23159,7 +23454,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23236,6 +23531,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23562,6 +23864,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23577,6 +23882,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23881,6 +24189,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24804,6 +25115,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24851,10 +25165,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24863,6 +25177,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24924,6 +25246,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25863,6 +26188,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25929,14 +26262,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25987,10 +26312,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28750,6 +29075,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30552,9 +30880,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31988,6 +32313,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33223,6 +33551,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/ru.po b/i18n/po/ru.po
index d080de4..4225d74 100644
--- a/i18n/po/ru.po
+++ b/i18n/po/ru.po
@@ -7,17 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-10-02 08:06+0000\n"
-"Last-Translator: Aleksey Kabanov <Unknown>\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-28 06:48+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"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-10-03 04:34+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: ru_RU\n"
msgid "Use OAuth"
@@ -3237,27 +3237,6 @@ msgstr "Неправильное значение широты ''{0}''"
msgid "Illegal longitude value ''{0}''"
msgstr "Неправильное значение долготы ''{0}''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr "Не удалось создать отсутсвовавший каталог настроек: {0}"
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-"<html>Не удалось создать отсутствовавший каталог настроек: {0}</html>"
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr "Не удалось создать отсутствовавший каталог данных пользователя: {0}"
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-"<html>Не удалось создать отсутствовавший каталог данных пользователя: "
-"{0}</html>"
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Не удалось создать отсутствующий каталог кэша: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Невозможно создать каталог для временных данных: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Не удалось удалить временный файл {0}"
@@ -3340,22 +3319,15 @@ msgstr "Не удалось загрузить файл кэша настрое
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr "Не удалось удалить повреждённый файл кэша настроек по умолчанию: {0}"
-msgid "Paint style {0}: {1}"
-msgstr "Стиль рисования {0}:{1}"
-
msgid "Layer: {0}"
msgstr "Слой: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Стиль рисования {0}:{1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Не удалось сохранить настройки в ''{0}''"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Пытаться использовать сеть IPv6, предпочитая IPv6 вместо IPv4 (работает "
-"только в начале запуска)."
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr "Настройка {0} была удалена, так как она больше не используется."
@@ -3913,6 +3885,27 @@ msgstr "текст"
msgid "areatext"
msgstr "для_текста"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr "Не удалось создать отсутсвовавший каталог настроек: {0}"
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+"<html>Не удалось создать отсутствовавший каталог настроек: {0}</html>"
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr "Не удалось создать отсутствовавший каталог данных пользователя: {0}"
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+"<html>Не удалось создать отсутствовавший каталог данных пользователя: "
+"{0}</html>"
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Не удалось создать отсутствующий каталог кэша: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Невозможно создать каталог для временных данных: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Ожидался элемент ''{0}'', а получен ''{1}''"
@@ -4117,7 +4110,7 @@ msgid "Error: {0}"
msgstr "Ошибка: {0}"
msgid "JOSM projection command line interface"
-msgstr ""
+msgstr "Интерфейс командной строки JOSM для управления проекциями"
msgid "Description"
msgstr "Описание"
@@ -4616,6 +4609,9 @@ msgstr "Стиль области на внешней линии"
msgid "Multipolygon is not closed"
msgstr "Мультиполигон не замкнут"
+msgid "Self-intersecting polygon ring"
+msgstr "Самопересекающийся контур полигона"
+
msgid "Multipolygon rings share node(s)"
msgstr "Контуры мультиполигона имеют общие точки"
@@ -5328,6 +5324,27 @@ msgstr "Загрузка настроек изображения"
msgid "usage"
msgstr "использование"
+msgid "commands"
+msgstr "команды"
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr "запускает JOSM (по умолчанию, выполняется, если команда не указана)"
+
+msgid "render data and save the result to an image file"
+msgstr "отрисовывает данные и сохраняет результат в файл изображения"
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr "преобразует координаты из одной системы координат в другую"
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+"Для подробной информации о командах {0} и {1} укажите их при запуске с "
+"опцией {2}."
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr "Оставшаяся часть этой справочной страницы документирует команду {0}."
+
msgid "options"
msgstr "опции"
@@ -5468,6 +5485,13 @@ msgstr "Настройки по умолчанию"
msgid "Creating main GUI"
msgstr "Создание интерфейса"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Пытаться использовать сеть IPv6, предпочитая IPv6 вместо IPv4 (работает "
+"только в начале запуска)."
+
msgid "Updating plugins"
msgstr "Обновление модулей"
@@ -5795,6 +5819,9 @@ msgstr "Расширить"
msgid "Shrink"
msgstr "Сжать"
+msgid "Show downloaded area"
+msgstr "Показать скачанные области"
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8818,6 +8845,9 @@ msgstr ""
"<br>''{1}''.<br>Пожалуйста, сначала уладьте этот конфликт, затем попытайтесь "
"снова.</html>"
+msgid "Select the currently edited relation"
+msgstr "Выделить текущее редактируемое отношение"
+
msgid "Select objects for selected relation members"
msgstr "Выделить объекты для выбранных участников отношения"
@@ -11657,6 +11687,185 @@ msgstr "(по ссылке: "
msgid "Select the map painting styles"
msgstr "Выберите стили отрисовки карты"
+msgid "Error - file not found: ''{0}''"
+msgstr "Ошибка - файл не найден: ''{0}''"
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr "Ожидалось целое число для параметра ''{0}'', получено ''{1}''"
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr "Ожидалось целое число >= 0 для параметра ''{0}'', получено ''{1}''"
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr "Не удалось разобрать параметр {0}: {1}"
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+"Ожидались ключ и значение, разделённые символом '':'', для параметра "
+"''{0}'', получено ''{1}''"
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+"Ожидалось число с плавающей запятой для параметра ''{0}'', получено ''{1}''"
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+"Ожидались две координаты, разделённые запятой, для параметра ''{0}'', "
+"получено ''{1}''"
+
+msgid "In option {0}: {1}"
+msgstr "В опции {0}: {1}"
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+"Ожидалось число с плавающей запятой > 0 для параметра ''{0}'', получено "
+"''{1}''"
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr "Ожидалось целое число > 0 для параметра ''{0}'', получено ''{1}''"
+
+msgid "JOSM rendering command line interface"
+msgstr "Интерфейс командной строки JOSM для управления отрисовкой"
+
+msgid "Renders data and saves the result to an image file."
+msgstr "Отрисовывает данные и сохраняет результат в файл изображения."
+
+msgid "Input data file name (.osm)"
+msgstr "Имя входного файла данных (.osm)"
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr "Имя выходного графического файла (.png); по умолчанию ''{0}''"
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr "Стиль, используемый для отрисовки (.mapcss или .zip)"
+
+msgid "This option can be repeated to load multiple styles."
+msgstr "Эту опцию можно повторять для загрузки нескольких стилей."
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+"Настройки стиля (в JOSM доступны в контекстном меню диалога со списком "
+"стилей по щелчку правой кнопкой)"
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr "Применяются к последнему стилю, загруженному с помощью опции {0}."
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+"Выберите масштаб для рендеринга. (целое значение, 0 = вся Земля, 18 = "
+"уровень улицы)"
+
+msgid "Select the map scale"
+msgstr "Выбор масштаба карты"
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+"Значение 10000 означает масштаб 1:10000 (1 см карты равен 100 м на "
+"местности; разрешение дисплея: 96 dpi)"
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr "Взаимоисключающие параметры {0} и {1}."
+
+msgid "Area to render, default value is ''{0}''"
+msgstr "Область для отрисовки, значение по умолчанию: ''{0}''"
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+"С ключевым словом ''{0}'' будет использоваться скачанная область из входного "
+"файла .osm (если записана)."
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr "Указать нижний левый угол области отрисовки"
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+"Используется в комбинации с опциями width и height для определения области "
+"отрисовки."
+
+msgid "Width of the rendered area, in meter"
+msgstr "Ширина области отрисовки в метрах"
+
+msgid "Height of the rendered area, in meter"
+msgstr "Высота области отрисовки в метрах"
+
+msgid "Width of the target image, in pixel"
+msgstr "Ширина целевого изображения, в пикселях"
+
+msgid "Height of the target image, in pixel"
+msgstr "Высота целевого изображения, в пикселях"
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr "Проекция, по умолчанию ''{0}'' (web-Mercator)"
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+"Максимальная ширина/высота изображения в пикселях (''{0}'' - без "
+"ограничения), по умолчанию: {1}"
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+"Для указания отрисовываемой области и масштаба опции можно комбинировать "
+"разными способами"
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+"Если не заданы ни ''{0}'', ни ''{1}'', то вступает в силу значение по "
+"умолчанию {2}, и за границы отрисовываемой области принимается скачанная "
+"область во входном файле .osm."
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+"Аргумент {0} задан, но масштаб невозможно определить по остальным аргументам"
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr "Задан аргумент {0}, ожидались {1} или {2}"
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+"Используется режим {0}, но во входном файле данных .osm границы не найдены"
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+"Невозможно определить масштаб, ожидалась одна из опций {0}, {1}, {2} или {3}"
+
+msgid "Missing argument - input data file ({0})"
+msgstr "Пропущен аргумент - входной файл данных ({0})"
+
+msgid "In .osm data file ''{0}'' - "
+msgstr "В файле данных .osm ''{0}'' - "
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr "Пропущен аргумент - ожидался по крайней мере один стиль ({0})"
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+"Размер изображения ({0}x{1}) превышает максимальный размер {2} (используйте "
+"параметр {3} чтобы изменить лимит)"
+
+msgid "Style setting not found: ''{0}''"
+msgstr "Настройки стиля не найдены: ''{0}''"
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11682,6 +11891,11 @@ msgstr "Не удалось загрузить стили Mappaint из ''{0}''.
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Не удалось выполнить разбор стилей Mappaint из ''{0}''. Ошибка: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Не удалось найти изображение «{0}»"
@@ -15502,6 +15716,17 @@ msgstr "Пропустить слой и продолжить"
msgid "expected .jos file inside .joz archive"
msgstr "ожидался .jos файл в .joz архиве"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr "Не удалось создать отсутствовавший каталог настроек модуля: {0}"
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+"Не удалось создать отсутствовавший каталог пользовательских данных модуля: "
+"{0}"
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr "Не удалось создать отсутствовавший каталог кэша модуля: {0}"
+
msgid "Skip download"
msgstr "Пропустить скачивание"
@@ -17122,6 +17347,12 @@ msgstr "Мотоцикл"
msgid "Motorcar"
msgstr "Автомобиль"
+msgid "Minimum age"
+msgstr "Минимальный возраст"
+
+msgid "Maximum age"
+msgstr "Максимальный возраст"
+
msgid "Reference"
msgstr "Обозначение (ref)"
@@ -17769,6 +18000,10 @@ msgid "platform"
msgstr "платформа"
msgctxt "power"
+msgid "rooftop"
+msgstr "на крыше"
+
+msgctxt "power"
msgid "kiosk"
msgstr "будка"
@@ -17817,6 +18052,42 @@ msgstr "пар"
msgid "vacuum"
msgstr "вакуум"
+msgid "Material"
+msgstr "Материал"
+
+msgid "plastic"
+msgstr "пластик"
+
+msgid "steel"
+msgstr "сталь"
+
+msgid "stone"
+msgstr "камень"
+
+msgid "Location transition"
+msgstr "Изменение расположения"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Номинальная мощность (кВА/МВА)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Количество фаз"
+
msgid "Max. weight (tonnes)"
msgstr "Макс. масса (в тоннах)"
@@ -18766,12 +19037,6 @@ msgstr "Преграды"
msgid "Block"
msgstr "Бетонный блок"
-msgid "Material"
-msgstr "Материал"
-
-msgid "stone"
-msgstr "камень"
-
msgid "Bollard"
msgstr "Столбик"
@@ -18784,9 +19049,6 @@ msgstr "поднимающийся"
msgid "removable"
msgstr "удаляемый"
-msgid "plastic"
-msgstr "пластик"
-
msgid "Cycle Barrier"
msgstr "Преграда для велосипедов"
@@ -19563,6 +19825,12 @@ msgstr "топливная смесь 1/25 (для мопедов)"
msgid "1/50 mix (mofa/moped)"
msgstr "топливная смесь 1/50 (для мопедов)"
+msgid "Additives:"
+msgstr "Добавки:"
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr "Реагент для очистки выхлопов дизелей (AdBlue/AUS32)"
+
msgid "Fuel cards:"
msgstr "Топливные карты:"
@@ -20274,9 +20542,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Число экранов"
-msgid "Minimum age"
-msgstr "Минимальный возраст"
-
msgid "Zoo"
msgstr "Зоопарк"
@@ -22472,24 +22737,6 @@ msgctxt "power"
msgid "industrial"
msgstr "промышленная"
-msgid "Power rating (kVA/MVA)"
-msgstr "Номинальная мощность (кВА/МВА)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "С элегазовой изоляцией"
@@ -22515,9 +22762,6 @@ msgctxt "power"
msgid "yes"
msgstr "да"
-msgid "Phases"
-msgstr "Количество фаз"
-
msgid "Power Switchgear"
msgstr "Распределительное устройство"
@@ -22537,6 +22781,25 @@ msgstr "Ячейка"
msgid "Power Switch"
msgstr "Разъединитель"
+msgid "Type of switch"
+msgstr "Тип разъединителя"
+
+msgctxt "power"
+msgid "mechanical"
+msgstr "механический выключатель"
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr "автоматический выключатель"
+
+msgctxt "power"
+msgid "disconnector"
+msgstr "разъединитель"
+
+msgctxt "power"
+msgid "earthing"
+msgstr "заземлитель"
+
msgid "Power Converter"
msgstr "Преобразователь"
@@ -22638,9 +22901,6 @@ msgstr "трубчатая"
msgid "solid"
msgstr "сплошная"
-msgid "steel"
-msgstr "сталь"
-
msgctxt "color"
msgid "red/white"
msgstr "красно-белая"
@@ -22803,18 +23063,21 @@ msgstr "Тройная опора"
msgid "Incomplete tower"
msgstr "Неполная опора"
-msgid "Location transition"
-msgstr "Изменение расположения"
-
msgid "Pole"
msgstr "Столб"
-msgid "Pole with Transformer"
-msgstr "Столб с трансформатором"
+msgid "Pole with Switch"
+msgstr "Столб с разъединителем"
msgid "Pole Attributes:"
msgstr "Свойства столба:"
+msgid "Switch Attributes:"
+msgstr "Характеристики разъединителя:"
+
+msgid "Pole with Transformer"
+msgstr "Столб с трансформатором"
+
msgid "Transformer Attributes:"
msgstr "Свойства трансформатора:"
@@ -22927,6 +23190,52 @@ msgstr "Поле битвы"
msgid "Palaeontological Site"
msgstr "Палеонтологические раскопки"
+msgid "Grave"
+msgstr "Могила"
+
+msgid "Tomb"
+msgstr "Гробница"
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr "курган"
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr "высеченная в скале"
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr "гипогей"
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr "братская могила"
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr "мавзолей"
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr "колумбарий"
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr "крипта"
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr "пирамида"
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr "саркофаг"
+
+msgctxt "tomb"
+msgid "vault"
+msgstr "склеп"
+
msgid "Monument"
msgstr "Монумент"
@@ -23704,6 +24013,9 @@ msgstr "Изолированное жилье"
msgid "Suburb"
msgstr "Пригород"
+msgid "Quarter"
+msgstr "Квартал"
+
msgid "Neighbourhood"
msgstr "Микрорайон"
@@ -24068,6 +24380,9 @@ msgstr "Парниковое садоводство"
msgid "Plant Nursery"
msgstr "Питомник растений"
+msgid "Salt Pond"
+msgstr "Соляной пруд"
+
msgid "Aquaculture"
msgstr "Аквакультура"
@@ -24677,9 +24992,19 @@ msgstr "Маршруты"
msgid "Bicycle Route"
msgstr "Велосипедный маршрут"
+msgctxt "network"
+msgid "international"
+msgstr "международная"
+
+msgctxt "network"
msgid "national"
msgstr "национальная"
+msgctxt "network"
+msgid "regional"
+msgstr "региональная"
+
+msgctxt "network"
msgid "local"
msgstr "локальная"
@@ -24931,6 +25256,9 @@ msgstr "GPS-треки OpenStreetMap"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr "Общедоступные GPS-треки, загруженные на OpenStreetMap."
+msgid "OpenTopoMap"
+msgstr "OpenTopoMap"
+
msgid "Public Transport (ÖPNV)"
msgstr "Общественный транспорт (ÖPNV)"
@@ -24943,8 +25271,8 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr "Рельеф от Stamen"
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
-msgstr "Камбоджа, Лаос, Таиланд, Вьетнам, Мьянма (двуязычная)"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
+msgstr "Камбоджа, Лаос, Таиланд, Вьетнам, Малайзия, Мьянма (двуязычная)"
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (оверлей)"
@@ -25022,6 +25350,13 @@ msgstr ""
"Снимки конца лета, когда обычные источники сильно ограничены облаками и "
"снегом (естественные цвета)"
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr "Тирана (Геопортал Open Labs)"
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr "Дороги и здания Тираны, размещённые на геопортале Open Labs"
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr "Снимки с imagico.de: «Южные» Трансантарктические горы"
@@ -25356,6 +25691,9 @@ msgstr "URBIS 2015 - аэрофотосъёмка"
msgid "URBIS 2016 aerial imagery"
msgstr "URBIS 2016 - аэрофотосъёмка"
+msgid "URBIS 2017 aerial imagery"
+msgstr "Аэрофото URBIS 2017"
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW(allonie) цифровое изображение PICC"
@@ -25371,6 +25709,9 @@ msgstr "SPW(allonie) 2012-2013 аэрофотосъёмка"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 аэрофотосъёмка"
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr "Автобусные маршруты TEC"
@@ -25691,6 +26032,9 @@ msgstr "BDOrtho IGN"
msgid "Bordeaux - 2012"
msgstr "Бордо - 2012"
+msgid "Bordeaux - 2016"
+msgstr "Бордо - 2016"
+
msgid "Cadastre"
msgstr "Кадастр"
@@ -26665,6 +27009,9 @@ msgstr "Фиез - ортофото 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr "Кантон Базель-Штадт 2015"
+msgid "Kanton Basel-Stadt 2017"
+msgstr "Кантон Базель-Штадт 2017"
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr "Кантон Базель - ландшафт 10см (2015)"
@@ -26716,11 +27063,11 @@ msgstr "USGS Топографические карты"
msgid "USGS Large Scale Imagery"
msgstr "USGS: крупномасштабные снимки"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012 - оверлей дорог"
+msgid "TIGER Roads 2012"
+msgstr "Дороги TIGER 2012"
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "Новые и невыровненные дороги TIGER (2015)"
+msgid "TIGER Roads 2014"
+msgstr "Дороги TIGER 2014"
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -26731,6 +27078,16 @@ msgstr ""
"более низких масштабах - только изменения с 2006, кроме уже включёных в "
"OpenStreetMap"
+msgid "TIGER Roads 2017"
+msgstr "Дороги TIGER 2017"
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+"Желтый = общедоступные (public domain) карты из переписи населения США. "
+"Красный = данные не найдены в OpenStreetMap"
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
@@ -26802,6 +27159,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr "Метрополитенский ареал Сан-Хуан: ортосъёмка 2013 USACE"
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr "PR/USVI 2017 NOAA Снимки урагана «Мария»"
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr "Округ Сан-Хуан (Вашингтон) - аэрофотосъёмка 2013"
@@ -27936,6 +28296,16 @@ msgstr "{0} на линии. Следует использовать на точ
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} на линии. Должен использоваться в отношении"
+msgid "node connects highway and building"
+msgstr "точка соединяет дорогу и здание"
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+"Объект с позицией 0.00E 0.00N. В этом месте нет ничего, кроме уже "
+"обозначенного метеорологического буя."
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr "{0} совместно с {1} на точке. Удалите {0}."
@@ -28008,16 +28378,6 @@ msgstr ""
"{0} – тег для линейных водных объектов. Для обозначения площадных водоёмов "
"используйте {1} + {2}."
-msgid "node connects highway and building"
-msgstr "точка соединяет дорогу и здание"
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-"Объект с позицией 0.00E 0.00N. В этом месте нет ничего, кроме уже "
-"обозначенного метеорологического буя."
-
msgid "Ferry route is not connected to the road network or branches."
msgstr "Паромный маршрут не связан с дорожной сетью или ответвлениями."
@@ -28071,11 +28431,11 @@ msgstr "пустое значение в разделённом точками
msgid "numerical key"
msgstr "числовой ключ"
-msgid "layer tag with + sign"
-msgstr "тег layer со знаком +"
+msgid "{0} value with + sign"
+msgstr "{0} значение со знаком +"
-msgid "layer should be between -5 and 5"
-msgstr "уровень должен быть от -5 до 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr "{0} должно быть целым числом между -5 и 5"
msgid "{0} should have numbers only with optional .5 increments"
msgstr "значения {0} должны быть только числами с необязательным шагом 0.5"
@@ -31152,19 +31512,19 @@ msgid "Add \"source=...\" to elements?"
msgstr "Добавить \"source=...\" к элементам?"
msgid "Download from Cadastre"
-msgstr ""
+msgstr "Скачать из кадастра"
msgid "Objects:"
msgstr "Объекты:"
msgid "Select to download buildings in the selected download area."
-msgstr ""
+msgstr "Выберите для скачивания зданий в выделенной области загрузки."
msgid "address"
msgstr "адрес"
msgid "Select to download addresses in the selected download area."
-msgstr ""
+msgstr "Выберите для скачивания адресов в выделенной области загрузки."
msgid "symbol"
msgstr "символ"
@@ -31174,12 +31534,14 @@ msgstr ""
msgid "Select to download water bodies in the selected download area."
msgstr ""
+"Выберите для скачивания водных объектов в выделенной области загрузки."
msgid "parcel"
msgstr "участок"
msgid "Select to download cadastral parcels in the selected download area."
msgstr ""
+"Выберите для скачивания кадастровых участков в выделенной области загрузки."
msgid "parcel number"
msgstr "номер участка"
@@ -31187,6 +31549,8 @@ msgstr "номер участка"
msgid ""
"Select to download cadastral parcel numbers in the selected download area."
msgstr ""
+"Выберите для скачивания номеров кадастровых участков в выделенной области "
+"загрузки."
msgid "section"
msgstr "раздел"
@@ -31206,12 +31570,17 @@ msgstr "коммуна"
msgid ""
"Select to download municipality boundary in the selected download area."
msgstr ""
+"Выберите для скачивания границ муниципальных образований в выделенной "
+"области загрузки."
msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
"<html>Ничего не выбрано.<br>Выберите что-нибудь для скачивания.</html>"
+msgid "Download cadastre data"
+msgstr "Скачать данные кадастра"
+
msgid "Recipient"
msgstr ""
@@ -31219,7 +31588,7 @@ msgid "Diffusion restriction"
msgstr ""
msgid "Cadastre Edigeo files"
-msgstr ""
+msgstr "Файлы кадастра Edigeo"
msgid "Replace original background by JOSM background color."
msgstr "Поменять оригинальный фон на цвет фона JOSM."
@@ -31951,7 +32320,7 @@ msgid "Distance"
msgstr "Расстояние"
msgid "Standard"
-msgstr ""
+msgstr "Стандартное"
msgid "Centroid"
msgstr "Центроид"
@@ -33150,9 +33519,6 @@ msgstr "Удалить его"
msgid "Delete this&older"
msgstr "Удалить его и старше"
-msgid "km/h"
-msgstr "км/ч"
-
msgid "Track name: "
msgstr "Имя трека: "
@@ -34689,6 +35055,9 @@ msgstr "положительное число или пустое"
msgid "Speed:"
msgstr "Скорость:"
+msgid "km/h"
+msgstr "км/ч"
+
msgid "direction"
msgstr "направление"
@@ -35981,6 +36350,12 @@ msgstr "Выделите только один объект"
msgid "Select a map object"
msgstr "Выделите объект карты"
+msgid "Please enter minimal distance in metres"
+msgstr "Введите минимальное расстояние в метрах"
+
+msgid "Please enter numeric angle in degrees"
+msgstr "Введите угол в градусах"
+
msgid "Shape actions panel"
msgstr "Панель действий с формами"
diff --git a/i18n/po/sk.po b/i18n/po/sk.po
index 7845c97..6eb95fc 100644
--- a/i18n/po/sk.po
+++ b/i18n/po/sk.po
@@ -9,16 +9,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-09-27 15:47+0000\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-28 17:30+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: 2017-09-30 04:58+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:01+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: sk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3190,28 +3190,6 @@ msgstr "Chybná hodnota zemepisnej šírky ''{0}''"
msgid "Illegal longitude value ''{0}''"
msgstr "Chybná hodnota zemepisnej dĺžky ''{0}''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr "Nepodarilo sa vytvoriť chýbajúci priečinok pre nastavenia: {0}"
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-"<html>Nepodarilo sa vytvoriť chýbajúci priečinok pre nastavenia: {0}</html>"
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-"Nepodarilo sa vytvoriť chýbajúci priečinok pre používateľské dáta: {0}"
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-"<html>Nepodarilo sa vytvoriť chýbajúci priečinok pre používateľské dáta: "
-"{0}</html>"
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Nepodarilo sa vytvoriť chýbajúci cache adresár: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Nepodarilo sa vytvoriť chýbajúci adresár zásobníka: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Nepodarilo sa odstrániť dočasný súbor {0}"
@@ -3296,22 +3274,15 @@ msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
"Nepodarilo sa vymazať chybný súbor vyrovanávacej pamäte nastavení: {0}"
-msgid "Paint style {0}: {1}"
-msgstr "Farebný štýl {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Vrstva: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Farebný štýl {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Nepodarilo sa uložiť preferencie do \"{0}\""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Pokúsiť sa zapnúť sieť IPv6, prednostne použiť IPv6 pred IPv4 (funguje len "
-"skoro po štarte)."
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr ""
"Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná."
@@ -3885,6 +3856,28 @@ msgstr "text"
msgid "areatext"
msgstr "oblasť textu"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr "Nepodarilo sa vytvoriť chýbajúci priečinok pre nastavenia: {0}"
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+"<html>Nepodarilo sa vytvoriť chýbajúci priečinok pre nastavenia: {0}</html>"
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+"Nepodarilo sa vytvoriť chýbajúci priečinok pre používateľské dáta: {0}"
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+"<html>Nepodarilo sa vytvoriť chýbajúci priečinok pre používateľské dáta: "
+"{0}</html>"
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Nepodarilo sa vytvoriť chýbajúci cache adresár: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Nepodarilo sa vytvoriť chýbajúci adresár zásobníka: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Očakával sa prvok \"{0}\", ale našiel sa \"{1}\""
@@ -4586,6 +4579,9 @@ msgstr "Štýl oblasti na vonkajšej ceste"
msgid "Multipolygon is not closed"
msgstr "Multipolygón nie je uzavretý"
+msgid "Self-intersecting polygon ring"
+msgstr "Polygón križujúci sám seba"
+
msgid "Multipolygon rings share node(s)"
msgstr "Oblasti multipolygónu zdieľajú body"
@@ -5299,6 +5295,26 @@ msgstr "Načítavam predvoľby mapových podkladov"
msgid "usage"
msgstr "použitie"
+msgid "commands"
+msgstr "príkazy"
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr "spustiť JOSM (predvolená činnosť ak nie je zadaný žiadny príkaz)"
+
+msgid "render data and save the result to an image file"
+msgstr "vykresliť údaje a uložiť výsledok ako obrázok do súboru"
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr "konvertovať súradnice z jedného referenčného systému do iného"
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+"Pre získanie podrobností o príkazoch {0} a {1}, spustite ich s voľbou {2}."
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr "Zvyšok tejto stránky popisuje príkaz {0}."
+
msgid "options"
msgstr "Možnosti"
@@ -5438,6 +5454,13 @@ msgstr "Nastavujem východzie hodnoty"
msgid "Creating main GUI"
msgstr "Vytváram hlavné grafické rozhranie (GUI)"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Pokúsiť sa zapnúť sieť IPv6, prednostne použiť IPv6 pred IPv4 (funguje len "
+"skoro po štarte)."
+
msgid "Updating plugins"
msgstr "Aktualizujem pluginy"
@@ -5754,6 +5777,9 @@ msgstr "Zväčšiť"
msgid "Shrink"
msgstr "Zmenšiť"
+msgid "Show downloaded area"
+msgstr "Zobraziť stiahnutú oblasť"
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8766,6 +8792,9 @@ msgstr ""
"<html>Vrstva ''{0}'' už má konflikt na objekte <br>''{1}''.<br> Prosím "
"vyriešte najskôr tento konflikt, potom to skúste znova.</html>"
+msgid "Select the currently edited relation"
+msgstr "Zvoliť práve upravovanú reláciu"
+
msgid "Select objects for selected relation members"
msgstr "Výber objektov pre vybrané členy relácie"
@@ -11569,6 +11598,183 @@ msgstr "(URL bolo: "
msgid "Select the map painting styles"
msgstr "Vybrať štýl kreslenia mapy"
+msgid "Error - file not found: ''{0}''"
+msgstr "Chyba - súbor sa nenašiel: \"{0}\""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr "Pre voľbu {0} bolo očakávané celé číslo, obdržaná hodnota je \"{1}\""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+"Pre voľbu {0} bolo očakávané celé číslo >=0, obdržaná hodnota je \"{1}\""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr "Nepodarilo sa prečítať parameter pre {0}: {1}"
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+"Očakával sa kľúč a hodnota, oddelené znakom \":\" pre voľbu {0}, obdržaná "
+"hodnota je \"{1}\""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+"Pre voľbu {0} bolo očakávané desatinné číslo, obdržaná hodnota je \"{1}\""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+"Pre voľbu {0} boli očakávané 2 súradnice oddelené čiarkou, obdržaná hodnota "
+"je \"{1}\""
+
+msgid "In option {0}: {1}"
+msgstr "Vo voľbe {0}: {1}"
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+"Pre voľbu {0} bolo očakávané desatinné číslo > 0, obdržaná hodnota je \"{1}\""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+"Pre voľbu {0} bolo očakávané celé číslo > 0, obdržaná hodnota je \"{1}\""
+
+msgid "JOSM rendering command line interface"
+msgstr "rozhranie príkazového riadka pre vykresľovanie"
+
+msgid "Renders data and saves the result to an image file."
+msgstr "Vykreslí udaje a uoží výsledok do obrázkového súboru."
+
+msgid "Input data file name (.osm)"
+msgstr "Názov súboru vstupných údajov (.osm)"
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr "Názov súboru výstupného obrázka (.png); predvolený je \"{0}\""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr "Súbor štýly pre vykreslenie (.mapcss alebo .zip)"
+
+msgid "This option can be repeated to load multiple styles."
+msgstr "Táto voľba môže byť opakovaná pre načítanie viacerých štýlov."
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+"Nastavenie štýlu (prístupné v JOSM v okne štýlov pomocou pravého tlačidla "
+"myši)"
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr "Platí na posledný štýl načítaný pomocou voľby {0}."
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+"Zvoliť úroveň priblíženia pre vykreslenie. (celočíselná hodnota, 0=celý "
+"svet, 18=úroveň ulice)"
+
+msgid "Select the map scale"
+msgstr "Zvoliť mierku mapy"
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+"Hodnota 10000 znamená mierku 1:10000 (1 cm na mape sa rovná 100 m na "
+"povrchu; rozlíšenie displeja: 96 dpi)"
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr "Voľby {0} a {1} sa navzájom vylučujú."
+
+msgid "Area to render, default value is ''{0}''"
+msgstr "Oblasť na vykreslenie, predvolená hodnota je \"{0}\""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+"S kľúčovým slovom \"{0}\" bude použitá stiahnutá oblasť vo vstupnom súbore "
+".osm (ak je v ňom zaznamenaná)."
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr "Zadajte ľavý dolný roh vykresľovanej oblasti"
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+"Používané v kombinácii s voľbami šírky a výšky na určenie oblasti na "
+"vykreslenie."
+
+msgid "Width of the rendered area, in meter"
+msgstr "Šírka vykresľovanej oblasti, v metroch"
+
+msgid "Height of the rendered area, in meter"
+msgstr "Výška vykresľovanej oblasti, v metroch"
+
+msgid "Width of the target image, in pixel"
+msgstr "Šírka výsledného obrázka, v bodoch"
+
+msgid "Height of the target image, in pixel"
+msgstr "Výška výsledného obrázka, v bodoch"
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr "Použitá projekcia, predvolená hodnota je \"{0}\" (web-Mercator)"
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+"Maximálna šírka/výška obrázka v bodoch (\"{0}\" znamená bez limitu), "
+"predvolená hodnota: {1}"
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+"Na určenie vykresľovanej oblasti a mierky je možné rôzne skombinovať voľby"
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+"Ak nie je zadané \"{0}\" ani \"{1}\", platí predvolená hodnota {2} a použije "
+"sa stiahnutá oblasť vo vstupnom súbore .osm."
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+"Parameter {0} bol zadaný, ale mierka nemohla byť určená z ostatných "
+"parametrov"
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr "Parameter {0} bol zadaný, očakáva sa {1} alebo {2}"
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr "režim {0}, ale vo vstupnom osm súbore sa nenašli hranice"
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr "Nepodarilo sa určiť mierku, očakáva sa {0}, {1}, {2} alebo {3}"
+
+msgid "Missing argument - input data file ({0})"
+msgstr "Chýba parameter - vstupný súbor údajov ({0})"
+
+msgid "In .osm data file ''{0}'' - "
+msgstr "V údajovom súbore .osm \"{0}\" - "
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr "Chýba parameter - očkáva sa aspoň jeden štýl ({0})"
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+"Rozmery obrázka ({0}x{1}) presahujú maximálne rozmery {2} (použite voľbu {3} "
+"pre zmenu limitu)"
+
+msgid "Style setting not found: ''{0}''"
+msgstr "Nastavenie štýlu sa nenašlo: \"{0}\""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11596,6 +11802,11 @@ msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
"Nepodarilo sa prečítať štýl kreslenia mapy z \"{0}\". Chyba bola: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Zlyhala lokalizácia obrázku ''{0}''"
@@ -15420,6 +15631,18 @@ msgstr "Preskočiť vrstvu a pokračovať"
msgid "expected .jos file inside .joz archive"
msgstr "očakával sa .jos súbor vo vnútri .joz archívu"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+"Nepodarilo sa vytvoriť chýbajúci priečinok pre nastavenia pluginov: {0}"
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr "Nepodarilo sa vytvoriť chýbajúci priečinok pre dáta pluginov: {0}"
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+"Nepodarilo sa vytvoriť chýbajúci priečinok pre vyrovnávaciu pamäť pluginov: "
+"{0}"
+
msgid "Skip download"
msgstr "Vynechať sťahovanie"
@@ -17043,6 +17266,12 @@ msgstr "Motocykel"
msgid "Motorcar"
msgstr "Autá"
+msgid "Minimum age"
+msgstr "Minimálny vek"
+
+msgid "Maximum age"
+msgstr "Maximálny vek"
+
msgid "Reference"
msgstr "Ref. číslo"
@@ -17693,6 +17922,10 @@ msgid "platform"
msgstr "plošina"
msgctxt "power"
+msgid "rooftop"
+msgstr "na streche"
+
+msgctxt "power"
msgid "kiosk"
msgstr "v schránke"
@@ -17741,6 +17974,42 @@ msgstr "para"
msgid "vacuum"
msgstr "vákuum"
+msgid "Material"
+msgstr "Materiál"
+
+msgid "plastic"
+msgstr "plast"
+
+msgid "steel"
+msgstr "oceľ"
+
+msgid "stone"
+msgstr "kameň"
+
+msgid "Location transition"
+msgstr "Zmena polohy káblov"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "nominálny výkon (kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "Fázy"
+
msgid "Max. weight (tonnes)"
msgstr "Max. hmotnosť (t)"
@@ -18687,12 +18956,6 @@ msgstr "Prekážky (Barriers)"
msgid "Block"
msgstr "Balvan (Block)"
-msgid "Material"
-msgstr "Materiál"
-
-msgid "stone"
-msgstr "kameň"
-
msgid "Bollard"
msgstr "Stĺpik"
@@ -18705,9 +18968,6 @@ msgstr "vysúvateľný"
msgid "removable"
msgstr "odstrániteľný"
-msgid "plastic"
-msgstr "plast"
-
msgid "Cycle Barrier"
msgstr "Cyklo-prekážka (Cycle Barrier)"
@@ -19486,6 +19746,12 @@ msgstr "1/25 mix (mofa/moped)"
msgid "1/50 mix (mofa/moped)"
msgstr "1/50 mix (mofa/moped)"
+msgid "Additives:"
+msgstr "Aditíva:"
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr "Výfuková tekutina pre naftové motory (AdBlue/AUS32)"
+
msgid "Fuel cards:"
msgstr "Palivové karty:"
@@ -20012,7 +20278,7 @@ msgid "Camping Site"
msgstr "Stanový tábor (kemp)"
msgid "Food+Drinks"
-msgstr "Jedlo + Pitie"
+msgstr "Jedlo+Nápoje"
msgid "Restaurant"
msgstr "Reštaurácia"
@@ -20195,9 +20461,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Počet premietacích plôch"
-msgid "Minimum age"
-msgstr "Minimálny vek"
-
msgid "Zoo"
msgstr "Zoo"
@@ -20523,7 +20786,7 @@ msgid "Kindergarten"
msgstr "Škôlka"
msgid "School"
-msgstr "Základná škola"
+msgstr "Základná/stredná škola"
msgid "University"
msgstr "Univerzita (Vysoká škola)"
@@ -22393,24 +22656,6 @@ msgctxt "power"
msgid "industrial"
msgstr "priemyselná"
-msgid "Power rating (kVA/MVA)"
-msgstr "nominálny výkon (kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "Izolované plynom"
@@ -22436,9 +22681,6 @@ msgctxt "power"
msgid "yes"
msgstr "áno"
-msgid "Phases"
-msgstr "Fázy"
-
msgid "Power Switchgear"
msgstr "Poistková sústava"
@@ -22458,6 +22700,25 @@ msgstr "Prípojné miesto (bay)"
msgid "Power Switch"
msgstr "Vypínač"
+msgid "Type of switch"
+msgstr "Typ vypínača"
+
+msgctxt "power"
+msgid "mechanical"
+msgstr "mechanický"
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr "poistka"
+
+msgctxt "power"
+msgid "disconnector"
+msgstr "odpájač"
+
+msgctxt "power"
+msgid "earthing"
+msgstr "uzemnenie"
+
msgid "Power Converter"
msgstr "Elektrický menič"
@@ -22559,9 +22820,6 @@ msgstr "trubicová"
msgid "solid"
msgstr "plná"
-msgid "steel"
-msgstr "oceľ"
-
msgctxt "color"
msgid "red/white"
msgstr "červená/biela"
@@ -22724,18 +22982,21 @@ msgstr "Trojitý stožiar"
msgid "Incomplete tower"
msgstr "Nedokončený stožiar"
-msgid "Location transition"
-msgstr "Zmena polohy káblov"
-
msgid "Pole"
msgstr "Elektrický stĺp"
-msgid "Pole with Transformer"
-msgstr "Stĺp s transformátorom"
+msgid "Pole with Switch"
+msgstr "Stĺp s vypínačom"
msgid "Pole Attributes:"
msgstr "Vlastnosti stĺpa:"
+msgid "Switch Attributes:"
+msgstr "Vlastnosti vypínača:"
+
+msgid "Pole with Transformer"
+msgstr "Stĺp s transformátorom"
+
msgid "Transformer Attributes:"
msgstr "Vlastnosti transformátora:"
@@ -22848,6 +23109,52 @@ msgstr "Bojisko"
msgid "Palaeontological Site"
msgstr "Paleontologické nálezisko"
+msgid "Grave"
+msgstr "Hrob"
+
+msgid "Tomb"
+msgstr "Hrobka"
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr "mohyla"
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr "skalná dutina"
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr "hypogeum"
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr "vojnový hrob"
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr "mauzóleum"
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr "kolumbárium"
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr "krypta"
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr "pyramída"
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr "sarkofág"
+
+msgctxt "tomb"
+msgid "vault"
+msgstr "pohrebná miestnosť"
+
msgid "Monument"
msgstr "Veľký pamätník/monument"
@@ -23207,7 +23514,7 @@ msgid "condoms"
msgstr "kondómy"
msgid "drinks"
-msgstr "pitie"
+msgstr "nápoje"
msgid "elongated_coin"
msgstr "razené mince"
@@ -23625,6 +23932,9 @@ msgstr "Izolované obydlie"
msgid "Suburb"
msgstr "Mestská štvrť"
+msgid "Quarter"
+msgstr "Štvrť"
+
msgid "Neighbourhood"
msgstr "Okolie"
@@ -23987,6 +24297,9 @@ msgstr "Skleníková zóna"
msgid "Plant Nursery"
msgstr "Škôlka pre rastliny"
+msgid "Salt Pond"
+msgstr "Odparovacia soľná nádrž"
+
msgid "Aquaculture"
msgstr "Akvakultúra"
@@ -24596,11 +24909,21 @@ msgstr "Trasy"
msgid "Bicycle Route"
msgstr "Cyklotrasa"
+msgctxt "network"
+msgid "international"
+msgstr "medzinárodná"
+
+msgctxt "network"
msgid "national"
msgstr "národná"
+msgctxt "network"
+msgid "regional"
+msgstr "regionálna"
+
+msgctxt "network"
msgid "local"
-msgstr "miestna"
+msgstr "lokálna"
msgid "Mountain Biking Route"
msgstr "Trasa pre horské bicykle"
@@ -24799,6 +25122,9 @@ msgid ""
"select regions filled with +Vivid or custom area of interest imagery, 50cm "
"resolution or better, and refreshed more frequently with ongoing updates."
msgstr ""
+"DigitalGlobe-Premium je mozaika zo základných snímok DigitalGlobe-Standard, "
+"kde niektoré zaujímavé oblasti sú doplnené extra snímkami s rozlíšením 50cm "
+"alebo lepším, a s častejšími aktualizáciami."
msgid "DigitalGlobe Standard Imagery"
msgstr "DigitalGlobe Štandardné snímky"
@@ -24808,6 +25134,10 @@ msgid ""
"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
msgstr ""
+"DigitalGlobe-Standard je spravovaná sada snímok, ktoré pokrývajú 86% "
+"pevniny, s rozlíšením 30-60cm kde je dostupné, chýbajúce miesta doplnené zo "
+"snímok Landsat-u. Priemerný vek je 2,31 rokov, ale niektoré oblasti sú "
+"aktualizované 2x za rok."
msgid "Esri World Imagery"
msgstr "Esri snímky sveta"
@@ -24842,6 +25172,9 @@ msgstr "OpenStreetMap GPS Stopy"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr "Verejné stopy GPS odoslané na OpenStreetMap."
+msgid "OpenTopoMap"
+msgstr "OpenTopoMap"
+
msgid "Public Transport (ÖPNV)"
msgstr "Hromadná doprava (ÖPNV)"
@@ -24854,8 +25187,8 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr "Stamen Terrain"
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
-msgstr "Cambodža, Laos, Thajsko, Vietnam, Mjanmarsko dvojjazyčne"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
+msgstr "Kambodža, Laos, Thajsko, Vietnam, Malajzia, Mjanmarsko dvojjazyčne"
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -24897,7 +25230,7 @@ msgid "Waymarked Trails: Winter Sports"
msgstr "Značené trasy: Zimné športy"
msgid "Wikimedia Map"
-msgstr ""
+msgstr "Wikimedia mapa"
msgid "OSM Inspector: Geometry"
msgstr "OSM Inspector: Geometria"
@@ -24931,6 +25264,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr "Mesto Tirana (Open Labs GeoPortal)"
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr "Ulice a budovy poskytnuté mestom Tirana, prevádzkuje Open Labs"
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr "imagico.de OSM obrázky pre mapovanie: Južné transantarktické hory"
@@ -25258,6 +25598,9 @@ msgstr "URBIS 2015 letecké snímky"
msgid "URBIS 2016 aerial imagery"
msgstr "URBIS 2016 letecké snímky"
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW(allonie) PICC numerical imagery"
@@ -25273,6 +25616,9 @@ msgstr "SPW(allonie) 2012-2013 letecké snímky"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 letecké snímky"
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr "Linky autobusov TEC"
@@ -25577,6 +25923,9 @@ msgstr "BDOrtho IGN"
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Cadastre"
@@ -26508,6 +26857,9 @@ msgstr "Fiez Ortofoto 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr "Kanton Basel-Stadt 2015"
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr "Kanton Basel-Landschaft 10cm (2015)"
@@ -26555,11 +26907,11 @@ msgstr "USGS Topografické mapy"
msgid "USGS Large Scale Imagery"
msgstr "USGS Veľké letecké snímky"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012 Cesty"
+msgid "TIGER Roads 2012"
+msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "Nové & Nezarovnané TIGER cesty (2015)"
+msgid "TIGER Roads 2014"
+msgstr ""
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -26567,6 +26919,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcely"
@@ -26628,6 +26988,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr "San Juan Metro Area: 2013 USACE Ortofoto"
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr "WA 2013 letecké snímky pre okres San Juan"
@@ -27589,6 +27952,14 @@ msgstr "{0} na ceste. Malo by byť použité na bode."
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} na ceste. Malo by byť použité v relácii"
+msgid "node connects highway and building"
+msgstr "bod spája komunikáciu a budovu"
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr "{0} spolu s {1} na bode. Odstráňte {0}."
@@ -27659,14 +28030,6 @@ msgstr ""
"{0} je značka pre lineárnu vodnú cestu. Pre označkovanie vodnej oblasti "
"použite namiesto toho {1} + {2}."
-msgid "node connects highway and building"
-msgstr "bod spája komunikáciu a budovu"
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -27721,11 +28084,11 @@ msgstr "prázdna hodnota v bodkočiarkou oddelenom zozname \"{0}\""
msgid "numerical key"
msgstr "číselný kľúč"
-msgid "layer tag with + sign"
-msgstr "hodnota značky \"layer\" so znamienkom +"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "hodnota \"layer\" by mala byť medzi -5 a 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr "{0} by mal mať len čísla, prípadne s krokmi po 0,5"
@@ -30693,6 +31056,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -32558,9 +32924,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr "km/h"
-
msgid "Track name: "
msgstr "Názov stopy: "
@@ -34012,6 +34375,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr "km/h"
+
msgid "direction"
msgstr ""
@@ -35265,6 +35631,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/sl.po b/i18n/po/sl.po
index e79377d..55864cf 100644
--- a/i18n/po/sl.po
+++ b/i18n/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2015-11-07 17:38+0000\n"
"Last-Translator: Joško Horvat <Unknown>\n"
"Language-Team: Slovenian <sl at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
"n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:58+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:01+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: sl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2927,24 +2927,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3011,18 +2993,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3546,6 +3523,24 @@ msgstr "besedilo"
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4216,6 +4211,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4905,6 +4903,25 @@ msgstr ""
msgid "usage"
msgstr "uporaba"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "možnosti"
@@ -5032,6 +5049,11 @@ msgstr "Privzete nastavitve"
msgid "Creating main GUI"
msgstr "Priprava grafičnega uporabniškega vmesnika"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5329,6 +5351,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8074,6 +8099,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10582,6 +10610,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10600,6 +10778,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14025,6 +14208,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15403,6 +15595,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -16046,6 +16244,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16094,6 +16296,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -17020,12 +17258,6 @@ msgstr "Ovire"
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr "Stebriček"
@@ -17038,9 +17270,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17812,6 +18041,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18521,9 +18756,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "Živalski vrt"
@@ -20719,24 +20951,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20762,9 +20976,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20782,6 +20993,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20883,9 +21113,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21048,18 +21275,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21172,6 +21402,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21949,6 +22225,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22297,6 +22576,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22902,9 +23184,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23148,6 +23440,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23160,7 +23455,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23237,6 +23532,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23563,6 +23865,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23578,6 +23883,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23882,6 +24190,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24805,6 +25116,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24852,10 +25166,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24864,6 +25178,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24925,6 +25247,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25864,6 +26189,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25930,14 +26263,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25988,10 +26313,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28751,6 +29076,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30553,9 +30881,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31991,6 +32316,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33226,6 +33554,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/sq.po b/i18n/po/sq.po
index 225f0de..f0db757 100644
--- a/i18n/po/sq.po
+++ b/i18n/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2011-11-04 19:43+0000\n"
"Last-Translator: StefanPrifti <Unknown>\n"
"Language-Team: FLOSS Kosova\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:31+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 04:33+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr "Krijimi i GUI-të kryesor"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/sr.po b/i18n/po/sr.po
index 4ade5cf..65340eb 100644
--- a/i18n/po/sr.po
+++ b/i18n/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2015-02-01 15:30+0000\n"
"Last-Translator: Slobodan Simić <Unknown>\n"
"Language-Team: Serbian <sr at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-09-30 04:57+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:00+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: sr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2912,24 +2912,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2996,18 +2978,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3521,6 +3498,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4189,6 +4184,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4876,6 +4874,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5003,6 +5020,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5300,6 +5322,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8041,6 +8066,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10530,6 +10558,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10548,6 +10726,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13967,6 +14150,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15341,6 +15533,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15984,6 +16182,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16032,6 +16234,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16958,12 +17196,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16976,9 +17208,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17750,6 +17979,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18459,9 +18694,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20657,24 +20889,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20700,9 +20914,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20720,6 +20931,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20821,9 +21051,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20986,18 +21213,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21110,6 +21340,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21887,6 +22163,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22235,6 +22514,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22840,9 +23122,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23086,6 +23378,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23098,7 +23393,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23175,6 +23470,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23501,6 +23803,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23516,6 +23821,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23820,6 +24128,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24743,6 +25054,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24790,10 +25104,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24802,6 +25116,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24863,6 +25185,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25802,6 +26127,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25868,14 +26201,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25926,10 +26251,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28689,6 +29014,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30491,9 +30819,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31927,6 +32252,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33162,6 +33490,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/sv.po b/i18n/po/sv.po
index 6656bed..22a9631 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: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-09-29 07:08+0000\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-09 11:53+0000\n"
"Last-Translator: Tomas Marklund <tomasmarklund75 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: 2017-09-30 04:59+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:02+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: sv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3139,24 +3139,6 @@ msgstr "Ogiltigt latitud-värde ''{0}''"
msgid "Illegal longitude value ''{0}''"
msgstr "Ogiltigt longitud-värde ''{0}''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Misslyckades med att skapa saknad cache-katalog: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Misslyckades med att skapa saknad cache-katalog: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Omöjligt att ta bort tillfälliga filen {0}"
@@ -3237,22 +3219,15 @@ msgstr "Kunde inte hämta standardcachefilen: {0}"
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr "Kunde inte radera felaktiga standardcachefiler: {0}"
-msgid "Paint style {0}: {1}"
-msgstr "Ritstil{0}: {1}"
-
msgid "Layer: {0}"
msgstr "Lager: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Ritstil{0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Kunde inte avsluta inställningarna till \"{0}\""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Försök aktivera IPv6-nätverk, som föredrar IPv6 över IPv4 (fungerar bara vid "
-"tidig uppstart)."
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr "Inställningen {0} har raderats då den inte används längre."
@@ -3789,6 +3764,24 @@ msgstr "text"
msgid "areatext"
msgstr "yttext"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Misslyckades med att skapa saknad cache-katalog: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Misslyckades med att skapa saknad cache-katalog: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Väntade element ''{0}'', men fick ''{1}''"
@@ -4470,6 +4463,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "Multipolygonen är inte stängd"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -5182,6 +5178,25 @@ msgstr "Laddar inställningar för ortofoto"
msgid "usage"
msgstr "användning"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "alternativ"
@@ -5316,6 +5331,13 @@ msgstr "Anger förval"
msgid "Creating main GUI"
msgstr "Skapar huvudgränssnittet"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Försök aktivera IPv6-nätverk, som föredrar IPv6 över IPv4 (fungerar bara vid "
+"tidig uppstart)."
+
msgid "Updating plugins"
msgstr "Uppdaterar insticksmoduler"
@@ -5618,6 +5640,9 @@ msgstr "Förstora"
msgid "Shrink"
msgstr "Krymp"
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8407,6 +8432,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10991,6 +11019,156 @@ msgstr "(URL:en var: "
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11009,6 +11187,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14501,6 +14684,15 @@ msgstr "Hoppa över lager och fortsätt"
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Överhoppningshämtning"
@@ -15961,6 +16153,12 @@ msgstr "Motorcykel"
msgid "Motorcar"
msgstr "Bil"
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Referens"
@@ -16604,6 +16802,10 @@ msgid "platform"
msgstr "plattform"
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr "stuga"
@@ -16652,6 +16854,42 @@ msgstr "ånga"
msgid "vacuum"
msgstr "vacuum"
+msgid "Material"
+msgstr "Material"
+
+msgid "plastic"
+msgstr "plast"
+
+msgid "steel"
+msgstr "stål"
+
+msgid "stone"
+msgstr "sten"
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr "Största tillåtna vikt (ton)"
@@ -17590,12 +17828,6 @@ msgstr "Hinder"
msgid "Block"
msgstr "Block"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "sten"
-
msgid "Bollard"
msgstr "Trafikkon"
@@ -17608,9 +17840,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr "plast"
-
msgid "Cycle Barrier"
msgstr "Cykelhinder"
@@ -18233,7 +18462,7 @@ msgid "Railway Switch"
msgstr "Växel"
msgid "Railway Signal"
-msgstr ""
+msgstr "Järnvägssignal"
msgid "Railway milestone"
msgstr "Kilometertavla"
@@ -18382,6 +18611,12 @@ msgstr "Oljeblandat 4% (moped etc)"
msgid "1/50 mix (mofa/moped)"
msgstr "Oljeblandat 2% (moped etc)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -19093,9 +19328,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "Zoo"
@@ -21291,24 +21523,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -21334,9 +21548,6 @@ msgctxt "power"
msgid "yes"
msgstr "ja"
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -21354,6 +21565,25 @@ msgstr ""
msgid "Power Switch"
msgstr "Brytare/frånskiljare"
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -21455,9 +21685,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr "stål"
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21620,18 +21847,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr "Elstolpe"
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21744,6 +21974,52 @@ msgstr "Krigsskådeplats"
msgid "Palaeontological Site"
msgstr "Paleografisk plats"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Monument"
@@ -22521,6 +22797,9 @@ msgstr "Liten by"
msgid "Suburb"
msgstr "Förort"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "Grannskap"
@@ -22880,6 +23159,9 @@ msgstr "Växthusodling"
msgid "Plant Nursery"
msgstr "Plantskola"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -23485,11 +23767,21 @@ msgstr "Rutter"
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
-msgstr "nationellt"
+msgstr ""
+
+msgctxt "network"
+msgid "regional"
+msgstr ""
+msgctxt "network"
msgid "local"
-msgstr "lokalt"
+msgstr ""
msgid "Mountain Biking Route"
msgstr ""
@@ -23731,6 +24023,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23743,7 +24038,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23820,6 +24115,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -24146,6 +24448,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -24161,6 +24466,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -24465,6 +24773,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Cadastre"
@@ -25388,6 +25699,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -25435,10 +25749,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -25447,6 +25761,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -25508,6 +25830,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -26447,6 +26772,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -26513,14 +26846,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -26573,10 +26898,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -29349,6 +29674,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -31166,9 +31494,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr "km/h"
-
msgid "Track name: "
msgstr ""
@@ -32624,6 +32949,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr "km/h"
+
msgid "direction"
msgstr ""
@@ -33859,6 +34187,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/ta.po b/i18n/po/ta.po
index 00387a0..18ba073 100644
--- a/i18n/po/ta.po
+++ b/i18n/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2017-06-06 01:06+0000\n"
"Last-Translator: Stephane <Unknown>\n"
"Language-Team: Tamil <ta at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 05:00+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:03+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"X-Poedit-Country: INDIA\n"
"Language: ta\n"
"X-Poedit-Language: Tamil\n"
@@ -2947,24 +2947,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3031,18 +3013,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr "அடுக்கு: {0}"
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3556,6 +3533,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4224,6 +4219,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4911,6 +4909,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5038,6 +5055,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5335,6 +5357,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8077,6 +8102,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10567,6 +10595,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10585,6 +10763,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14004,6 +14187,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15378,6 +15570,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -16021,6 +16219,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16069,6 +16271,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16995,12 +17233,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -17013,9 +17245,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17787,6 +18016,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18496,9 +18731,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20694,24 +20926,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20737,9 +20951,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20757,6 +20968,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20858,9 +21088,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21023,18 +21250,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21147,6 +21377,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21924,6 +22200,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22272,6 +22551,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22877,9 +23159,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23123,6 +23415,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23135,7 +23430,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23212,6 +23507,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23538,6 +23840,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23553,6 +23858,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23857,6 +24165,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24780,6 +25091,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24827,10 +25141,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24839,6 +25153,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24900,6 +25222,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25839,6 +26164,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25905,14 +26238,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25963,10 +26288,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28726,6 +29051,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30528,9 +30856,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31970,6 +32295,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33205,6 +33533,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/te.po b/i18n/po/te.po
index f24def5..fe8140b 100644
--- a/i18n/po/te.po
+++ b/i18n/po/te.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2011-05-13 08:50+0000\n"
"Last-Translator: Praveen Illa <mail2ipn at gmail.com>\n"
"Language-Team: Telugu <te at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 05:00+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:03+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: te\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/th.po b/i18n/po/th.po
index dac0ca9..387a994 100644
--- a/i18n/po/th.po
+++ b/i18n/po/th.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2009-03-23 02:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Thai <th at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-09-30 05:01+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:04+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: th\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/tr.po b/i18n/po/tr.po
index 487da2a..6416490 100644
--- a/i18n/po/tr.po
+++ b/i18n/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2017-02-06 01:25+0000\n"
"Last-Translator: Ferhad Fidan <ferhad at f-blog.info>\n"
"Language-Team: Türkçe <>\n"
@@ -17,8 +17,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 05:01+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:04+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2959,24 +2959,6 @@ msgstr "enlem değeri ''{0}'' geçerli değil"
msgid "Illegal longitude value ''{0}''"
msgstr "boylam değeri ''{0}'' geçerli değil"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3043,18 +3025,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "Boya Stili {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Katman: {0}"
-msgid "Failed to persist preferences to ''{0}''"
-msgstr ""
+msgid "Paint style {0}: {1}"
+msgstr "Boya Stili {0}: {1}"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3571,6 +3548,24 @@ msgstr "metin"
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4241,6 +4236,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4940,6 +4938,25 @@ msgstr "Görüntü tercihleri yükleniyor"
msgid "usage"
msgstr "kullanım"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "seçenekler"
@@ -5067,6 +5084,11 @@ msgstr "Varsayılan ayarlar alınıyor"
msgid "Creating main GUI"
msgstr "Arayüz Oluşturuluyor."
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5364,6 +5386,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8104,6 +8129,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10612,6 +10640,156 @@ msgstr "(URL : "
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10630,6 +10808,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14063,6 +14246,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15444,6 +15636,12 @@ msgstr "Motosiklet"
msgid "Motorcar"
msgstr "otomobil"
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "Referans"
@@ -16087,6 +16285,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16135,6 +16337,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr "Malzeme"
+
+msgid "plastic"
+msgstr "plastik"
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr "taş"
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr "Max. ağırlık (ton)"
@@ -17061,12 +17299,6 @@ msgstr "Bariyer"
msgid "Block"
msgstr "Blok"
-msgid "Material"
-msgstr "Malzeme"
-
-msgid "stone"
-msgstr "taş"
-
msgid "Bollard"
msgstr "direk-iskele"
@@ -17079,9 +17311,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr "plastik"
-
msgid "Cycle Barrier"
msgstr ""
@@ -17853,6 +18082,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18562,9 +18797,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr "Hayvanat Bahçesi"
@@ -20760,24 +20992,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20803,9 +21017,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20823,6 +21034,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20924,9 +21154,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -21089,18 +21316,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21213,6 +21443,52 @@ msgstr "Savaş Alanı"
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Anıt"
@@ -21990,6 +22266,9 @@ msgstr ""
msgid "Suburb"
msgstr "Banliyo"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22338,6 +22617,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22943,9 +23225,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23189,6 +23481,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23201,7 +23496,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23278,6 +23573,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23604,6 +23906,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23619,6 +23924,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23923,6 +24231,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24846,6 +25157,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24893,10 +25207,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24905,6 +25219,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24966,6 +25288,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25905,6 +26230,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25971,14 +26304,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -26029,10 +26354,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28792,6 +29117,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30596,9 +30924,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -32044,6 +32369,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33279,6 +33607,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/ug.po b/i18n/po/ug.po
index b237e27..ae8afdd 100644
--- a/i18n/po/ug.po
+++ b/i18n/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2012-07-14 16:22+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Uyghur <ug at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-09-30 05:01+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:04+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/uk.po b/i18n/po/uk.po
index 6afd3c4..35ace1f 100644
--- a/i18n/po/uk.po
+++ b/i18n/po/uk.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-09-15 14:49+0000\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-20 11:08+0000\n"
"Last-Translator: andygol <Unknown>\n"
"Language-Team: Ukrainian <uk at li.org>\n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-09-30 05:02+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:05+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: uk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3224,26 +3224,6 @@ msgstr "Неправильне значення широти — ''{0}''"
msgid "Illegal longitude value ''{0}''"
msgstr "Неправильне значення довготи — ''{0}''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr "Збій створення теки для налаштувань, що була відсутня: {0}"
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-"<html>Збій створення теки для налаштувань, що була відсутня: {0}</html>"
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr "Збій створення теки для даних користувача, що була відсутня: {0}"
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-"<html>Збій створення теки для даних користувача, що була відсутня: {0}</html>"
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Не вдалося створити відсутню теку для кешу: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>Не вдалося створити втрачену теку кешу: {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "Не вдається вилучити тимчасовий файл {0}"
@@ -3326,22 +3306,15 @@ msgstr "Неможливо завантажити типовий файл кеш
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr "Неможливо вилучити пошкоджений типовий файл кешу: {0}"
-msgid "Paint style {0}: {1}"
-msgstr "Стиль зафарбовування {0}:{1}"
-
msgid "Layer: {0}"
msgstr "Шар: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Стиль зафарбовування {0}:{1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Не вдалося зберегти налаштування у ''{0}''"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-"Спробуйте ввімкнути мережу IPv6, перевагу IPv6 над IPv4 (працює тільки на "
-"раніх етапах запуску)."
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr ""
"Параметр налаштувань {0} був вилучений, оскільки він більше не "
@@ -3904,6 +3877,26 @@ msgstr "текст"
msgid "areatext"
msgstr "текст"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr "Збій створення теки для налаштувань, що була відсутня: {0}"
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+"<html>Збій створення теки для налаштувань, що була відсутня: {0}</html>"
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr "Збій створення теки для даних користувача, що була відсутня: {0}"
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+"<html>Збій створення теки для даних користувача, що була відсутня: {0}</html>"
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Не вдалося створити відсутню теку для кешу: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>Не вдалося створити втрачену теку кешу: {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "Очікувався елемент ''{0}'', але отриманий ''{1}''"
@@ -4606,6 +4599,9 @@ msgstr "Стиль полігону на зовнішній лінії"
msgid "Multipolygon is not closed"
msgstr "Мультиполігон не замкнений"
+msgid "Self-intersecting polygon ring"
+msgstr "Контур полігону має самоперетини"
+
msgid "Multipolygon rings share node(s)"
msgstr "Контури мультиполігона мають спільну(і) точку(и)"
@@ -5324,6 +5320,27 @@ msgstr "Завантаження налаштувань фону"
msgid "usage"
msgstr "використання"
+msgid "commands"
+msgstr "команди"
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr "запускає JOSM (виконується типово, якщо команда не зазначена)"
+
+msgid "render data and save the result to an image file"
+msgstr "показує дані та зберігає результат до графічного файлу"
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr "перетвоюрює координати однієї системи в іншу"
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+"Для отримання докладної інформації про команди {0} та {1} додайте до них "
+"параметр {2}."
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr "Решта цієї довідкової сторінки містить інформацію про команду {0}."
+
msgid "options"
msgstr "параметри"
@@ -5468,6 +5485,13 @@ msgstr "Типові налаштування"
msgid "Creating main GUI"
msgstr "Створення головного вікна"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+"Спробуйте ввімкнути мережу IPv6, перевагу IPv6 над IPv4 (працює тільки на "
+"раніх етапах запуску)."
+
msgid "Updating plugins"
msgstr "Оновлення втулків"
@@ -5792,6 +5816,9 @@ msgstr "Збільшити"
msgid "Shrink"
msgstr "Зменшити"
+msgid "Show downloaded area"
+msgstr "Показати завантажену ділянку"
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -7796,7 +7823,7 @@ msgid "Update the changeset from the OSM server"
msgstr "Оновлення набору змін з сервера OSM"
msgid "View changeset"
-msgstr ""
+msgstr "Переглянути набір змін"
msgid ""
"Select the primitives in the content of this changeset in the current data "
@@ -8800,6 +8827,9 @@ msgstr ""
"<html>В шарі ''{0}'' вже є конфлікт для об’єкта <br>''{1}''.<br>Будь ласка, "
"спочатку розв’яжіть цей конфлікт, а потім спробуйте знову..</html>"
+msgid "Select the currently edited relation"
+msgstr "Виділяти звʼязок, що редагується"
+
msgid "Select objects for selected relation members"
msgstr "Виділити об’єкти для виділених членів зв’язку"
@@ -9422,10 +9452,10 @@ msgid "Open a history browser with the history of this node"
msgstr "Відкрити історію цієї точки в оглядачі історії"
msgid "View changeset in web browser"
-msgstr ""
+msgstr "Переглянути набір змін у веб-оглядачі"
msgid "Open {0}"
-msgstr ""
+msgstr "Відкрити {0}"
msgid "Way {0}"
msgstr "Лінія {0}"
@@ -9437,7 +9467,7 @@ msgid "Object"
msgstr "Об’єкт"
msgid "Open Changeset Manager"
-msgstr ""
+msgstr "Відкрити Менеджер наборів змін"
msgid "Changeset comment"
msgstr "Коментар набору змін"
@@ -11615,6 +11645,187 @@ msgstr "(посилання: "
msgid "Select the map painting styles"
msgstr "Виберіть стилі відтворення мапи"
+msgid "Error - file not found: ''{0}''"
+msgstr "Помилка – файл не знайдено: ''{0}''"
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr "Очікувалось ціле число для параметра ''{0}'', замість ''{1}''"
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr "Очікувалось ціле число >=0 для параметра ''{0}'', замість ''{1}''"
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr "Неможливо обробити параметр {0}: {1}"
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+"Очікувались ключ та значення розділені символом '':'' для параметра ''{0}'', "
+"замість ''{1}''"
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+"Очікувалось число з плаваючою точкою для параметра ''{0}'', замість ''{1}''"
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+"Очікувались дві координати, розділені комою, для параметра ''{0}'', замість "
+"''{1}''"
+
+msgid "In option {0}: {1}"
+msgstr "В параметрі {0}: {1}"
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+"Очікувалось число з плаваючою точкою >0 для параметра ''{0}'', замість "
+"''{1}''"
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr "Очікувалось ціле число >0 для параметра ''{0}'', замість ''{1}''"
+
+msgid "JOSM rendering command line interface"
+msgstr "Інтерфейс командного рядка рендерінгу JOSM"
+
+msgid "Renders data and saves the result to an image file."
+msgstr "Показує дані та зберігає результат в графічний файл."
+
+msgid "Input data file name (.osm)"
+msgstr "назва вхідного файла даних (.osm)"
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr "Назва вихідного графічного файла (.png); типово ''{0}''"
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+"Файл стилю, що використовується для рендерінгу даних (.mapcss або .zip)"
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+"Цей параметр можна використовувати багато разів для завантаження кількох "
+"стилей."
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr "Параметри стиля (доступні в контекстному меню стиля в JOSM)"
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr "Застосовується до останнього стилю, завантаженому параметром {0}."
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+"Оберіть масштаб для рендерінга. (ціле значення, 0=вся Земля, 18=рівень "
+"вулиць)"
+
+msgid "Select the map scale"
+msgstr "Оберіть масштаб мапи"
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+"Значення 10000 дорівнює масштабу 1:10000 (1 см мапи дорівнє 100 м на "
+"місцевості; розподільча здатність дисплею 96dpi)"
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr "Параметри {0} та {1} є взаємовиключними"
+
+msgid "Area to render, default value is ''{0}''"
+msgstr "Ділянка для рендерінгу, типове значення: {0}"
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+"З ключовим словом ''{0}'' буде використовуватися завантажена ділянказ "
+"вхідного файлу .osm (якщо збережено)."
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr "Зазначте лівий нижній кут ділянки рендерінгу"
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+"Використовується в поєднанні з параметрами width та height для визначення "
+"ділянки рендрінгу"
+
+msgid "Width of the rendered area, in meter"
+msgstr "Ширина ділянки рендерінгу, в метрах"
+
+msgid "Height of the rendered area, in meter"
+msgstr "Висота ділянки рендерінгу, в метрах"
+
+msgid "Width of the target image, in pixel"
+msgstr "Ширина зображення, в пікселях"
+
+msgid "Height of the target image, in pixel"
+msgstr "Висота зображення, в пікселях"
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr "Типова проекція ''{0}'' (web-Mercator)"
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+"Максимальна ширина/висота зображення в пікселях (''{0}'' - без обмежень), "
+"типово: {1}"
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+"Для зазначення ділянки для рендерінгу та масштабу, параметри можна "
+"поєднувати різним чином"
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+"Якщо не зазначено ні ''{0}'', а ні ''{1}'', типове значення {2} набирає "
+"чинності та використовуються межі завантаженої ділянки, збереженої в файлі "
+"*.osm."
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+"Аргумент {0} зазначено, але масштаб не може бути визначений серед інших "
+"аргументів"
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr "Аргумент {0} зазначено, очікувалось {1} або {2}"
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr "{0} режим, але неможливо визначити межі у вхідному файлі *.osm"
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+"Неможливо визначити масштаб, очікується один з параметрів {0}, {1}, {2} або "
+"{3}"
+
+msgid "Missing argument - input data file ({0})"
+msgstr "Відсутній параметр - вхідний файл ({0})"
+
+msgid "In .osm data file ''{0}'' - "
+msgstr "В файлі даних .osm ''{0}'' - "
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr "Відсутній параметр - очікується принаймні один стиль ({0})"
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+"Розмір зображення ({0}x{1}) перевищує максимально допустимі значення {2} "
+"(використовуйте параметр {3} щоб змінити обмеження)"
+
+msgid "Style setting not found: ''{0}''"
+msgstr "Незнайдені параметри стилю: ''{0}''"
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11641,6 +11852,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Не вдалось розібрати стилі кольорів мапи з ''{0}''. Помилка: {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Збій пошуку зображення ''{0}''"
@@ -15462,6 +15678,15 @@ msgstr "Пропустити шар та продовжити"
msgid "expected .jos file inside .joz archive"
msgstr "очікувався файл .jos всередині архіву .joz"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr "Збій створення відсутньої теки налаштувань втулків: {0}"
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr "Збій створення відсутньої теки даних користувача для втулків: {0}"
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr "Збій створення відсутньої теки кешу втулків: {0}"
+
msgid "Skip download"
msgstr "Пропустити завантаження"
@@ -16515,7 +16740,7 @@ msgstr "житловий район"
msgctxt "landuse"
msgid "greenfield"
-msgstr "нова ділянка під забудову"
+msgstr "ділянка під рнову забудову"
msgctxt "landuse"
msgid "village_green"
@@ -17080,6 +17305,12 @@ msgstr "Мотоцикл"
msgid "Motorcar"
msgstr "Автомобіль"
+msgid "Minimum age"
+msgstr "Мінімальний вік"
+
+msgid "Maximum age"
+msgstr "Максимальний вік"
+
msgid "Reference"
msgstr "Позначення"
@@ -17727,6 +17958,10 @@ msgid "platform"
msgstr "платформа"
msgctxt "power"
+msgid "rooftop"
+msgstr "на даху"
+
+msgctxt "power"
msgid "kiosk"
msgstr "будка"
@@ -17775,6 +18010,42 @@ msgstr "пара"
msgid "vacuum"
msgstr "вакуум"
+msgid "Material"
+msgstr "Матеріал"
+
+msgid "plastic"
+msgstr "пластик"
+
+msgid "steel"
+msgstr "сталь"
+
+msgid "stone"
+msgstr "камінь"
+
+msgid "Location transition"
+msgstr "З’єднання з підземним кабелем"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Номінальна потужність (кВА /МВА)"
+
+msgid "2700 kVA"
+msgstr "2700 кВА"
+
+msgid "12500 kVA"
+msgstr "12500 кВА"
+
+msgid "15 MVA"
+msgstr "15 МВА"
+
+msgid "50 MVA"
+msgstr "50 МВА"
+
+msgid "100 MVA"
+msgstr "100 МВА"
+
+msgid "Phases"
+msgstr "Фази"
+
msgid "Max. weight (tonnes)"
msgstr "Макс. вага (в тоннах)"
@@ -18721,12 +18992,6 @@ msgstr "Перепони"
msgid "Block"
msgstr "Блок"
-msgid "Material"
-msgstr "Матеріал"
-
-msgid "stone"
-msgstr "камінь"
-
msgid "Bollard"
msgstr "Стовпчик"
@@ -18739,9 +19004,6 @@ msgstr "піднімається"
msgid "removable"
msgstr "знімний"
-msgid "plastic"
-msgstr "пластик"
-
msgid "Cycle Barrier"
msgstr "Перешкода для велосипедів"
@@ -19518,6 +19780,12 @@ msgstr "паливна суміш 1/25 (для мопедів)"
msgid "1/50 mix (mofa/moped)"
msgstr "паливна суміш 1/50 (для мопедів)"
+msgid "Additives:"
+msgstr "Добавки:"
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr "Рідина для очищення викидів дизельних двигунів (AdBlue/AUS32))"
+
msgid "Fuel cards:"
msgstr "Паливні картки:"
@@ -20227,9 +20495,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Кількість екранів"
-msgid "Minimum age"
-msgstr "Мінімальний вік"
-
msgid "Zoo"
msgstr "Зоопарк"
@@ -22425,24 +22690,6 @@ msgctxt "power"
msgid "industrial"
msgstr "промислова"
-msgid "Power rating (kVA/MVA)"
-msgstr "Номінальна потужність (кВА /МВА)"
-
-msgid "2700 kVA"
-msgstr "2700 кВА"
-
-msgid "12500 kVA"
-msgstr "12500 кВА"
-
-msgid "15 MVA"
-msgstr "15 МВА"
-
-msgid "50 MVA"
-msgstr "50 МВА"
-
-msgid "100 MVA"
-msgstr "100 МВА"
-
msgid "Gas insulated"
msgstr "Елегазовий"
@@ -22468,9 +22715,6 @@ msgctxt "power"
msgid "yes"
msgstr "так"
-msgid "Phases"
-msgstr "Фази"
-
msgid "Power Switchgear"
msgstr "Розподілювач"
@@ -22490,6 +22734,25 @@ msgstr "З’єднувач"
msgid "Power Switch"
msgstr "Вимикач"
+msgid "Type of switch"
+msgstr "Тип розʼєднувача"
+
+msgctxt "power"
+msgid "mechanical"
+msgstr "механічний"
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr "автоматичний вимикач"
+
+msgctxt "power"
+msgid "disconnector"
+msgstr "розʼєднувач"
+
+msgctxt "power"
+msgid "earthing"
+msgstr "заземлювач"
+
msgid "Power Converter"
msgstr "Конвертер"
@@ -22591,9 +22854,6 @@ msgstr "трубчастий"
msgid "solid"
msgstr "суцільна"
-msgid "steel"
-msgstr "сталь"
-
msgctxt "color"
msgid "red/white"
msgstr "червоний/білий"
@@ -22756,18 +23016,21 @@ msgstr "потрійні"
msgid "Incomplete tower"
msgstr "неповні"
-msgid "Location transition"
-msgstr "З’єднання з підземним кабелем"
-
msgid "Pole"
msgstr "Опора"
-msgid "Pole with Transformer"
-msgstr "Опора з траснформатором"
+msgid "Pole with Switch"
+msgstr "Стовб з розʼєднувачем"
msgid "Pole Attributes:"
msgstr "Атрибути опори:"
+msgid "Switch Attributes:"
+msgstr "Параметри розʼєднувача"
+
+msgid "Pole with Transformer"
+msgstr "Опора з траснформатором"
+
msgid "Transformer Attributes:"
msgstr "Атрибути трансформатора:"
@@ -22880,6 +23143,52 @@ msgstr "Поле бою"
msgid "Palaeontological Site"
msgstr "Палеонтологічні пам’ятки"
+msgid "Grave"
+msgstr "Могила"
+
+msgid "Tomb"
+msgstr "Гробниця"
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr "курган"
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr "висічена в скелі"
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr "гіпогей"
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr "військове поховання"
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr "мавзолей"
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr "колумбарій"
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr "крипт"
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr "піраміда"
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr "саркофаг"
+
+msgctxt "tomb"
+msgid "vault"
+msgstr "склеп"
+
msgid "Monument"
msgstr "Монумент"
@@ -23657,6 +23966,9 @@ msgstr "Ізольоване житло"
msgid "Suburb"
msgstr "Передмістя"
+msgid "Quarter"
+msgstr "Квартал"
+
msgid "Neighbourhood"
msgstr "Мікрорайон"
@@ -24026,6 +24338,9 @@ msgstr "Теплиця"
msgid "Plant Nursery"
msgstr "Розплідник рослин"
+msgid "Salt Pond"
+msgstr "Соляний ставок"
+
msgid "Aquaculture"
msgstr "Аква-ферма"
@@ -24635,11 +24950,21 @@ msgstr "Маршрути"
msgid "Bicycle Route"
msgstr "Веломаршрут"
+msgctxt "network"
+msgid "international"
+msgstr "міжнародний"
+
+msgctxt "network"
msgid "national"
-msgstr "національна"
+msgstr "національний"
+
+msgctxt "network"
+msgid "regional"
+msgstr "регіональний"
+msgctxt "network"
msgid "local"
-msgstr "місцева"
+msgstr "місцевий"
msgid "Mountain Biking Route"
msgstr "Гірський веломаршрут"
@@ -24889,6 +25214,9 @@ msgstr "GPS-треки OpenStreetMap"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr "Публічні GPS-треки, завантажені в OpenStreetMap."
+msgid "OpenTopoMap"
+msgstr "OpenTopoMap"
+
msgid "Public Transport (ÖPNV)"
msgstr "Громадський транспорт (ÖPNV)"
@@ -24901,8 +25229,8 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr "Stamen Terrain"
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
-msgstr "Камбоджа, Лаос, Таїланд, Вʼєтнам, Мʼянма (двомовна)"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (шар)"
@@ -24944,7 +25272,7 @@ msgid "Waymarked Trails: Winter Sports"
msgstr "Waymarked Trails: Зимові види спорту"
msgid "Wikimedia Map"
-msgstr ""
+msgstr "Мапа Вікімедії"
msgid "OSM Inspector: Geometry"
msgstr "OSM Inspector: Геометрія"
@@ -24980,6 +25308,13 @@ msgstr ""
"Знімки кінця літа, там де звичайні джерела сильно обмежені хмарами і снігом "
"(true color)"
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr "imagico.de - знімки OSM для мапінгу: Південні Трансантарктичні гори"
@@ -25009,7 +25344,7 @@ msgid "IGN topographical map (TMS)"
msgstr "IGN топографічна мапа (TMS)"
msgid "IGN topographical map (WMTS)"
-msgstr ""
+msgstr "IGN топографічна мапа (WMTS)"
msgid "IGN topographical map (WMS)"
msgstr "IGN топографічна мапа (WMS)"
@@ -25093,19 +25428,19 @@ msgid "IGN orthophoto Rosario (WMTS)"
msgstr "IGN ортофото Росаріо (WMTS)"
msgid "IGN orthophoto Salta (WMTS)"
-msgstr ""
+msgstr "IGN ортофото Сальта (WMTS)"
msgid "IGN orthophoto Salta 1 (WMTS)"
-msgstr ""
+msgstr "IGN ортофото Сальта 1 (WMTS)"
msgid "IGN orthophoto Salta 2 (WMTS)"
-msgstr ""
+msgstr "IGN ортофото Сальта 2 (WMTS)"
msgid "IGN orthophoto Salta 3 (WMTS)"
-msgstr ""
+msgstr "IGN ортофото Сальта 3 (WMTS)"
msgid "IGN orthophoto Salta 4 (WMTS)"
-msgstr ""
+msgstr "IGN ортофото Сальта 4 (WMTS)"
msgid "IGN orthophoto Salto Grande (WMTS)"
msgstr "IGN ортофото Сальто-Гранде (WMTS)"
@@ -25312,6 +25647,9 @@ msgstr "URBIS 2015 - аерофото"
msgid "URBIS 2016 aerial imagery"
msgstr "URBIS 2016 - аерофото"
+msgid "URBIS 2017 aerial imagery"
+msgstr "Аерофото URBIS 2017"
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW(allonie) цифрове зображення PICC"
@@ -25327,6 +25665,9 @@ msgstr "SPW(allonie) 2012-2013 аерофото"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 аерофото"
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr "Автобусний маршрут TEC"
@@ -25645,6 +25986,9 @@ msgstr "BDOrtho IGN"
msgid "Bordeaux - 2012"
msgstr "Бордо - 2012"
+msgid "Bordeaux - 2016"
+msgstr "Бордо - 2016"
+
msgid "Cadastre"
msgstr "Кадастр"
@@ -26616,6 +26960,9 @@ msgstr "Фієз - ортофото 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr "Кантон Базель-Штадт 2015"
+msgid "Kanton Basel-Stadt 2017"
+msgstr "Кантон Базель-Штадт 2017"
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr "Кантон Базель - ландшафт 10см (2015)"
@@ -26668,11 +27015,11 @@ msgstr "USGS Топографічні мапи"
msgid "USGS Large Scale Imagery"
msgstr "USGS: великомасштабні знимки"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012 шар доріг"
+msgid "TIGER Roads 2012"
+msgstr "Дороги TIGER 2012"
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "Нові та неперевірені дороги TIGER (2015)"
+msgid "TIGER Roads 2014"
+msgstr "Дороги TIGER 2014"
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -26683,6 +27030,16 @@ msgstr ""
"більш низьких масштабів – тільки зміни починаючи з 2006 року, крім вже "
"наявних в OpenStreetMap"
+msgid "TIGER Roads 2017"
+msgstr "Дороги TIGER 2017"
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+"Жовті = дані US Censu на умовах суспільного надбання. Червоні = дані "
+"відсутні в OpenStreetMap"
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Ділянки"
@@ -26754,6 +27111,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr "Міська агломерація Сан-Хуан: ортофото USACE 2013"
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr "Округ Сан-Хуан (Вашингтон) - аерофото 2013"
@@ -27845,6 +28205,16 @@ msgstr "{0} на лінії, замість точки."
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} на лінії, а повинен бути на зв’язку"
+msgid "node connects highway and building"
+msgstr "точка приєднує дорогу до будівлі"
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+"Об''єкт з позицією 0.00E 0.00N. У цьому місці немає нічого, окрім вже "
+"позначеного метеорологічного буя."
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr "{0} разом з {1} на точці. Вилучить {0}."
@@ -27917,16 +28287,6 @@ msgstr ""
"{0} – теґ для лінійних водних обʼєктів. Для позначення полігональних водних "
"обʼєктів використовуйте {1} + {2}."
-msgid "node connects highway and building"
-msgstr "точка приєднує дорогу до будівлі"
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-"Об''єкт з позицією 0.00E 0.00N. У цьому місці немає нічого, окрім вже "
-"позначеного метеорологічного буя."
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
"Поромний маршрут не пов''язаний з дорожньою мережею або його відгалуженнями."
@@ -27984,11 +28344,11 @@ msgstr "пусте значення в рядку з розділювачами
msgid "numerical key"
msgstr "числовий ключ"
-msgid "layer tag with + sign"
-msgstr "теґ layer із знаком «+»"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "рівень повинен бути між -5 та 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr "̱{0} повине бути тільки числом (з необовʼязковим кроком 0.5)"
@@ -31069,34 +31429,34 @@ msgid "Add \"source=...\" to elements?"
msgstr "Додати до елементів \"source=…\"?"
msgid "Download from Cadastre"
-msgstr ""
+msgstr "Завантажити з кадастру"
msgid "Objects:"
-msgstr ""
+msgstr "Обʼєкти:"
msgid "Select to download buildings in the selected download area."
-msgstr ""
+msgstr "Позначте для завантаження будинків у виділеній ділянці."
msgid "address"
msgstr "адреса"
msgid "Select to download addresses in the selected download area."
-msgstr ""
+msgstr "Позначте для завантаження адрес у виділеній ділянці."
msgid "symbol"
msgstr "символ"
msgid "Select to download symbols in the selected download area."
-msgstr ""
+msgstr "Позначте для завантаження символів у виділеній ділянці."
msgid "Select to download water bodies in the selected download area."
-msgstr ""
+msgstr "Позначте для завантаження водойм у виділеній ділянці."
msgid "parcel"
msgstr "ділянка"
msgid "Select to download cadastral parcels in the selected download area."
-msgstr ""
+msgstr "Позначте для завантаження участків у виділеній ділянці."
msgid "parcel number"
msgstr "номер ділянки"
@@ -31104,18 +31464,19 @@ msgstr "номер ділянки"
msgid ""
"Select to download cadastral parcel numbers in the selected download area."
msgstr ""
+"Позначте для завантаження кадастрових номерів участків у виділеній ділянці."
msgid "section"
msgstr "розділ"
msgid "Select to download cadastral sections in the selected download area."
-msgstr ""
+msgstr "Позначте для завантаження кадастрових розділів у виділеній ділянці."
msgid "locality"
msgstr "місце знаходження"
msgid "Select to download localities in the selected download area."
-msgstr ""
+msgstr "Позначте для завантаження місцевостей у виділеній ділянці"
msgid "commune"
msgstr "община"
@@ -31123,19 +31484,25 @@ msgstr "община"
msgid ""
"Select to download municipality boundary in the selected download area."
msgstr ""
+"Позначте для завантаження кордонів муніципалітетів у виділеній ділянці"
msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+"<html>Нічого не вибрано.<br>Будь ласка, оберіть що ви бажаєте "
+"завантажити.</html>"
+
+msgid "Download cadastre data"
+msgstr "Завантажити дані кадастру"
msgid "Recipient"
-msgstr ""
+msgstr "Адресат"
msgid "Diffusion restriction"
-msgstr ""
+msgstr "Дифузійне обмеження"
msgid "Cadastre Edigeo files"
-msgstr ""
+msgstr "Кадастровий файл Edigeo"
msgid "Replace original background by JOSM background color."
msgstr "Замінити тло оригіналу кольором тла JOSM"
@@ -33062,9 +33429,6 @@ msgstr "Вилучити це"
msgid "Delete this&older"
msgstr "Вилучити це та старіше"
-msgid "km/h"
-msgstr "км/г"
-
msgid "Track name: "
msgstr "Трек: "
@@ -34602,6 +34966,9 @@ msgstr "позитивне число або нічого"
msgid "Speed:"
msgstr "Швидкість:"
+msgid "km/h"
+msgstr "км/г"
+
msgid "direction"
msgstr "напрямок"
@@ -35892,6 +36259,12 @@ msgstr "Виділіть тільки один об’єкт"
msgid "Select a map object"
msgstr "Виділіть об’єкт на мапі"
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr "Панель дій з формами"
@@ -38359,24 +38732,25 @@ msgstr ""
"Додає теґ ''wikipedia'', який відповідає певній статті про виділені об’єкти"
msgid "Download from Wikosm API"
-msgstr ""
+msgstr "Завантажити з Wikosm API"
msgid ""
"Find places of education at least 2km, and at most 3km from the center of "
"the selection"
msgstr ""
+"Пошук навчальних закладів у межах від 2 до 3 км від центру виділеної ділянки"
msgid "Show/hide Wikosm snippet list"
-msgstr ""
+msgstr "Показати/приховати фрагменти запитів Wikosm"
msgid "help"
-msgstr ""
+msgstr "довідка"
msgid "Server: "
-msgstr ""
+msgstr "Сервер: "
msgid "Wikidata+OSM server"
-msgstr ""
+msgstr "Сервер Wikidata+OSM"
msgid "The Ultimate WMS Super-speed Turbo Challenge II"
msgstr "The Ultimate WMS Super-speed Turbo Challenge II"
diff --git a/i18n/po/ur.po b/i18n/po/ur.po
index 944539b..090ef43 100644
--- a/i18n/po/ur.po
+++ b/i18n/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2010-05-13 04:15+0000\n"
"Last-Translator: Shoaib Mirza <Unknown>\n"
"Language-Team: Urdu <ur at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 05:02+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:05+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: ur\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2911,24 +2911,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2995,18 +2977,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3520,6 +3497,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4188,6 +4183,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4875,6 +4873,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5002,6 +5019,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5299,6 +5321,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8040,6 +8065,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10528,6 +10556,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10546,6 +10724,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13965,6 +14148,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15339,6 +15531,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15982,6 +16180,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16030,6 +16232,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16956,12 +17194,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16974,9 +17206,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17748,6 +17977,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18457,9 +18692,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20655,24 +20887,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20698,9 +20912,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20718,6 +20929,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20819,9 +21049,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20984,18 +21211,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21108,6 +21338,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21885,6 +22161,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22233,6 +22512,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22838,9 +23120,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23084,6 +23376,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23096,7 +23391,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23173,6 +23468,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23499,6 +23801,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23514,6 +23819,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23818,6 +24126,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24741,6 +25052,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24788,10 +25102,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24800,6 +25114,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24861,6 +25183,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25800,6 +26125,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25866,14 +26199,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25924,10 +26249,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28687,6 +29012,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30489,9 +30817,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31925,6 +32250,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33160,6 +33488,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/vi.po b/i18n/po/vi.po
index 914e46d..59145e7 100644
--- a/i18n/po/vi.po
+++ b/i18n/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2015-05-14 20:17+0000\n"
"Last-Translator: Mạnh <laituanmanh32 at gmail.com>\n"
"Language-Team: Vietnamese <vi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-09-30 05:03+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:06+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: vi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3089,24 +3089,6 @@ msgstr "giá trị vĩ độ bất hợp pháp '' {0} ''"
msgid "Illegal longitude value ''{0}''"
msgstr "giá trị kinh độ bất hợp pháp '' {0} ''"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "Không thể tạo thư mục mất tích cache: {0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html> Không thể tạo thư mục mất tích cache: {0} </ html>"
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -3185,20 +3167,15 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "Paint phong cách {0}: {1}"
-
msgid "Layer: {0}"
msgstr "Layer: {0}"
+msgid "Paint style {0}: {1}"
+msgstr "Paint phong cách {0}: {1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "Không thể kéo dài ưu đãi để '' {0} ''"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr ""
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr "Preference thiết lập {0} đã được gỡ bỏ vì nó không còn được sử dụng."
@@ -3748,6 +3725,24 @@ msgstr "văn bản"
msgid "areatext"
msgstr "areatext"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Không thể tạo thư mục mất tích cache: {0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html> Không thể tạo thư mục mất tích cache: {0} </ html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4436,6 +4431,9 @@ msgstr "phong cách Area trên đường bên ngoài"
msgid "Multipolygon is not closed"
msgstr "Multipolygon là không đóng cửa"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -5146,6 +5144,25 @@ msgstr "sở thích tải hình ảnh"
msgid "usage"
msgstr "sử dụng"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "tùy chọn"
@@ -5284,6 +5301,11 @@ msgstr "Thiết lập mặc định"
msgid "Creating main GUI"
msgstr "Tạo GUI chính"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr "Đang cập nhật plugins"
@@ -5592,6 +5614,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8505,6 +8530,9 @@ msgstr ""
"<Html> layer '' {0} '' đã có một cuộc xung đột với đối tượng <br> '' {1} ''. "
"<br> HãyGiải quyết cuộc xung đột này đầu tiên, sau đó thử lại. </ Html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr "Chọn các đối tượng cho các thành viên liên quan được lựa chọn"
@@ -11187,6 +11215,156 @@ msgstr "(URL là: "
msgid "Select the map painting styles"
msgstr "Chọn các kiểu vẽ bản đồ"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -11206,6 +11384,11 @@ msgstr "Không thể tải Mappaint phong cách từ '' {0} '' ngoại lệ là:
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Không phân tích Mappaint phong cách từ '' {0} '' Lỗi là:. {1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "Không thể xác định vị trí hình ảnh '' {0} ''"
@@ -14953,6 +15136,15 @@ msgstr "Bỏ lớp và tiếp tục"
msgid "expected .jos file inside .joz archive"
msgstr "dự kiến .jos nộp bên .joz lưu trữ"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "Bỏ download"
@@ -16467,6 +16659,12 @@ msgstr "xe máy"
msgid "Motorcar"
msgstr "Tô"
+msgid "Minimum age"
+msgstr "Tuổi tối thiểu"
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "tham khảo"
@@ -17114,6 +17312,10 @@ msgid "platform"
msgstr "nền tảng"
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr "kiosk"
@@ -17162,6 +17364,42 @@ msgstr "hơi"
msgid "vacuum"
msgstr "chân không"
+msgid "Material"
+msgstr "Chất liệu"
+
+msgid "plastic"
+msgstr "nhựa"
+
+msgid "steel"
+msgstr "thép"
+
+msgid "stone"
+msgstr "đá"
+
+msgid "Location transition"
+msgstr "Địa điểm chuyển tiếp"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "Công suất (kVA / MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "giai đoạn"
+
msgid "Max. weight (tonnes)"
msgstr "Max. trọng lượng (tấn)"
@@ -18106,12 +18344,6 @@ msgstr "rào cản"
msgid "Block"
msgstr "Block"
-msgid "Material"
-msgstr "Chất liệu"
-
-msgid "stone"
-msgstr "đá"
-
msgid "Bollard"
msgstr "Bollard"
@@ -18124,9 +18356,6 @@ msgstr "tăng"
msgid "removable"
msgstr "di động"
-msgid "plastic"
-msgstr "nhựa"
-
msgid "Cycle Barrier"
msgstr "Cycle Barrier"
@@ -18901,6 +19130,12 @@ msgstr "1/25 hỗn hợp (MOFA / công suất thấp)"
msgid "1/50 mix (mofa/moped)"
msgstr "1/50 hỗn hợp (MOFA / công suất thấp)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr "thẻ nhiên liệu:"
@@ -19612,9 +19847,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "Số lượng màn hình"
-msgid "Minimum age"
-msgstr "Tuổi tối thiểu"
-
msgid "Zoo"
msgstr "Zoo"
@@ -21810,24 +22042,6 @@ msgctxt "power"
msgid "industrial"
msgstr "công nghiệp"
-msgid "Power rating (kVA/MVA)"
-msgstr "Công suất (kVA / MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "khí cách nhiệt"
@@ -21853,9 +22067,6 @@ msgctxt "power"
msgid "yes"
msgstr "yes"
-msgid "Phases"
-msgstr "giai đoạn"
-
msgid "Power Switchgear"
msgstr "Power Switchgear"
@@ -21875,6 +22086,25 @@ msgstr "Bay Power"
msgid "Power Switch"
msgstr "Power Switch"
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr "Power Converter"
@@ -21976,9 +22206,6 @@ msgstr "hình ống"
msgid "solid"
msgstr "rắn"
-msgid "steel"
-msgstr "thép"
-
msgctxt "color"
msgid "red/white"
msgstr "màu đỏ / trắng"
@@ -22141,18 +22368,21 @@ msgstr "Triple tháp"
msgid "Incomplete tower"
msgstr "tháp Incomplete"
-msgid "Location transition"
-msgstr "Địa điểm chuyển tiếp"
-
msgid "Pole"
msgstr "Pole"
-msgid "Pole with Transformer"
-msgstr "Pole với Transformer"
+msgid "Pole with Switch"
+msgstr ""
msgid "Pole Attributes:"
msgstr "Cực thuộc tính:"
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr "Pole với Transformer"
+
msgid "Transformer Attributes:"
msgstr "Transformer thuộc tính:"
@@ -22265,6 +22495,52 @@ msgstr "Battlefield"
msgid "Palaeontological Site"
msgstr "Site cổ sinh vật học"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "Tượng đài"
@@ -23042,6 +23318,9 @@ msgstr "Isolated Dwelling"
msgid "Suburb"
msgstr "Ngoại ô"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "Neighbourhood"
@@ -23408,6 +23687,9 @@ msgstr "Greenhouse Horticulture"
msgid "Plant Nursery"
msgstr "Plant Nursery"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -24018,9 +24300,19 @@ msgstr "đường"
msgid "Bicycle Route"
msgstr "Bicycle Route"
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -24264,6 +24556,9 @@ msgstr "OpenStreetMap GPS vết"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr "Giao thông vận tải công cộng (ÖPNV)"
@@ -24276,7 +24571,7 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -24353,6 +24648,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -24679,6 +24981,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -24694,6 +24999,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -24998,6 +25306,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Địa chính"
@@ -25923,6 +26234,9 @@ msgstr "Fiez Orthophoto 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -25970,10 +26284,10 @@ msgstr "USGS địa hình Maps"
msgid "USGS Large Scale Imagery"
msgstr "USGS mô lớn Imagery"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 2012 Đường Overlay"
+msgid "TIGER Roads 2012"
+msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -25982,6 +26296,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Bưu kiện"
@@ -26043,6 +26365,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -26994,6 +27319,14 @@ msgstr "{0} trên một cách. Nên được sử dụng trên một nút."
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} trên một cách. Nên được sử dụng trong một mối quan hệ"
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -27060,14 +27393,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -27120,11 +27445,11 @@ msgstr "giá trị sản phẩm nào trong dấu chấm phẩy '' {0} ''"
msgid "numerical key"
msgstr "phím số"
-msgid "layer tag with + sign"
-msgstr "layer tag với + dấu hiệu"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "lớp nên được giữa -5 và 5"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr ""
@@ -30143,6 +30468,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -32048,9 +32376,6 @@ msgstr "Xóa này"
msgid "Delete this&older"
msgstr "Xóa này & cũ"
-msgid "km/h"
-msgstr "km / h"
-
msgid "Track name: "
msgstr "tên Track: "
@@ -33559,6 +33884,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr "km / h"
+
msgid "direction"
msgstr ""
@@ -34828,6 +35156,12 @@ msgstr "Chỉ chọn một đối tượng"
msgid "Select a map object"
msgstr "Chọn một đối tượng bản đồ"
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/wae.po b/i18n/po/wae.po
index 1f7613e..81f5b32 100644
--- a/i18n/po/wae.po
+++ b/i18n/po/wae.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
"PO-Revision-Date: 2016-03-09 22:17+0000\n"
"Last-Translator: Simon Legner <Unknown>\n"
"Language-Team: Walser <wae at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-09-30 05:07+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -2910,24 +2910,6 @@ msgstr ""
msgid "Illegal longitude value ''{0}''"
msgstr ""
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr ""
-
msgid "Unable to delete temporary file {0}"
msgstr ""
@@ -2994,18 +2976,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr ""
-
msgid "Layer: {0}"
msgstr ""
-msgid "Failed to persist preferences to ''{0}''"
+msgid "Paint style {0}: {1}"
msgstr ""
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3519,6 +3496,24 @@ msgstr ""
msgid "areatext"
msgstr ""
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr ""
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4187,6 +4182,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4874,6 +4872,25 @@ msgstr ""
msgid "usage"
msgstr ""
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr ""
@@ -5001,6 +5018,11 @@ msgstr ""
msgid "Creating main GUI"
msgstr ""
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr ""
@@ -5298,6 +5320,9 @@ msgstr ""
msgid "Shrink"
msgstr ""
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8039,6 +8064,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr ""
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr ""
@@ -10527,6 +10555,156 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10545,6 +10723,11 @@ msgstr ""
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -13964,6 +14147,15 @@ msgstr ""
msgid "expected .jos file inside .joz archive"
msgstr ""
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr ""
@@ -15338,6 +15530,12 @@ msgstr ""
msgid "Motorcar"
msgstr ""
+msgid "Minimum age"
+msgstr ""
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr ""
@@ -15981,6 +16179,10 @@ msgid "platform"
msgstr ""
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr ""
@@ -16029,6 +16231,42 @@ msgstr ""
msgid "vacuum"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Location transition"
+msgstr ""
+
+msgid "Power rating (kVA/MVA)"
+msgstr ""
+
+msgid "2700 kVA"
+msgstr ""
+
+msgid "12500 kVA"
+msgstr ""
+
+msgid "15 MVA"
+msgstr ""
+
+msgid "50 MVA"
+msgstr ""
+
+msgid "100 MVA"
+msgstr ""
+
+msgid "Phases"
+msgstr ""
+
msgid "Max. weight (tonnes)"
msgstr ""
@@ -16955,12 +17193,6 @@ msgstr ""
msgid "Block"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Bollard"
msgstr ""
@@ -16973,9 +17205,6 @@ msgstr ""
msgid "removable"
msgstr ""
-msgid "plastic"
-msgstr ""
-
msgid "Cycle Barrier"
msgstr ""
@@ -17747,6 +17976,12 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr ""
@@ -18456,9 +18691,6 @@ msgstr ""
msgid "Number of screens"
msgstr ""
-msgid "Minimum age"
-msgstr ""
-
msgid "Zoo"
msgstr ""
@@ -20654,24 +20886,6 @@ msgctxt "power"
msgid "industrial"
msgstr ""
-msgid "Power rating (kVA/MVA)"
-msgstr ""
-
-msgid "2700 kVA"
-msgstr ""
-
-msgid "12500 kVA"
-msgstr ""
-
-msgid "15 MVA"
-msgstr ""
-
-msgid "50 MVA"
-msgstr ""
-
-msgid "100 MVA"
-msgstr ""
-
msgid "Gas insulated"
msgstr ""
@@ -20697,9 +20911,6 @@ msgctxt "power"
msgid "yes"
msgstr ""
-msgid "Phases"
-msgstr ""
-
msgid "Power Switchgear"
msgstr ""
@@ -20717,6 +20928,25 @@ msgstr ""
msgid "Power Switch"
msgstr ""
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr ""
@@ -20818,9 +21048,6 @@ msgstr ""
msgid "solid"
msgstr ""
-msgid "steel"
-msgstr ""
-
msgctxt "color"
msgid "red/white"
msgstr ""
@@ -20983,18 +21210,21 @@ msgstr ""
msgid "Incomplete tower"
msgstr ""
-msgid "Location transition"
-msgstr ""
-
msgid "Pole"
msgstr ""
-msgid "Pole with Transformer"
+msgid "Pole with Switch"
msgstr ""
msgid "Pole Attributes:"
msgstr ""
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr ""
+
msgid "Transformer Attributes:"
msgstr ""
@@ -21107,6 +21337,52 @@ msgstr ""
msgid "Palaeontological Site"
msgstr ""
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr ""
@@ -21884,6 +22160,9 @@ msgstr ""
msgid "Suburb"
msgstr ""
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr ""
@@ -22232,6 +22511,9 @@ msgstr ""
msgid "Plant Nursery"
msgstr ""
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr ""
@@ -22837,9 +23119,19 @@ msgstr ""
msgid "Bicycle Route"
msgstr ""
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
msgstr ""
@@ -23083,6 +23375,9 @@ msgstr ""
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -23095,7 +23390,7 @@ msgstr ""
msgid "Stamen Terrain"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -23172,6 +23467,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23498,6 +23800,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23513,6 +23818,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23817,6 +24125,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr ""
@@ -24740,6 +25051,9 @@ msgstr ""
msgid "Kanton Basel-Stadt 2015"
msgstr ""
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr ""
@@ -24787,10 +25101,10 @@ msgstr ""
msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24799,6 +25113,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24860,6 +25182,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25799,6 +26124,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
@@ -25865,14 +26198,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25923,10 +26248,10 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
+msgid "{0} should be an integer value between -5 and 5"
msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
@@ -28686,6 +29011,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30488,9 +30816,6 @@ msgstr ""
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr ""
-
msgid "Track name: "
msgstr ""
@@ -31924,6 +32249,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr ""
+
msgid "direction"
msgstr ""
@@ -33159,6 +33487,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/zh_CN.po b/i18n/po/zh_CN.po
index 334393d..deae92a 100644
--- a/i18n/po/zh_CN.po
+++ b/i18n/po/zh_CN.po
@@ -10,16 +10,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-10-02 17:36+0000\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-04 12:19+0000\n"
"Last-Translator: Austin Zhu <Unknown>\n"
"Language-Team: 汉语 <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-10-03 04:34+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: zh_CN\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2897,24 +2897,6 @@ msgstr "非法纬度值“{0}”"
msgid "Illegal longitude value ''{0}''"
msgstr "非法经度值“{0}”"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr "创建丢失偏好目录失败: {0}"
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr "<html>创建丢失偏好目录失败: {0}</html>"
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr "创建丢失用户数据目录失败: {0}"
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr "<html>创建丢失用户数据目录失败: {0}</html>"
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "无法创建丢失的缓存目录：{0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>无法创建丢失的缓存目录：{0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "无法删除临时文件 {0}"
@@ -2981,20 +2963,15 @@ msgstr "无法加载默认缓存文件：{0}"
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr "无法删除错误的默认缓存文件：{0}"
-msgid "Paint style {0}: {1}"
-msgstr "绘画样式 {0}：{1}"
-
msgid "Layer: {0}"
msgstr "图层：{0}"
+msgid "Paint style {0}: {1}"
+msgstr "绘画样式 {0}：{1}"
+
msgid "Failed to persist preferences to ''{0}''"
msgstr "无法保持首选项“{0}”"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
-msgstr "尝试启用 IPv6 网络，优先使用 IPv6(只适用于 IPv6 早期启动时)。"
-
msgid "Preference setting {0} has been removed since it is no longer used."
msgstr "首选项 {0} 已经被删除，因为它已不再使用了。"
@@ -3507,6 +3484,24 @@ msgstr "文字"
msgid "areatext"
msgstr "区域文字"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr "创建丢失偏好目录失败: {0}"
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr "<html>创建丢失偏好目录失败: {0}</html>"
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr "创建丢失用户数据目录失败: {0}"
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr "<html>创建丢失用户数据目录失败: {0}</html>"
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "无法创建丢失的缓存目录：{0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>无法创建丢失的缓存目录：{0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr "期望元素“{0}”，得到“{1}”"
@@ -4176,6 +4171,9 @@ msgstr "面状要素采用多重多边形路径外边界表示"
msgid "Multipolygon is not closed"
msgstr "多重多边形未封闭"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr "多重多边形环共用节点"
@@ -4866,6 +4864,25 @@ msgstr "加载图像首选项中"
msgid "usage"
msgstr "用法"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "选项"
@@ -4995,6 +5012,11 @@ msgstr "设定默认值"
msgid "Creating main GUI"
msgstr "建立主窗口中"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr "尝试启用 IPv6 网络，优先使用 IPv6(只适用于 IPv6 早期启动时)。"
+
msgid "Updating plugins"
msgstr "更新插件中"
@@ -5291,6 +5313,9 @@ msgstr "放大"
msgid "Shrink"
msgstr "缩小"
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -8048,6 +8073,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr "<html>图层“{0}”已经有冲突于对象<br>“{1}”。<br>请先调解这个冲突，然后再试一次。</html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr "选择已选定关系成员中的对象"
@@ -10566,6 +10594,156 @@ msgstr "(URL 为： "
msgid "Select the map painting styles"
msgstr "选择地图的绘画样式"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10583,6 +10761,11 @@ msgstr "从“{0}”加载地图绘画风格失败。异常为：{1}"
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "从“{0}”解析地图绘画风格失败。错误为：{1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr "定位图像“{0}”时失败"
@@ -14055,6 +14238,15 @@ msgstr "跳过图层并继续"
msgid "expected .jos file inside .joz archive"
msgstr "预计包含在 .joz 归档文件内的 .jos 文件"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "跳过下载"
@@ -15447,6 +15639,12 @@ msgstr "摩托车"
msgid "Motorcar"
msgstr "汽车"
+msgid "Minimum age"
+msgstr "最低年龄"
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "编号"
@@ -16090,6 +16288,10 @@ msgid "platform"
msgstr "平台"
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr "亭"
@@ -16138,6 +16340,42 @@ msgstr "蒸汽"
msgid "vacuum"
msgstr "真空"
+msgid "Material"
+msgstr "材质"
+
+msgid "plastic"
+msgstr "塑胶"
+
+msgid "steel"
+msgstr "钢"
+
+msgid "stone"
+msgstr "石头"
+
+msgid "Location transition"
+msgstr "位置转换"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "主变容量(kVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "相数"
+
msgid "Max. weight (tonnes)"
msgstr "限重(吨)"
@@ -17064,12 +17302,6 @@ msgstr "障碍"
msgid "Block"
msgstr "水泥护栏"
-msgid "Material"
-msgstr "材质"
-
-msgid "stone"
-msgstr "石头"
-
msgid "Bollard"
msgstr "车阻柱"
@@ -17082,9 +17314,6 @@ msgstr "直立"
msgid "removable"
msgstr "可移动"
-msgid "plastic"
-msgstr "塑胶"
-
msgid "Cycle Barrier"
msgstr "自行车护栏"
@@ -17856,6 +18085,12 @@ msgstr "1/25混合（机动自行车）"
msgid "1/50 mix (mofa/moped)"
msgstr "1/50混合（机动自行车）"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr "加油卡："
@@ -18565,9 +18800,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "屏幕数"
-msgid "Minimum age"
-msgstr "最低年龄"
-
msgid "Zoo"
msgstr "动物园"
@@ -20763,24 +20995,6 @@ msgctxt "power"
msgid "industrial"
msgstr "工业"
-msgid "Power rating (kVA/MVA)"
-msgstr "主变容量(kVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "气体绝缘"
@@ -20806,9 +21020,6 @@ msgctxt "power"
msgid "yes"
msgstr "是"
-msgid "Phases"
-msgstr "相数"
-
msgid "Power Switchgear"
msgstr "开关柜"
@@ -20826,6 +21037,25 @@ msgstr "电源架"
msgid "Power Switch"
msgstr "开关"
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr "换流器"
@@ -20927,9 +21157,6 @@ msgstr "空心"
msgid "solid"
msgstr "实心"
-msgid "steel"
-msgstr "钢"
-
msgctxt "color"
msgid "red/white"
msgstr "红/白"
@@ -21092,18 +21319,21 @@ msgstr "三塔"
msgid "Incomplete tower"
msgstr "未完成塔"
-msgid "Location transition"
-msgstr "位置转换"
-
msgid "Pole"
msgstr "电竿"
-msgid "Pole with Transformer"
-msgstr "杆式变压器"
+msgid "Pole with Switch"
+msgstr ""
msgid "Pole Attributes:"
msgstr "电杆属性"
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr "杆式变压器"
+
msgid "Transformer Attributes:"
msgstr "变压器属性"
@@ -21216,6 +21446,52 @@ msgstr "战场"
msgid "Palaeontological Site"
msgstr "古生物现场"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "纪念建筑"
@@ -21993,6 +22269,9 @@ msgstr "独立住宅"
msgid "Suburb"
msgstr "郊区"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "街坊"
@@ -22341,6 +22620,9 @@ msgstr "温室园艺"
msgid "Plant Nursery"
msgstr "苗圃"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr "水产养殖"
@@ -22946,11 +23228,21 @@ msgstr "线路"
msgid "Bicycle Route"
msgstr "自行车线路"
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
-msgstr "国家"
+msgstr ""
+msgctxt "network"
+msgid "regional"
+msgstr ""
+
+msgctxt "network"
msgid "local"
-msgstr "当地"
+msgstr ""
msgid "Mountain Biking Route"
msgstr "山地自行车路线"
@@ -23196,6 +23488,9 @@ msgstr "OSM GPS 轨迹"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr "上传至OpenStreetMap的公共GPS轨迹。"
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr "公共交通(ÖPNV)"
@@ -23208,8 +23503,8 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr "Stamen 地形"
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
-msgstr "柬埔寨，老挝，泰国，越南，缅甸（双语）"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (叠加层)"
@@ -23285,6 +23580,13 @@ msgid ""
"snow (true color)"
msgstr "通常来源的夏季图像会受到云和雪严重限制(真彩色)"
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr "imagico.de 授权绘制的OSM图像: 横贯南极山脉南部"
@@ -23611,6 +23913,9 @@ msgstr "URBIS 2015年航拍图像"
msgid "URBIS 2016 aerial imagery"
msgstr "URBIS 2016年航拍图像"
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW(allonie) PICC 数个图像"
@@ -23626,6 +23931,9 @@ msgstr "SPW(allonie) 2012年-2013年航拍图像"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009年-2010年航拍图像"
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr "TEC 公交路线"
@@ -23930,6 +24238,9 @@ msgstr "BDOrtho IGN"
msgid "Bordeaux - 2012"
msgstr "波尔多(2012年)"
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Cadastre"
@@ -24853,6 +25164,9 @@ msgstr "菲耶航拍图像 (2013年)"
msgid "Kanton Basel-Stadt 2015"
msgstr "巴塞尔城航拍图像 (2015年)"
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr "巴塞尔乡村 (10厘米)(2015年)"
@@ -24900,11 +25214,11 @@ msgstr "USGS 地形图"
msgid "USGS Large Scale Imagery"
msgstr "USGS 大型图像"
-msgid "TIGER 2012 Roads Overlay"
-msgstr "TIGER 道路覆盖(2012年)"
+msgid "TIGER Roads 2012"
+msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
-msgstr "TIGER 道路 (较新但未校准)(2015年)"
+msgid "TIGER Roads 2014"
+msgstr ""
msgid ""
"At zoom level 16+, public domain map data from the US Census. At lower "
@@ -24913,6 +25227,14 @@ msgid ""
msgstr ""
"在缩放级别16以上为来自美国人口普查的公共域图数据。在较低的缩放内，只有自2006年以来的变动并且除去了已经并入OpenStreetMap的那些更改。"
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 区块"
@@ -24974,6 +25296,9 @@ msgstr "新泽西州的数字正射影像, 自然色, 1英尺分辨率"
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr "圣胡安都会区: USACE正射影像(2013年)"
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr "WA 圣胡安航拍图像(2013年)"
@@ -25913,6 +26238,14 @@ msgstr "{0} 在路径上。应用于节点上。"
msgid "{0} on a way. Should be used in a relation"
msgstr "{0} 在路径上。应用于关系中。"
+msgid "node connects highway and building"
+msgstr "节点连接道路和建筑"
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr "对象在位置0.00E 0.00N。此处没有任何东西，除了一个已绘制的气象浮筏。"
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr "{0}以及{1}在某一点上。去除{0}。"
@@ -25979,14 +26312,6 @@ msgid ""
"instead."
msgstr "{0}是用于线性水路的标签。标注水域请使用{1} + {2}。"
-msgid "node connects highway and building"
-msgstr "节点连接道路和建筑"
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr "对象在位置0.00E 0.00N。此处没有任何东西，除了一个已绘制的气象浮筏。"
-
msgid "Ferry route is not connected to the road network or branches."
msgstr "轮渡路线未连接至路网或分支路线。"
@@ -26037,11 +26362,11 @@ msgstr "分号隔开的''{0}''中有空值"
msgid "numerical key"
msgstr "用数字表示的键"
-msgid "layer tag with + sign"
-msgstr "层标签带有+符号"
+msgid "{0} value with + sign"
+msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "层应该介于-5与5之间"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr "{0}应仅有可选的步进为.5的数字"
@@ -26551,7 +26876,7 @@ msgstr "还原修改集合的插件"
msgid ""
"Expand a simple intersection to a roundabout in gradual steps. Select an "
"intersection node or a roundabout and press Crtl-Shift-R"
-msgstr ""
+msgstr "逐步将简单交点扩展至环岛。选择一个交点或环岛，按下 Crtl-Shift-R"
msgid ""
"Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -26572,14 +26897,14 @@ msgid "Loads data from SDS"
msgstr "从 SDS 加载数据"
msgid "Imagery Layer for Sea Charts"
-msgstr ""
+msgstr "用于航海图的图像层"
msgid "Edit features for Sea Charts"
-msgstr ""
+msgstr "编辑航海图的特性"
msgid ""
"Gives user more tools that facilitate aligning and rotation of buildings."
-msgstr ""
+msgstr "为用户提供更多校准和旋转建筑的工具"
msgid ""
"Simplify area by removing nodes on very obtuse angles. This can be "
@@ -26620,7 +26945,7 @@ msgstr "让连栋房屋能超出单一区块。"
msgid ""
"Adds a todo list dialog that makes it easy to go through large lists of "
"objects"
-msgstr ""
+msgstr "增加待办事项对话框，便于完成大型项目"
msgid ""
"Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
@@ -26646,7 +26971,7 @@ msgid "Plugin to digital sign OSM-Data"
msgstr "用来数字签名 OSM-数据的插件"
msgid "Editor to add turn lanes tags in highways"
-msgstr ""
+msgstr "增加转向车道标签的编辑器"
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -26677,7 +27002,7 @@ msgstr "为从 GPX 文件导入的路点打开搜索功能。"
msgid ""
"Simplifies linking OSM objects to Wikipedia articles and Wikidata items"
-msgstr ""
+msgstr "简化链接OSM对象至维基百科条目和维基数据项目"
msgid ""
"Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -26691,7 +27016,7 @@ msgid "Importing CSV file ''%s''..."
msgstr "正在导入 CSV 文件“％s”..."
msgid "Markers of "
-msgstr ""
+msgstr "标记 "
msgid "Show summary after import"
msgstr "导入后显示摘要"
@@ -26900,13 +27225,13 @@ msgid "Importing..."
msgstr "正在导入..."
msgid "DXF files [ImportDxf plugin] (*.dxf)"
-msgstr ""
+msgstr "DXF文件[ImportDxf 插件] (*.dxf)"
msgid "Please open or create data layer before importing"
-msgstr ""
+msgstr "请在导入前打开或创建数据层"
msgid "Import dxf"
-msgstr ""
+msgstr "导入dxf"
msgid "Scale:"
msgstr "比例："
@@ -27224,7 +27549,7 @@ msgid "House Number Editor"
msgstr "门牌号编辑器"
msgid "House number increment:"
-msgstr ""
+msgstr "房屋号码增量"
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
@@ -27261,49 +27586,49 @@ msgid "Error while creating image layer: "
msgstr "创建图像图层时发生错误： "
msgid "Mapillary Images"
-msgstr ""
+msgstr "Mapillary Images"
msgid "Mapillary layer"
-msgstr ""
+msgstr "Mapillary图层"
msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
+msgstr "{0}序列，都包含在{1}和{2}间的图像 (ø {3})"
msgid "{0} imported images"
-msgstr ""
+msgstr "{0}导入的图像"
msgid "{0} downloaded images"
-msgstr ""
+msgstr "{0}下载的图像"
msgid "{0} images in total"
-msgstr ""
+msgstr "总共{0}份图像"
msgid "{0} images in {1} sequences"
-msgstr ""
+msgstr "{0}图像在{1}序列中"
msgid "Mapillary object layer"
-msgstr ""
+msgstr "Mapillary对象层"
msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
+msgstr "显示Mapillary侦测到的地图对象"
msgid "Start Mapillary layer"
-msgstr ""
+msgstr "启用Mapillary层"
msgid "Mapillary"
-msgstr ""
+msgstr "Mapillary"
msgid "Create Mapillary layer"
-msgstr ""
+msgstr "创建Mapillary层"
msgid "Download Mapillary images in current view"
-msgstr ""
+msgstr "在现有视图下载Mapillary图像"
msgid "Export pictures"
msgstr "导出图片"
msgid "Export Mapillary pictures"
-msgstr ""
+msgstr "导出Mapillary图像"
msgid "Export images"
msgstr "导出图像"
@@ -27315,80 +27640,80 @@ msgid "Import local pictures"
msgstr "导入本地图片"
msgid "Import pictures into Mapillary layer"
-msgstr ""
+msgstr "将图像导入Mapillary层"
msgid "Join mode"
-msgstr ""
+msgstr "合并模式"
msgid "Join/unjoin pictures"
-msgstr ""
+msgstr "合并/分离图像"
msgid "Submit changeset"
-msgstr ""
+msgstr "提交修改集合"
msgid "Submit the current changeset"
-msgstr ""
+msgstr "提交现有的修改集合"
msgid "Submit the current changeset to Mapillary"
-msgstr ""
+msgstr "提交现有的修改集合至Mapillary"
msgid "rejected"
-msgstr ""
+msgstr "已退回"
msgid "pending"
msgstr "挂起中"
msgid "approved"
-msgstr ""
+msgstr "已通过"
msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
+msgstr "{0}图像已提交，修改集合编号：{1}，状态：{2}"
msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr ""
+msgstr "修改集合上传失败由于{0}错误 ''{1} {2}''!"
msgid ""
"An exception occured while trying to submit a changeset. If this happens "
"repeatedly, consider reporting a bug via the Help menu. If this message "
"appears for the first time, simply try it again. This might have been an "
"issue with the internet connection."
-msgstr ""
+msgstr "在试图提交修改集合时发生意外。若反复出现，考虑通过帮助菜单报告漏洞。若第一次出现，重试一次，可能是互联网连接问题。"
msgid "Upload pictures"
msgstr "上传图片"
msgid "Upload Mapillary pictures"
-msgstr ""
+msgstr "上传Mapillary图像"
msgid "Upload pictures."
msgstr "上传图片。"
msgid "Walk mode"
-msgstr ""
+msgstr "步行模式"
msgid "Zoom to selected image"
msgstr "缩放至选定图片"
msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
+msgstr "缩放至所选Mapillary图像"
msgid "Current Mapillary changeset"
-msgstr ""
+msgstr "当前Mapillary修改集合"
msgid "Open Mapillary changeset dialog"
-msgstr ""
+msgstr "打开Mapillary修改集合对话框"
msgid "Mapillary changeset"
-msgstr ""
+msgstr "Mapillary修改集合"
msgid "Submitting changeset to server…"
-msgstr ""
+msgstr "正在提交修改集合至服务器..."
msgid "Export all images"
msgstr "导出所有图像"
msgid "Export selected sequence"
-msgstr ""
+msgstr "导出所选序列"
msgid "Export selected images"
msgstr "导出选定图像"
@@ -27397,10 +27722,10 @@ msgid "Rewrite imported images"
msgstr "重写已导入图像"
msgid "Select a folder"
-msgstr ""
+msgstr "选择一个文件夹"
msgid "Explore"
-msgstr ""
+msgstr "浏览"
msgid "Select a directory"
msgstr "选择文件夹"
@@ -27409,91 +27734,91 @@ msgid "Speed limit"
msgstr "限速"
msgid "Give way"
-msgstr ""
+msgstr "让道"
msgid "No entry"
-msgstr ""
+msgstr "禁止入内"
msgid "Intersection danger"
-msgstr ""
+msgstr "危险交叉"
msgid "Mandatory direction (any)"
-msgstr ""
+msgstr "强制性指示（任何）"
msgid "Uneven road"
-msgstr ""
+msgstr "不平整的路"
msgid "No parking"
-msgstr ""
+msgstr "禁止停车"
msgid "No overtaking"
-msgstr ""
+msgstr "禁止超车"
msgid "Pedestrian crossing"
-msgstr ""
+msgstr "人行道十字路口"
msgid "No turn"
-msgstr ""
+msgstr "禁止掉头"
msgid "Years"
-msgstr ""
+msgstr "年"
msgid "Months"
-msgstr ""
+msgstr "月"
msgid "Days"
-msgstr ""
+msgstr "日"
msgid "Imported images"
msgstr "已导入图像"
msgid "Mapillary filter"
-msgstr ""
+msgstr "Mapillary过滤器"
msgid "Open Mapillary filter dialog"
-msgstr ""
+msgstr "打开Mapillary过滤器对话框"
msgid "Not older than: "
-msgstr ""
+msgstr "不大于 "
msgid "Downloaded images"
msgstr "已下载图像"
msgid "Only images with signs"
-msgstr ""
+msgstr "只有有标志的图像"
msgid "Choose signs"
-msgstr ""
+msgstr "选择标志"
msgid "Mapillary history"
-msgstr ""
+msgstr "Mapillary历史"
msgid "Open Mapillary history dialog"
-msgstr ""
+msgstr "打开Mapillary历史对话框"
msgid "No image selected"
-msgstr ""
+msgstr "未选择图像"
msgid "Press \"{0}\" to download images"
-msgstr ""
+msgstr "按\"{0}\"来下载图像"
msgid "Mapillary picture"
-msgstr ""
+msgstr "Mapillary图像"
msgid "Open Mapillary window"
-msgstr ""
+msgstr "打开Mapillary窗口"
msgid "Next picture"
msgstr "前一图片"
msgid "Shows the next picture in the sequence"
-msgstr ""
+msgstr "按序显示下一个图像"
msgid "Previous picture"
msgstr "后一图片"
msgid "Shows the previous picture in the sequence"
-msgstr ""
+msgstr "按序显示上一个图像"
msgid "Jump to red"
msgstr ""
@@ -27508,40 +27833,40 @@ msgid "Jumps to the picture at the other side of the blue line"
msgstr ""
msgid "Stops the walk."
-msgstr ""
+msgstr "停止步行"
msgid "Play"
msgstr "播放"
msgid "Continues with the paused walk."
-msgstr ""
+msgstr "继续已暂停的步行"
msgid "Pause"
msgstr "暂停"
msgid "Pauses the walk."
-msgstr ""
+msgstr "暂停步行"
msgid "Display hour when the picture was taken"
-msgstr ""
+msgstr "显示图片拍摄时间"
msgid "Use 24 hour format"
-msgstr ""
+msgstr "使用24小时格式"
msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
+msgstr "使用前进后退按钮移动至图片位置"
msgid "Preview images when hovering its icon"
-msgstr ""
+msgstr "悬停在图标上时预览图像"
msgid "Cut off sequences at download bounds"
msgstr ""
msgid "Enable experimental beta-features (might be unstable)"
-msgstr ""
+msgstr "启用实验性功能（可能不稳定）"
msgid "Download mode"
-msgstr ""
+msgstr "下载模式"
msgid "You are logged in as ''{0}''."
msgstr "您已登录为“{0}”。"
@@ -27556,100 +27881,100 @@ msgid "Logout"
msgstr "注销"
msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
+msgstr "前往设置并在上传前登陆Mapillary"
msgid "Upload selected sequence"
-msgstr ""
+msgstr "上传所选序列"
msgid "Delete after upload"
msgstr "上传后删除"
msgid "Wait for full quality pictures"
-msgstr ""
+msgstr "等待完整品质图像"
msgid "Follow selected image"
-msgstr ""
+msgstr "跟随所选图像"
msgid "Go forward"
-msgstr ""
+msgstr "向前"
msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
+msgstr "您想将哪个图层导入Mapillary层？"
msgid "Import"
msgstr "输入"
msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
+msgstr "无法将地理标签图像导入Mapillary层！"
msgid "{0} ({1} images)"
-msgstr ""
+msgstr "{0} ({1}份图像)"
msgid ""
"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
+msgstr "您想从何来源导入图像至Mapillary层？"
msgid "There are currently no layers with geotagged images!"
-msgstr ""
+msgstr "当前没有图层含有地理标签图像"
msgid "Images from my file system"
-msgstr ""
+msgstr "我文件系统中的图像"
msgid "Select the images you want to import"
-msgstr ""
+msgstr "选择您想要导入的图像"
msgid "All images in a directory"
-msgstr ""
+msgstr "在某一目录下的所有图像"
msgid "Select directory to import images from"
-msgstr ""
+msgstr "选择导入图像来源目录"
msgid "From existing image layer"
-msgstr ""
+msgstr "从现有的图层中"
msgid "Import exception"
-msgstr ""
+msgstr "导入发生意外"
msgid "Could not import the image ''{0}''!"
-msgstr ""
+msgstr "无法导入图像''{0}''！"
msgid "Could not import the directory ''{0}''!"
-msgstr ""
+msgstr "无法导入目录''{0}''！"
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
+msgstr "包含键 <i>{0}</i> 的标签已在所选OSM对象上出现。"
msgid ""
"Do you really want to replace the current value <i>{0}</i> with the new "
"value <i>{1}</i>?"
-msgstr ""
+msgstr "您真的想要将当前值 <i>{0}</i> 替换为新值 <i>{1}</i>吗？"
msgid "Tag conflict"
-msgstr ""
+msgstr "标签冲突"
msgid "Key copied to clipboard"
-msgstr ""
+msgstr "已复制键至剪贴板"
msgid ""
"The Mapillary plugin now uses a separate panel to display extra information "
"(like the image key) and actions for the currently selected Mapillary image "
"(like viewing it in a browser)."
-msgstr ""
+msgstr "Mapillary插件现在使用独立的面板来显示额外信息（比如图片键值）和已选的Mapillary图像的操作（就像在浏览器中那样）"
msgid ""
"It can be activated by clicking the left button at the bottom of this "
"message or the button in the toolbar on the left, which uses the same icon."
-msgstr ""
+msgstr "单击此信息左下方的按钮或工具条左侧的相同按钮以启用它"
msgid "I got it, close this."
-msgstr ""
+msgstr "我已知晓，关闭该窗口"
msgid "Image info"
-msgstr ""
+msgstr "图片信息"
msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
+msgstr "在当前选择的Mapillary图像上显示详细信息"
msgid "Show detections on top of image"
msgstr ""
@@ -28889,6 +29214,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30725,9 +31053,6 @@ msgstr "删除这个"
msgid "Delete this&older"
msgstr "删除这个和更旧的"
-msgid "km/h"
-msgstr "千米/时"
-
msgid "Track name: "
msgstr "轨迹名： "
@@ -32159,6 +32484,9 @@ msgstr ""
msgid "Speed:"
msgstr ""
+msgid "km/h"
+msgstr "千米/时"
+
msgid "direction"
msgstr ""
@@ -33398,6 +33726,12 @@ msgstr "只选择一个对象"
msgid "Select a map object"
msgstr "选择一个地图对象"
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/i18n/po/zh_TW.po b/i18n/po/zh_TW.po
index 26ddc94..966ffb2 100644
--- a/i18n/po/zh_TW.po
+++ b/i18n/po/zh_TW.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-29 03:46+0200\n"
-"PO-Revision-Date: 2017-10-01 08:10+0000\n"
+"POT-Creation-Date: 2017-10-30 03:38+0100\n"
+"PO-Revision-Date: 2017-10-12 17:07+0000\n"
"Last-Translator: Supaplex <Unknown>\n"
"Language-Team: Traditional Chinese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-10-02 04:31+0000\n"
-"X-Generator: Launchpad (build 18471)\n"
+"X-Launchpad-Export-Date: 2017-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 18493)\n"
"Language: zh_TW\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2891,24 +2891,6 @@ msgstr "不合規定的緯度數值「{0}」"
msgid "Illegal longitude value ''{0}''"
msgstr "不合規定的經度數值「{0}」"
-msgid "Failed to create missing preferences directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing preferences directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing user data directory: {0}"
-msgstr ""
-
-msgid "<html>Failed to create missing user data directory: {0}</html>"
-msgstr ""
-
-msgid "Failed to create missing cache directory: {0}"
-msgstr "無法建立消失的快取目錄：{0}"
-
-msgid "<html>Failed to create missing cache directory: {0}</html>"
-msgstr "<html>無法建立缺少的快取目錄： {0}</html>"
-
msgid "Unable to delete temporary file {0}"
msgstr "無法刪除暫存檔案 {0}"
@@ -2975,18 +2957,13 @@ msgstr ""
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
-msgid "Paint style {0}: {1}"
-msgstr "繪製樣式 {0}：{1}"
-
msgid "Layer: {0}"
msgstr "圖層：{0}"
-msgid "Failed to persist preferences to ''{0}''"
-msgstr ""
+msgid "Paint style {0}: {1}"
+msgstr "繪製樣式 {0}：{1}"
-msgid ""
-"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
-"startup)."
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3503,6 +3480,24 @@ msgstr "文字"
msgid "areatext"
msgstr "區域文字"
+msgid "Failed to create missing preferences directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing preferences directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing user data directory: {0}"
+msgstr ""
+
+msgid "<html>Failed to create missing user data directory: {0}</html>"
+msgstr ""
+
+msgid "Failed to create missing cache directory: {0}"
+msgstr "無法建立消失的快取目錄：{0}"
+
+msgid "<html>Failed to create missing cache directory: {0}</html>"
+msgstr "<html>無法建立缺少的快取目錄： {0}</html>"
+
msgid "Expected element ''{0}'', but got ''{1}''"
msgstr ""
@@ -4173,6 +4168,9 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "多重多邊形並未封閉"
+msgid "Self-intersecting polygon ring"
+msgstr ""
+
msgid "Multipolygon rings share node(s)"
msgstr ""
@@ -4823,7 +4821,7 @@ msgid "Would you like to update now ?"
msgstr "你想要現在就更新嗎？"
msgid "Starting file watcher"
-msgstr ""
+msgstr "起始檔案監視器"
msgid "Executing platform startup hook"
msgstr "執行平臺啟動掛鉤"
@@ -4861,6 +4859,25 @@ msgstr "正在載入圖片偏好設定"
msgid "usage"
msgstr "用法"
+msgid "commands"
+msgstr ""
+
+msgid "launch JOSM (default, performed when no command is specified)"
+msgstr ""
+
+msgid "render data and save the result to an image file"
+msgstr ""
+
+msgid "convert coordinates from one coordinate reference system to another"
+msgstr ""
+
+msgid ""
+"For details on the {0} and {1} commands, run them with the {2} option."
+msgstr ""
+
+msgid "The remainder of this help page documents the {0} command."
+msgstr ""
+
msgid "options"
msgstr "選項"
@@ -4990,6 +5007,11 @@ msgstr "設定預設值"
msgid "Creating main GUI"
msgstr "建立主視窗中"
+msgid ""
+"Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early "
+"startup)."
+msgstr ""
+
msgid "Updating plugins"
msgstr "更新外掛程式"
@@ -5284,6 +5306,9 @@ msgstr "放大"
msgid "Shrink"
msgstr "精簡"
+msgid "Show downloaded area"
+msgstr ""
+
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
@@ -5304,6 +5329,9 @@ msgid ""
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
+"<html>做為替代作法你可以輸入像 <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i> "
+"<strong>拼貼位址</strong>格式，取得單一拼貼。拼貼位址格式如 <i>zoom,x,y</i> or <i>zoom;x;y</i> "
+"同樣有效。</html>"
msgid "Tile address:"
msgstr "拼貼位址："
@@ -8012,6 +8040,9 @@ msgid ""
"resolve this conflict first, then try again.</html>"
msgstr "<html>圖層「{0}」已經有衝突於物件<br>「{1}」。<br>請先調解這個衝突，然後再試一次。</html>"
+msgid "Select the currently edited relation"
+msgstr ""
+
msgid "Select objects for selected relation members"
msgstr "選擇已選取關聯成員中的物件"
@@ -8245,7 +8276,7 @@ msgid "Download area ok, size probably acceptable to server"
msgstr "下載區域確定，大小應該會被伺服器接受"
msgid "Download from Overpass API"
-msgstr ""
+msgstr "從 Overpass API 下載"
msgid ""
"Place your Overpass query below or generate one using the Overpass Turbo "
@@ -8305,7 +8336,7 @@ msgstr "解析錯誤"
msgid ""
"Allows you to interact with <i>Overpass API</i> by writing declarative, "
"human-readable terms."
-msgstr ""
+msgstr "允許你撰寫描述性，人類可讀的述語來與 <i>Overpass API</i> 互動。"
msgid ""
"The <i>Query Wizard</i> tool will transform those to a valid overpass query."
@@ -8742,7 +8773,7 @@ msgid "Check \"Save\" to save the layer to the file specified on the left."
msgstr ""
msgid "I would like someone to review my edits."
-msgstr ""
+msgstr "我需要別人覆核我的編輯。"
msgid "Provide a brief comment for the changes you are uploading:"
msgstr "提供關於你所上傳變更的簡短評論："
@@ -8754,7 +8785,7 @@ msgid "Specify the data source for the changes"
msgstr "指定變更集的資料來源"
msgid "obtain from current layers"
-msgstr ""
+msgstr "從目前使用的圖層取得"
msgid "Enter a source"
msgstr "輸入來源"
@@ -10520,6 +10551,156 @@ msgstr "(URL 是： "
msgid "Select the map painting styles"
msgstr "選取地圖繪製樣式"
+msgid "Error - file not found: ''{0}''"
+msgstr ""
+
+msgid "Expected integer number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number >= 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Unable to parse {0} parameter: {1}"
+msgstr ""
+
+msgid ""
+"Expected key and value, separated by '':'' character for option {0}, but got "
+"''{1}''"
+msgstr ""
+
+msgid "Expected floating point number for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid ""
+"Expected two coordinates, separated by comma, for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "In option {0}: {1}"
+msgstr ""
+
+msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "Expected integer number > 0 for option {0}, but got ''{1}''"
+msgstr ""
+
+msgid "JOSM rendering command line interface"
+msgstr ""
+
+msgid "Renders data and saves the result to an image file."
+msgstr ""
+
+msgid "Input data file name (.osm)"
+msgstr ""
+
+msgid "Output image file name (.png); defaults to ''{0}''"
+msgstr ""
+
+msgid "Style file to use for rendering (.mapcss or .zip)"
+msgstr ""
+
+msgid "This option can be repeated to load multiple styles."
+msgstr ""
+
+msgid ""
+"Style setting (in JOSM accessible in the style list dialog right click menu)"
+msgstr ""
+
+msgid "Applies to the last style loaded with the {0} option."
+msgstr ""
+
+msgid ""
+"Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
+msgstr ""
+
+msgid "Select the map scale"
+msgstr ""
+
+msgid ""
+"A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
+"the ground; display resolution: 96 dpi)"
+msgstr ""
+
+msgid "Options {0} and {1} are mutually exclusive."
+msgstr ""
+
+msgid "Area to render, default value is ''{0}''"
+msgstr ""
+
+msgid ""
+"With keyword ''{0}'', the downloaded area in the .osm input file will be "
+"used (if recorded)."
+msgstr ""
+
+msgid "Specify bottom left corner of the rendering area"
+msgstr ""
+
+msgid ""
+"Used in combination with width and height options to determine the area to "
+"render."
+msgstr ""
+
+msgid "Width of the rendered area, in meter"
+msgstr ""
+
+msgid "Height of the rendered area, in meter"
+msgstr ""
+
+msgid "Width of the target image, in pixel"
+msgstr ""
+
+msgid "Height of the target image, in pixel"
+msgstr ""
+
+msgid "Projection to use, default value ''{0}'' (web-Mercator)"
+msgstr ""
+
+msgid ""
+"Maximum image width/height in pixel (''{0}'' means no limit), default value: "
+"{1}"
+msgstr ""
+
+msgid ""
+"To specify the rendered area and scale, the options can be combined in "
+"various ways"
+msgstr ""
+
+msgid ""
+"If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
+"and the bounds of the download area in the .osm input file are used."
+msgstr ""
+
+msgid ""
+"Argument {0} given, but scale cannot be determined from remaining arguments"
+msgstr ""
+
+msgid "Argument {0} given, expected {1} or {2}"
+msgstr ""
+
+msgid "{0} mode, but no bounds found in osm data input file"
+msgstr ""
+
+msgid ""
+"Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
+msgstr ""
+
+msgid "Missing argument - input data file ({0})"
+msgstr ""
+
+msgid "In .osm data file ''{0}'' - "
+msgstr ""
+
+msgid "Missing argument - at least one style expected ({0})"
+msgstr ""
+
+msgid ""
+"Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
+"change limit)"
+msgstr ""
+
+msgid "Style setting not found: ''{0}''"
+msgstr ""
+
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
"click menu for details."
@@ -10538,6 +10719,11 @@ msgstr "無法從 ''{0}'' 載入地圖繪製樣式，異常：{1}"
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "無法從 ''{0}'' 貼上地圖繪製樣式，錯誤：{1}"
+msgid ""
+"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
+"''{2}'' instead."
+msgstr ""
+
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -14003,6 +14189,15 @@ msgstr "跳過圖層而繼續"
msgid "expected .jos file inside .joz archive"
msgstr "在 .joz 壓縮檔中應用 .jos 檔案"
+msgid "Failed to create missing plugin preferences directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin user data directory: {0}"
+msgstr ""
+
+msgid "Failed to create missing plugin cache directory: {0}"
+msgstr ""
+
msgid "Skip download"
msgstr "略過下載"
@@ -15385,6 +15580,12 @@ msgstr "機車"
msgid "Motorcar"
msgstr "汽車"
+msgid "Minimum age"
+msgstr "年齡限制"
+
+msgid "Maximum age"
+msgstr ""
+
msgid "Reference"
msgstr "編號"
@@ -16028,6 +16229,10 @@ msgid "platform"
msgstr "月台"
msgctxt "power"
+msgid "rooftop"
+msgstr ""
+
+msgctxt "power"
msgid "kiosk"
msgstr "販售站"
@@ -16076,6 +16281,42 @@ msgstr "蒸氣"
msgid "vacuum"
msgstr "火山"
+msgid "Material"
+msgstr "材質"
+
+msgid "plastic"
+msgstr "塑膠"
+
+msgid "steel"
+msgstr "鋼製"
+
+msgid "stone"
+msgstr "石頭"
+
+msgid "Location transition"
+msgstr "位置轉換"
+
+msgid "Power rating (kVA/MVA)"
+msgstr "額定電力 (KVA/MVA)"
+
+msgid "2700 kVA"
+msgstr "2700 kVA"
+
+msgid "12500 kVA"
+msgstr "12500 kVA"
+
+msgid "15 MVA"
+msgstr "15 MVA"
+
+msgid "50 MVA"
+msgstr "50 MVA"
+
+msgid "100 MVA"
+msgstr "100 MVA"
+
+msgid "Phases"
+msgstr "相數"
+
msgid "Max. weight (tonnes)"
msgstr "總重限制 (噸)"
@@ -17002,12 +17243,6 @@ msgstr "障礙物"
msgid "Block"
msgstr "水泥護欄"
-msgid "Material"
-msgstr "材質"
-
-msgid "stone"
-msgstr "石頭"
-
msgid "Bollard"
msgstr "車阻柱"
@@ -17020,9 +17255,6 @@ msgstr "升降"
msgid "removable"
msgstr "可移動"
-msgid "plastic"
-msgstr "塑膠"
-
msgid "Cycle Barrier"
msgstr "自行車護欄"
@@ -17794,6 +18026,12 @@ msgstr "1/25 混合 (動力自行車)"
msgid "1/50 mix (mofa/moped)"
msgstr "1/50 混合 (動力自行車)"
+msgid "Additives:"
+msgstr ""
+
+msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
+msgstr ""
+
msgid "Fuel cards:"
msgstr "加油卡："
@@ -18503,9 +18741,6 @@ msgstr "3D"
msgid "Number of screens"
msgstr "螢幕數"
-msgid "Minimum age"
-msgstr "年齡限制"
-
msgid "Zoo"
msgstr "動物園"
@@ -20701,24 +20936,6 @@ msgctxt "power"
msgid "industrial"
msgstr "工業用"
-msgid "Power rating (kVA/MVA)"
-msgstr "額定電力 (KVA/MVA)"
-
-msgid "2700 kVA"
-msgstr "2700 kVA"
-
-msgid "12500 kVA"
-msgstr "12500 kVA"
-
-msgid "15 MVA"
-msgstr "15 MVA"
-
-msgid "50 MVA"
-msgstr "50 MVA"
-
-msgid "100 MVA"
-msgstr "100 MVA"
-
msgid "Gas insulated"
msgstr "瓦斯絕緣"
@@ -20744,9 +20961,6 @@ msgctxt "power"
msgid "yes"
msgstr "是"
-msgid "Phases"
-msgstr "相數"
-
msgid "Power Switchgear"
msgstr "電力開關"
@@ -20764,6 +20978,25 @@ msgstr "電力線架"
msgid "Power Switch"
msgstr "電力開關"
+msgid "Type of switch"
+msgstr ""
+
+msgctxt "power"
+msgid "mechanical"
+msgstr ""
+
+msgctxt "power"
+msgid "circuit_breaker"
+msgstr ""
+
+msgctxt "power"
+msgid "disconnector"
+msgstr ""
+
+msgctxt "power"
+msgid "earthing"
+msgstr ""
+
msgid "Power Converter"
msgstr "變電器"
@@ -20865,9 +21098,6 @@ msgstr "空心"
msgid "solid"
msgstr "實心"
-msgid "steel"
-msgstr "鋼製"
-
msgctxt "color"
msgid "red/white"
msgstr "紅色/白色"
@@ -21030,18 +21260,21 @@ msgstr "三塔"
msgid "Incomplete tower"
msgstr "未完成"
-msgid "Location transition"
-msgstr "位置轉換"
-
msgid "Pole"
msgstr "電桿"
-msgid "Pole with Transformer"
-msgstr "附變壓器"
+msgid "Pole with Switch"
+msgstr ""
msgid "Pole Attributes:"
msgstr "電桿屬性："
+msgid "Switch Attributes:"
+msgstr ""
+
+msgid "Pole with Transformer"
+msgstr "附變壓器"
+
msgid "Transformer Attributes:"
msgstr "變壓器屬性："
@@ -21154,6 +21387,52 @@ msgstr "戰場"
msgid "Palaeontological Site"
msgstr "古生物遺址"
+msgid "Grave"
+msgstr ""
+
+msgid "Tomb"
+msgstr ""
+
+msgctxt "tomb"
+msgid "tumulus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "rock-cut"
+msgstr ""
+
+msgctxt "tomb"
+msgid "hypogeum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "war_grave"
+msgstr ""
+
+msgctxt "tomb"
+msgid "mausoleum"
+msgstr ""
+
+msgctxt "tomb"
+msgid "columbarium"
+msgstr ""
+
+msgctxt "tomb"
+msgid "crypt"
+msgstr ""
+
+msgctxt "tomb"
+msgid "pyramid"
+msgstr ""
+
+msgctxt "tomb"
+msgid "sarcophagus"
+msgstr ""
+
+msgctxt "tomb"
+msgid "vault"
+msgstr ""
+
msgid "Monument"
msgstr "紀念物"
@@ -21931,6 +22210,9 @@ msgstr "獨間住居"
msgid "Suburb"
msgstr "郊區"
+msgid "Quarter"
+msgstr ""
+
msgid "Neighbourhood"
msgstr "鄰居"
@@ -22279,6 +22561,9 @@ msgstr "溫室栽培"
msgid "Plant Nursery"
msgstr "苗圃"
+msgid "Salt Pond"
+msgstr ""
+
msgid "Aquaculture"
msgstr "水產養殖"
@@ -22884,11 +23169,21 @@ msgstr "路線"
msgid "Bicycle Route"
msgstr "單車路線"
+msgctxt "network"
+msgid "international"
+msgstr ""
+
+msgctxt "network"
msgid "national"
-msgstr "國家級"
+msgstr ""
+
+msgctxt "network"
+msgid "regional"
+msgstr ""
+msgctxt "network"
msgid "local"
-msgstr "地方級"
+msgstr ""
msgid "Mountain Biking Route"
msgstr "登山車路線"
@@ -23130,6 +23425,9 @@ msgstr "OpenStreetMap GPS 軌跡"
msgid "Public GPS traces uploaded to OpenStreetMap."
msgstr ""
+msgid "OpenTopoMap"
+msgstr ""
+
msgid "Public Transport (ÖPNV)"
msgstr "大眾運輸 (ÖPNV)"
@@ -23142,8 +23440,8 @@ msgstr "skobbler"
msgid "Stamen Terrain"
msgstr "Stamen 地形圖"
-msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
-msgstr "柬埔寨、寮國、泰國、越南、緬甸雙語"
+msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (重疊)"
@@ -23219,6 +23517,13 @@ msgid ""
"snow (true color)"
msgstr ""
+msgid "Municipality of Tirana (Open Labs GeoPortal)"
+msgstr ""
+
+msgid ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
@@ -23545,6 +23850,9 @@ msgstr ""
msgid "URBIS 2016 aerial imagery"
msgstr ""
+msgid "URBIS 2017 aerial imagery"
+msgstr ""
+
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -23560,6 +23868,9 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
+msgid "SPW(allonie) shaded relief"
+msgstr ""
+
msgid "TEC bus lines"
msgstr ""
@@ -23864,6 +24175,9 @@ msgstr ""
msgid "Bordeaux - 2012"
msgstr ""
+msgid "Bordeaux - 2016"
+msgstr ""
+
msgid "Cadastre"
msgstr "Cadastre"
@@ -24787,6 +25101,9 @@ msgstr "瑞士菲耶正射影像 2013"
msgid "Kanton Basel-Stadt 2015"
msgstr "瑞士巴塞爾城市州 2015"
+msgid "Kanton Basel-Stadt 2017"
+msgstr ""
+
msgid "Kanton Basel-Landschaft 10cm (2015)"
msgstr "瑞士巴塞爾鄉村州 10cm 2015"
@@ -24834,10 +25151,10 @@ msgstr "美國地質調查局地形圖"
msgid "USGS Large Scale Imagery"
msgstr "美國地質調查局大比例影像"
-msgid "TIGER 2012 Roads Overlay"
+msgid "TIGER Roads 2012"
msgstr ""
-msgid "New & Misaligned TIGER Roads (2015)"
+msgid "TIGER Roads 2014"
msgstr ""
msgid ""
@@ -24846,6 +25163,14 @@ msgid ""
"OpenStreetMap"
msgstr ""
+msgid "TIGER Roads 2017"
+msgstr ""
+
+msgid ""
+"Yellow = Public domain map data from the US Census. Red = Data not found in "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
@@ -24907,6 +25232,9 @@ msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
+msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
+msgstr ""
+
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
@@ -25846,6 +26174,14 @@ msgstr ""
msgid "{0} on a way. Should be used in a relation"
msgstr ""
+msgid "node connects highway and building"
+msgstr ""
+
+msgid ""
+"Object at Position 0.00E 0.00N. There is nothing at this position except an "
+"already mapped weather buoy."
+msgstr ""
+
msgid "{0} together with {1} on a node. Remove {0}."
msgstr "{0} 都將 {1} 用在節點，移除 {0}。"
@@ -25912,14 +26248,6 @@ msgid ""
"instead."
msgstr ""
-msgid "node connects highway and building"
-msgstr ""
-
-msgid ""
-"Object at Position 0.00E 0.00N. There is nothing at this position except an "
-"already mapped weather buoy."
-msgstr ""
-
msgid "Ferry route is not connected to the road network or branches."
msgstr ""
@@ -25970,11 +26298,11 @@ msgstr ""
msgid "numerical key"
msgstr ""
-msgid "layer tag with + sign"
+msgid "{0} value with + sign"
msgstr ""
-msgid "layer should be between -5 and 5"
-msgstr "圖層必須是在 -5 和 5 之間"
+msgid "{0} should be an integer value between -5 and 5"
+msgstr ""
msgid "{0} should have numbers only with optional .5 increments"
msgstr ""
@@ -28770,6 +29098,9 @@ msgid ""
"<html>Nothing is enabled.<br>Please choose something to download.</html>"
msgstr ""
+msgid "Download cadastre data"
+msgstr ""
+
msgid "Recipient"
msgstr ""
@@ -30606,9 +30937,6 @@ msgstr "刪除這個"
msgid "Delete this&older"
msgstr ""
-msgid "km/h"
-msgstr "公里/小時"
-
msgid "Track name: "
msgstr ""
@@ -32045,6 +32373,9 @@ msgstr "正數或空白"
msgid "Speed:"
msgstr "速度："
+msgid "km/h"
+msgstr "公里/小時"
+
msgid "direction"
msgstr "方向"
@@ -33278,6 +33609,12 @@ msgstr ""
msgid "Select a map object"
msgstr ""
+msgid "Please enter minimal distance in metres"
+msgstr ""
+
+msgid "Please enter numeric angle in degrees"
+msgstr ""
+
msgid "Shape actions panel"
msgstr ""
diff --git a/images/presets/landuse/salt_pond.svg b/images/presets/landuse/salt_pond.svg
new file mode 100644
index 0000000..df99d6d
--- /dev/null
+++ b/images/presets/landuse/salt_pond.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ viewBox="0 0 16 16"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+ sodipodi:docname="06.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="32"
+ inkscape:cx="4.9885817"
+ inkscape:cy="9.1950345"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ units="px"
+ inkscape:window-width="1680"
+ inkscape:window-height="987"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1"
+ viewbox-height="16">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4136"
+ originx="0"
+ originy="0"
+ spacingx="1"
+ spacingy="1" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ <cc:license
+ rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-1037.3622)">
+ <rect
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.55400002;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect856"
+ width="16"
+ height="16"
+ x="0"
+ y="1037.3622"
+ ry="3.0000174" />
+ <rect
+ style="opacity:1;fill:#917c6f;fill-opacity:1;stroke:none;stroke-width:0.55400002;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect852"
+ width="14"
+ height="14.000017"
+ x="1"
+ y="1038.3622"
+ ry="3.0000174" />
+ <rect
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.55400002;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect854"
+ width="12"
+ height="11.999983"
+ x="2"
+ y="1039.3622"
+ ry="2.0000174" />
+ <rect
+ style="opacity:1;fill:#917c6f;fill-opacity:1;stroke:none;stroke-width:0.55400002;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect844"
+ width="2"
+ height="13.999983"
+ x="7"
+ y="1038.3622" />
+ <rect
+ style="opacity:1;fill:#917c6f;fill-opacity:1;stroke:none;stroke-width:0.55400002;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect848"
+ width="14"
+ height="1.0000174"
+ x="1"
+ y="1047.3622" />
+ <rect
+ style="opacity:1;fill:#917c6f;fill-opacity:1;stroke:none;stroke-width:0.55400002;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect850"
+ width="14"
+ height="1.0000174"
+ x="1"
+ y="1042.3622" />
+ </g>
+</svg>
diff --git a/images/presets/misc/grave.svg b/images/presets/misc/grave.svg
new file mode 100644
index 0000000..d7e89f2
--- /dev/null
+++ b/images/presets/misc/grave.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ viewBox="0 0 16 16"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+ sodipodi:docname="07.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="48.59375"
+ inkscape:cx="6.7346129"
+ inkscape:cy="7.4608132"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ units="px"
+ inkscape:window-width="1680"
+ inkscape:window-height="987"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1"
+ viewbox-height="16">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4136"
+ originx="0"
+ originy="0"
+ spacingx="1"
+ spacingy="1" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ <cc:license
+ rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-1037.3622)">
+ <path
+ inkscape:connector-curvature="0"
+ style="color:#000000;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-transform:none;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke-width:0.03334057;stroke-linecap:butt;stro [...]
+ d="m 8,1037.3626 c -2.73333,0 -3.66667,1.973 -3.66667,1.973 L 3,1039.3622 l 1,11 h 8 l 1,-11 -1.33333,-0.027 c 0,0 -0.93334,-1.973 -3.66667,-1.973 z m -3,4.9996 h 6 v 1 H 5 Z m 0,2 h 6 v 1 H 5 Z m -3,7 v 2 h 12 v -2 z"
+ overflow="visible"
+ id="path4"
+ sodipodi:nodetypes="sccccccsccccccccccccccc" />
+ <rect
+ style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.55400002;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect826"
+ width="6"
+ height="1"
+ x="5"
+ y="1044.3622"
+ ry="0" />
+ <rect
+ style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.55400002;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect828"
+ width="6"
+ height="1"
+ x="5"
+ y="1042.3622" />
+ </g>
+</svg>
diff --git a/images/presets/misc/tomb.svg b/images/presets/misc/tomb.svg
new file mode 100644
index 0000000..a600532
--- /dev/null
+++ b/images/presets/misc/tomb.svg
@@ -0,0 +1,107 @@
+<?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="14"
+ height="16"
+ viewBox="0 0 14 16"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+ sodipodi:docname="tomb.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="32"
+ inkscape:cx="0.6777703"
+ inkscape:cy="8.9734853"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ units="px"
+ inkscape:window-width="1920"
+ inkscape:window-height="1027"
+ inkscape:window-x="1272"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1"
+ fit-margin-left="0.1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4136" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ <cc:license
+ rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <rect
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#916f6f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+ id="rect4134"
+ width="10"
+ height="11.3"
+ x="2"
+ y="3.7" />
+ <rect
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#241c1c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rend [...]
+ id="rect4136"
+ width="6"
+ height="11"
+ x="4"
+ y="4" />
+ <path
+ style="fill:#916f6f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 1,4 6,-4 6,4 -12,0"
+ id="path4138"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <rect
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#916f6f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rend [...]
+ id="rect4137"
+ width="14"
+ height="1"
+ x="0"
+ y="15" />
+ <rect
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#916f6f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+ id="rect4139"
+ width="12"
+ height="2"
+ x="1"
+ y="14" />
+ </g>
+</svg>
diff --git a/images/presets/place/quarter.svg b/images/presets/place/quarter.svg
new file mode 100644
index 0000000..c9e659a
--- /dev/null
+++ b/images/presets/place/quarter.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="12"
+ viewBox="0 0 16 12"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="capital12.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="8"
+ inkscape:cx="-6.5823956"
+ inkscape:cy="-7.3402775"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ units="px"
+ inkscape:window-width="1680"
+ inkscape:window-height="988"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4136" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ <cc:license
+ rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-1040.3622)">
+ <path
+ style="fill:#ff59f9;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.97307134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 8.5380631,1049.6846 c -0.603283,-2.4222 1.9922899,-1.3924 3.2209819,0 0.756162,0.511 1.507072,0.3248 2.257945,0.1345 1.957005,-0.36 1.461761,-3.0218 1.379903,-3.4492 -0.277846,-0.8432 -0.22161,-1.061 -1.438908,-2.1021 -1.073374,-0.499 -2.076717,-0.1483 -2.459486,-0.4388 -0.707308,-0.3481 0.356589,-2.2339 -1.187385,-2.3689 -2.8155432,0.2884 -3.877829,0.1299 -4.0699413,-0.067 -1.060499,-0.6232 -1.1916803,-0.7814 -2.4885151,-0.1017 -1.6245177,1.2331 -1.0990479,2.7364 -1.2962578, [...]
+ id="path4145"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccc" />
+ </g>
+</svg>
diff --git a/images/presets/power/pole_switch.svg b/images/presets/power/pole_switch.svg
new file mode 100644
index 0000000..6754f9a
--- /dev/null
+++ b/images/presets/power/pole_switch.svg
@@ -0,0 +1,121 @@
+<?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="12"
+ height="16"
+ viewBox="0 0 12 16"
+ id="svg4264"
+ version="1.1"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+ sodipodi:docname="pole_switch.svg">
+ <defs
+ id="defs4266" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="45.254834"
+ inkscape:cx="1.4844036"
+ inkscape:cy="8.2121622"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ units="px"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-paths="true"
+ inkscape:bbox-nodes="true"
+ inkscape:snap-bbox-edge-midpoints="true"
+ inkscape:snap-bbox-midpoints="true"
+ inkscape:snap-global="true"
+ inkscape:object-paths="true"
+ inkscape:snap-intersection-paths="true"
+ inkscape:object-nodes="true"
+ inkscape:snap-smooth-nodes="true"
+ inkscape:snap-midpoints="true"
+ inkscape:snap-object-midpoints="true"
+ inkscape:snap-center="true"
+ inkscape:snap-nodes="true"
+ inkscape:snap-others="true"
+ inkscape:snap-page="true"
+ inkscape:window-width="1280"
+ inkscape:window-height="971"
+ inkscape:window-x="-8"
+ inkscape:window-y="41"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4137" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata4269">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ <cc:license
+ rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Camada 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-1036.3621)">
+ <path
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;ove [...]
+ d="M 4,0 V 2 H 0 v 6 0.3 1.6 l 2.6,2.9 V 16 H 8 V 6 h 1 v 2 h 3 V 2 H 8 V 0 Z"
+ transform="translate(0,1036.3621)"
+ id="path4218"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccccccc" />
+ <g
+ id="g3382-9"
+ transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+ style="fill:#000000;fill-opacity:1" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#8b4513;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 6.0000008,1037.3621 0,15"
+ id="path4282"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4216"
+ d="m 1,1039.3621 0,2 0,2 1,0 0,-2 8,0 0,2 1,0 0,-2 0,-2 -10,0 z"
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonze [...]
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4228"
+ d="m 4.375,1041.3621 v 3"
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 4.4285628,1052.3621 v -3.7493 l -1.8621907,-2.2107 -1.3457462,-1.54"
+ id="path4246"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ </g>
+</svg>
diff --git a/josm-latest.jnlp b/josm-latest.jnlp
index d69c3b5..9f5339e 100644
--- a/josm-latest.jnlp
+++ b/josm-latest.jnlp
@@ -19,7 +19,7 @@
<all-permissions/>
</security>
<resources>
- <java version="1.8+" java-vm-args="--add-modules=java.activation,java.se.ee --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED --add-exports=java.desktop/com.apple.eawt=ALL-UNNAMED --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED --add-exports=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED --add-exports=jdk.deploy/com.sun.deploy.config=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=jav [...]
+ <java version="1.8+" java-vm-args="--add-modules=java.activation,java.se.ee --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED --add-exports=java.desktop/com.apple.eawt=ALL-UNNAMED --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED --add-exports=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED --add-exports=jdk.deploy/com.sun.deploy.config=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=jav [...]
<jar href="josm-latest.jar"/>
<property name="java.util.Arrays.useLegacyMergeSort" value="true"/>
</resources>
diff --git a/josm.jnlp b/josm.jnlp
index 87f6a19..a50a4d4 100644
--- a/josm.jnlp
+++ b/josm.jnlp
@@ -19,7 +19,7 @@
<all-permissions/>
</security>
<resources>
- <java version="1.8+" java-vm-args="--add-modules=java.activation,java.se.ee --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED --add-exports=java.desktop/com.apple.eawt=ALL-UNNAMED --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED --add-exports=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED --add-exports=jdk.deploy/com.sun.deploy.config=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=jav [...]
+ <java version="1.8+" java-vm-args="--add-modules=java.activation,java.se.ee --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED --add-exports=java.desktop/com.apple.eawt=ALL-UNNAMED --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED --add-exports=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED --add-exports=jdk.deploy/com.sun.deploy.config=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=jav [...]
<jar href="josm-tested.jar"/>
<property name="java.util.Arrays.useLegacyMergeSort" value="true"/>
</resources>
diff --git a/netbeans/nbproject/genfiles.properties b/netbeans/nbproject/genfiles.properties
index 2b7f922..ea163c6 100644
--- a/netbeans/nbproject/genfiles.properties
+++ b/netbeans/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ nbbuild.xml.stylesheet.CRC32=8064a381 at 1.75.2.48
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=f36994fb
-nbproject/build-impl.xml.script.CRC32=05416174
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f at 1.75.2.48
+nbproject/build-impl.xml.script.CRC32=5e13918b
+nbproject/build-impl.xml.stylesheet.CRC32=830a3534 at 1.80.1.48
diff --git a/scripts/TagInfoExtract.groovy b/scripts/TagInfoExtract.groovy
index 03babad..93809a4 100644
--- a/scripts/TagInfoExtract.groovy
+++ b/scripts/TagInfoExtract.groovy
@@ -25,6 +25,7 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive
import org.openstreetmap.josm.data.osm.Way
import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings
import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer
+import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
import org.openstreetmap.josm.data.projection.Projections
import org.openstreetmap.josm.gui.NavigatableComponent
import org.openstreetmap.josm.gui.mappaint.Environment
@@ -383,7 +384,7 @@ class TagInfoExtract {
Logging.setLogLevel(Logging.LEVEL_INFO)
Main.pref.enableSaveOnPut(false)
Config.setPreferencesInstance(Main.pref)
- Config.setBaseDirectoriesProvider(Main.pref);
+ Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
Main.setProjection(Projections.getProjectionByCode("EPSG:3857"))
Path tmpdir = Files.createTempDirectory(FileSystems.getDefault().getPath(base_dir), "pref")
tmpdir.toFile().deleteOnExit()
diff --git a/scripts/since_xxx.py b/scripts/since_xxx.py
index b810d0b..c6ecf25 100755
--- a/scripts/since_xxx.py
+++ b/scripts/since_xxx.py
@@ -5,7 +5,7 @@
Helper script to replace "@since xxx" in Javadoc by the upcoming revision number.
Will retrieve the current revision number from the server. It runs over all
-modified and added .java files and replaces xxx in "@since xxx" by the revision
+modified and added .java files and replaces xxx in "since xxx" by the revision
number that is to be expected for the next commit.
"""
@@ -25,9 +25,9 @@ def main():
continue
with open(path, 'r') as f:
filedata = f.read()
- filedata2 = re.sub("@since xxx", lambda _: "@since {}".format(get_revision()), filedata)
+ filedata2 = re.sub("since xxx", lambda _: "since {}".format(get_revision()), filedata)
if filedata != filedata2:
- print("replacing '@since xxx' with '@since {}' in '{}'".format(get_revision(), path))
+ print("replacing 'since xxx' with 'since {}' in '{}'".format(get_revision(), path))
with open(path, 'w') as f:
f.write(filedata2)
diff --git a/src/org/apache/commons/jcs/engine/control/CompositeCacheManager.java b/src/org/apache/commons/jcs/engine/control/CompositeCacheManager.java
index ff0979d..e62cb9a 100644
--- a/src/org/apache/commons/jcs/engine/control/CompositeCacheManager.java
+++ b/src/org/apache/commons/jcs/engine/control/CompositeCacheManager.java
@@ -736,8 +736,8 @@ public class CompositeCacheManager
if ( log.isDebugEnabled() )
{
log.debug( "Release called, but " + clients + " remain" );
- return;
}
+ return;
}
if ( log.isDebugEnabled() )
diff --git a/src/org/openstreetmap/josm/Main.java b/src/org/openstreetmap/josm/Main.java
index 70c71b3..d03d398 100644
--- a/src/org/openstreetmap/josm/Main.java
+++ b/src/org/openstreetmap/josm/Main.java
@@ -36,6 +36,7 @@ import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateForma
import org.openstreetmap.josm.data.coor.conversion.ICoordinateFormat;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
import org.openstreetmap.josm.data.projection.Projection;
import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
import org.openstreetmap.josm.gui.MainApplication;
@@ -114,7 +115,7 @@ public abstract class Main {
/**
* Global application preferences
*/
- public static final Preferences pref = new Preferences();
+ public static final Preferences pref = new Preferences(JosmBaseDirectories.getInstance());
/**
* The MapFrame.
diff --git a/src/org/openstreetmap/josm/actions/AlignInLineAction.java b/src/org/openstreetmap/josm/actions/AlignInLineAction.java
index a07bbab..453a877 100644
--- a/src/org/openstreetmap/josm/actions/AlignInLineAction.java
+++ b/src/org/openstreetmap/josm/actions/AlignInLineAction.java
@@ -254,6 +254,9 @@ public final class AlignInLineAction extends JosmAction {
nodes.addAll(w.getNodes());
lines.put(w, new Line(w));
}
+ if (nodes.isEmpty()) {
+ throw new InvalidSelection(tr("Intersection of three or more ways can not be solved. Abort."));
+ }
Collection<Command> cmds = new ArrayList<>(nodes.size());
List<Way> referers = new ArrayList<>(ways.size());
for (Node n: nodes) {
@@ -267,8 +270,7 @@ public final class AlignInLineAction extends JosmAction {
if (way.isFirstLastNode(n)) continue;
cmds.add(lines.get(way).projectionCommand(n));
} else if (referers.size() == 2) {
- Command cmd = lines.get(referers.get(0)).intersectionCommand(n, lines.get(referers.get(1)));
- cmds.add(cmd);
+ cmds.add(lines.get(referers.get(0)).intersectionCommand(n, lines.get(referers.get(1))));
} else
throw new InvalidSelection(tr("Intersection of three or more ways can not be solved. Abort."));
}
diff --git a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
index 93d33be..f13566f 100644
--- a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
+++ b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
@@ -33,10 +33,12 @@ import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
+import org.openstreetmap.josm.gui.util.WindowGeometry;
import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider;
import org.openstreetmap.josm.tools.Logging;
/**
@@ -242,6 +244,7 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
setContent(pnl);
setupDialog();
addWindowListener(new WindowEventHandler());
+ setRememberWindowGeometry(getClass().getName() + ".geometry", WindowGeometry.centerInWindow(Main.parent, getSize()));
}
private boolean areFieldsInFocus() {
@@ -260,11 +263,10 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
int semicolon = ostr.indexOf(';');
if (layer != null && semicolon >= 0 && semicolon + 1 < ostr.length()) {
try {
- // here we assume that Double.parseDouble() needs '.' as a decimal separator
- String easting = ostr.substring(0, semicolon).trim().replace(',', '.');
- String northing = ostr.substring(semicolon + 1).trim().replace(',', '.');
- double dx = Double.parseDouble(easting);
- double dy = Double.parseDouble(northing);
+ String easting = ostr.substring(0, semicolon).trim();
+ String northing = ostr.substring(semicolon + 1).trim();
+ double dx = JosmDecimalFormatSymbolsProvider.parseDouble(easting);
+ double dy = JosmDecimalFormatSymbolsProvider.parseDouble(northing);
tempOffset.setDisplacement(new EastNorth(dx, dy));
layer.getDisplaySettings().setOffsetBookmark(tempOffset);
} catch (NumberFormatException nfe) {
diff --git a/src/org/openstreetmap/josm/actions/JoinAreasAction.java b/src/org/openstreetmap/josm/actions/JoinAreasAction.java
index e1c905d..db80716 100644
--- a/src/org/openstreetmap/josm/actions/JoinAreasAction.java
+++ b/src/org/openstreetmap/josm/actions/JoinAreasAction.java
@@ -108,7 +108,7 @@ public class JoinAreasAction extends JosmAction {
* @param way outer way
*/
public Multipolygon(Way way) {
- outerWay = way;
+ outerWay = Objects.requireNonNull(way, "way");
innerWays = new ArrayList<>();
}
@@ -535,11 +535,6 @@ public class JoinAreasAction extends JosmAction {
//user canceled, do nothing.
try {
- // see #11026 - Because <ways> is a dynamic filtered (on ways) of a filtered (on selected objects) collection,
- // retrieve effective dataset before joining the ways (which affects the selection, thus, the <ways> collection)
- // Dataset retrieving allows to call this code without relying on Main.getCurrentDataSet(), thus, on a mapview instance
- ds = ways.iterator().next().getDataSet();
-
// Do the job of joining areas
JoinAreasResult result = joinAreas(areas);
@@ -601,6 +596,13 @@ public class JoinAreasAction extends JosmAction {
*/
public JoinAreasResult joinAreas(List<Multipolygon> areas) throws UserCancelException {
+ // see #11026 - Because <ways> is a dynamic filtered (on ways) of a filtered (on selected objects) collection,
+ // retrieve effective dataset before joining the ways (which affects the selection, thus, the <ways> collection)
+ // Dataset retrieving allows to call this code without relying on Main.getCurrentDataSet(), thus, on a mapview instance
+ if (!areas.isEmpty()) {
+ ds = areas.iterator().next().getOuterWay().getDataSet();
+ }
+
boolean hasChanges = false;
List<Way> allStartingWays = new ArrayList<>();
diff --git a/src/org/openstreetmap/josm/actions/MergeNodesAction.java b/src/org/openstreetmap/josm/actions/MergeNodesAction.java
index af36730..770b163 100644
--- a/src/org/openstreetmap/josm/actions/MergeNodesAction.java
+++ b/src/org/openstreetmap/josm/actions/MergeNodesAction.java
@@ -75,6 +75,7 @@ public class MergeNodesAction extends JosmAction {
return;
Collection<OsmPrimitive> selection = getLayerManager().getEditDataSet().getAllSelected();
List<Node> selectedNodes = OsmPrimitive.getFilteredList(selection, Node.class);
+ selectedNodes.removeIf(n -> n.isDeleted() || n.isIncomplete());
if (selectedNodes.size() == 1) {
MapView mapView = MainApplication.getMap().mapView;
diff --git a/src/org/openstreetmap/josm/actions/UploadAction.java b/src/org/openstreetmap/josm/actions/UploadAction.java
index a1c35b6..c433203 100644
--- a/src/org/openstreetmap/josm/actions/UploadAction.java
+++ b/src/org/openstreetmap/josm/actions/UploadAction.java
@@ -8,6 +8,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import javax.swing.JOptionPane;
@@ -20,6 +21,7 @@ import org.openstreetmap.josm.actions.upload.UploadHook;
import org.openstreetmap.josm.actions.upload.ValidateUploadHook;
import org.openstreetmap.josm.data.APIDataSet;
import org.openstreetmap.josm.data.conflict.ConflictCollection;
+import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.MainApplication;
import org.openstreetmap.josm.gui.io.UploadDialog;
@@ -245,12 +247,22 @@ public class UploadAction extends JosmAction {
return;
}
+ // Any hooks want to change the changeset tags?
+ Changeset cs = UploadDialog.getUploadDialog().getChangeset();
+ Map<String, String> changesetTags = cs.getKeys();
+ for (UploadHook hook : UPLOAD_HOOKS) {
+ hook.modifyChangesetTags(changesetTags);
+ }
+ for (UploadHook hook : LATE_UPLOAD_HOOKS) {
+ hook.modifyChangesetTags(changesetTags);
+ }
+
MainApplication.worker.execute(
new UploadPrimitivesTask(
UploadDialog.getUploadDialog().getUploadStrategySpecification(),
layer,
apiData,
- UploadDialog.getUploadDialog().getChangeset()
+ cs
)
);
}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
index 0507301..7eeeb85 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
@@ -47,11 +47,11 @@ import org.openstreetmap.josm.data.osm.WaySegment;
import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
import org.openstreetmap.josm.data.osm.visitor.paint.ArrowPaintHelper;
import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
-import org.openstreetmap.josm.data.preferences.AbstractToStringProperty;
+import org.openstreetmap.josm.data.preferences.AbstractProperty;
import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.data.preferences.CachingProperty;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
import org.openstreetmap.josm.data.preferences.DoubleProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.data.preferences.StrokeProperty;
import org.openstreetmap.josm.gui.MainApplication;
import org.openstreetmap.josm.gui.MainMenu;
@@ -109,12 +109,12 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
= new BooleanProperty("draw.anglesnap.showAngle", true).cached();
static final CachingProperty<Color> SNAP_HELPER_COLOR
- = new ColorProperty(marktr("draw angle snap"), Color.ORANGE).cached();
+ = new NamedColorProperty(marktr("draw angle snap"), Color.ORANGE).cached();
static final CachingProperty<Color> HIGHLIGHT_COLOR
- = new ColorProperty(marktr("draw angle snap highlight"), ORANGE_TRANSPARENT).cached();
+ = new NamedColorProperty(marktr("draw angle snap highlight"), ORANGE_TRANSPARENT).cached();
- static final AbstractToStringProperty<Color> RUBBER_LINE_COLOR
+ static final AbstractProperty<Color> RUBBER_LINE_COLOR
= PaintColors.SELECTED.getProperty().getChildColor(marktr("helper line"));
static final CachingProperty<Boolean> DRAW_HELPER_LINE
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
index 97ea94c..9e56e34 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
@@ -44,7 +44,7 @@ import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.WaySegment;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.gui.MainApplication;
import org.openstreetmap.josm.gui.MainMenu;
import org.openstreetmap.josm.gui.MapFrame;
@@ -309,8 +309,8 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
protected void readPreferences() {
initialMoveDelay = Config.getPref().getInt("edit.initial-move-delay", 200);
initialMoveThreshold = Config.getPref().getInt("extrude.initial-move-threshold", 1);
- mainColor = new ColorProperty(marktr("Extrude: main line"), Color.RED).get();
- helperColor = new ColorProperty(marktr("Extrude: helper line"), Color.ORANGE).get();
+ mainColor = new NamedColorProperty(marktr("Extrude: main line"), Color.RED).get();
+ helperColor = new NamedColorProperty(marktr("Extrude: helper line"), Color.ORANGE).get();
helperStrokeDash = GuiHelper.getCustomizedStroke(Config.getPref().get("extrude.stroke.helper-line", "1 4"));
helperStrokeRA = new BasicStroke(1);
symbolSize = Config.getPref().getDouble("extrude.angle-symbol-radius", 8);
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
index b2eaaee..007c84b 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
@@ -36,8 +36,8 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.WaySegment;
import org.openstreetmap.josm.data.preferences.CachingProperty;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.data.preferences.StrokeProperty;
import org.openstreetmap.josm.gui.MainApplication;
import org.openstreetmap.josm.gui.MapFrame;
@@ -160,7 +160,7 @@ public class ImproveWayAccuracyAction extends MapMode implements
@Override
protected void readPreferences() {
- guideColor = new ColorProperty(marktr("improve way accuracy helper line"), Color.RED).get();
+ guideColor = new NamedColorProperty(marktr("improve way accuracy helper line"), Color.RED).get();
}
@Override
@@ -277,7 +277,7 @@ public class ImproveWayAccuracyAction extends MapMode implements
int index = nodes.indexOf(candidateNode);
// Only draw line if node is not first and/or last
- if (index != 0 && index != (nodes.size() - 1)) {
+ if (index > 0 && index < (nodes.size() - 1)) {
p1 = nodes.get(index - 1);
p2 = nodes.get(index + 1);
} else if (targetWay.isClosed()) {
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java b/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
index 7f85f65..9a56055 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
@@ -34,7 +34,7 @@ import org.openstreetmap.josm.data.osm.WaySegment;
import org.openstreetmap.josm.data.preferences.AbstractToStringProperty;
import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.data.preferences.CachingProperty;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.data.preferences.DoubleProperty;
import org.openstreetmap.josm.data.preferences.IntegerProperty;
import org.openstreetmap.josm.data.preferences.StrokeProperty;
@@ -104,7 +104,7 @@ public class ParallelWayAction extends MapMode implements ModifierExListener {
private static final CachingProperty<Double> SNAP_DISTANCE_IMPERIAL = new DoubleProperty(prefKey("snap-distance-imperial"), 1).cached();
private static final CachingProperty<Double> SNAP_DISTANCE_CHINESE = new DoubleProperty(prefKey("snap-distance-chinese"), 1).cached();
private static final CachingProperty<Double> SNAP_DISTANCE_NAUTICAL = new DoubleProperty(prefKey("snap-distance-nautical"), 0.1).cached();
- private static final CachingProperty<Color> MAIN_COLOR = new ColorProperty(marktr("make parallel helper line"), Color.RED).cached();
+ private static final CachingProperty<Color> MAIN_COLOR = new NamedColorProperty(marktr("make parallel helper line"), Color.RED).cached();
private static final CachingProperty<Map<Modifier, Boolean>> SNAP_MODIFIER_COMBO
= new KeyboardModifiersProperty(prefKey("snap-modifier-combo"), "?sC").cached();
@@ -504,6 +504,8 @@ public class ParallelWayAction extends MapMode implements ModifierExListener {
if (referenceSegment == null)
return false;
+ sourceWays.removeIf(w -> w.isIncomplete() || w.getNodesCount() == 0);
+
if (!sourceWays.contains(referenceSegment.way)) {
clearSourceWays();
addSourceWay(referenceSegment.way);
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java b/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
index 36d4bad..fc8635b 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
@@ -43,18 +43,14 @@ public class ParallelWays {
* @param refWayIndex Need a reference way to determine the direction of the offset when we manage multiple ways
*/
public ParallelWays(Collection<Way> sourceWays, boolean copyTags, int refWayIndex) {
- // Possible/sensible to use PrimetiveDeepCopy here?
+ // Possible/sensible to use PrimitiveDeepCopy here?
// Make a deep copy of the ways, keeping the copied ways connected
// TODO: This assumes the first/last nodes of the ways are the only possible shared nodes.
Map<Node, Node> splitNodeMap = new HashMap<>(sourceWays.size());
for (Way w : sourceWays) {
- if (!splitNodeMap.containsKey(w.firstNode())) {
- splitNodeMap.put(w.firstNode(), copyNode(w.firstNode(), copyTags));
- }
- if (!splitNodeMap.containsKey(w.lastNode())) {
- splitNodeMap.put(w.lastNode(), copyNode(w.lastNode(), copyTags));
- }
+ copyNodeInMap(splitNodeMap, w.firstNode(), copyTags);
+ copyNodeInMap(splitNodeMap, w.lastNode(), copyTags);
}
ways = new ArrayList<>(sourceWays.size());
for (Way w : sourceWays) {
@@ -124,6 +120,12 @@ public class ParallelWays {
}
}
+ private static void copyNodeInMap(Map<Node, Node> splitNodeMap, Node node, boolean copyTags) {
+ if (!splitNodeMap.containsKey(node)) {
+ splitNodeMap.put(node, copyNode(node, copyTags));
+ }
+ }
+
/**
* Determines if the nodes graph form a closed path
* @return {@code true} if the nodes graph form a closed path
diff --git a/src/org/openstreetmap/josm/actions/upload/UploadHook.java b/src/org/openstreetmap/josm/actions/upload/UploadHook.java
index 5ef6488..6863fe8 100644
--- a/src/org/openstreetmap/josm/actions/upload/UploadHook.java
+++ b/src/org/openstreetmap/josm/actions/upload/UploadHook.java
@@ -1,20 +1,36 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.upload;
+import java.util.Map;
+
import org.openstreetmap.josm.data.APIDataSet;
/**
- * A check right before the upload. The UploadHook may modify the uploaded data
- * silently, it may display a warning message to the user or prevent the upload
- * altogether.
+ * Change, or block, the upload.
+ *
+ * The UploadHook may modify the uploaded data silently, it may display a
+ * warning message to the user or prevent the upload altogether.
+ *
+ * The tags of the changeset can also be changed with modifyChangesetTags method.
*/
- at FunctionalInterface
public interface UploadHook {
/**
- * Checks the upload.
- * @param apiDataSet the data to upload
- * @return {@code true} if upload is possible
+ * Check, and/or change, the data to be uploaded.
+ * Default implementation is to approve the upload.
+ * @param apiDataSet the data to upload, modify this to change the data.
+ * @return {@code true} if upload is possible, {@code false} to block the upload.
+ */
+ default boolean checkUpload(APIDataSet apiDataSet) {
+ return true;
+ }
+
+ /**
+ * Modify the changeset tags (in place) before upload.
+ * Default implementation is to do no changes.
+ * @param tags The current tags to change
+ * @since 13028
*/
- boolean checkUpload(APIDataSet apiDataSet);
+ default void modifyChangesetTags(Map<String, String> tags) {
+ }
}
diff --git a/src/org/openstreetmap/josm/data/APIDataSet.java b/src/org/openstreetmap/josm/data/APIDataSet.java
index e360e0d..52e5621 100644
--- a/src/org/openstreetmap/josm/data/APIDataSet.java
+++ b/src/org/openstreetmap/josm/data/APIDataSet.java
@@ -212,12 +212,12 @@ public class APIDataSet {
relationsToAdd.removeAll(noProblemRelations);
RelationUploadDependencyGraph graph = new RelationUploadDependencyGraph(relationsToAdd, true);
- newToAdd.addAll(graph.computeUploadOrder());
+ newToAdd.addAll(graph.computeUploadOrder(false));
toAdd = newToAdd;
List<OsmPrimitive> newToDelete = new LinkedList<>();
graph = new RelationUploadDependencyGraph(Utils.filteredCollection(toDelete, Relation.class), false);
- newToDelete.addAll(graph.computeUploadOrder());
+ newToDelete.addAll(graph.computeUploadOrder(true));
newToDelete.addAll(Utils.filteredCollection(toDelete, Way.class));
newToDelete.addAll(Utils.filteredCollection(toDelete, Node.class));
toDelete = newToDelete;
@@ -304,7 +304,7 @@ public class APIDataSet {
}
}
- public List<Relation> computeUploadOrder() throws CyclicUploadDependencyException {
+ public List<Relation> computeUploadOrder(boolean reverse) throws CyclicUploadDependencyException {
visited = new HashSet<>();
uploadOrder = new LinkedList<>();
Stack<Relation> path = new Stack<>();
@@ -312,7 +312,11 @@ public class APIDataSet {
visit(path, relation);
}
List<Relation> ret = new ArrayList<>(relations);
- ret.sort(Comparator.comparingInt(uploadOrder::indexOf));
+ Comparator<? super Relation> cmpr = Comparator.comparingInt(uploadOrder::indexOf);
+ if (reverse) {
+ cmpr = cmpr.reversed();
+ }
+ ret.sort(cmpr);
return ret;
}
}
diff --git a/src/org/openstreetmap/josm/data/Preferences.java b/src/org/openstreetmap/josm/data/Preferences.java
index 743576f..d08d996 100644
--- a/src/org/openstreetmap/josm/data/Preferences.java
+++ b/src/org/openstreetmap/josm/data/Preferences.java
@@ -5,8 +5,6 @@ import static org.openstreetmap.josm.tools.I18n.marktr;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Color;
-import java.awt.GraphicsEnvironment;
-import java.awt.Toolkit;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
@@ -14,9 +12,7 @@ import java.io.Reader;
import java.io.StringWriter;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
-import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -28,7 +24,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
-import java.util.ResourceBundle;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
@@ -36,7 +31,6 @@ import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.swing.JOptionPane;
@@ -44,24 +38,24 @@ import javax.xml.stream.XMLStreamException;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.preferences.BooleanProperty;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
import org.openstreetmap.josm.data.preferences.DoubleProperty;
import org.openstreetmap.josm.data.preferences.IntegerProperty;
-import org.openstreetmap.josm.spi.preferences.ListListSetting;
-import org.openstreetmap.josm.spi.preferences.ListSetting;
+import org.openstreetmap.josm.data.preferences.ColorInfo;
import org.openstreetmap.josm.data.preferences.LongProperty;
-import org.openstreetmap.josm.spi.preferences.MapListSetting;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.data.preferences.PreferencesReader;
import org.openstreetmap.josm.data.preferences.PreferencesWriter;
+import org.openstreetmap.josm.spi.preferences.AbstractPreferences;
+import org.openstreetmap.josm.spi.preferences.IBaseDirectories;
+import org.openstreetmap.josm.spi.preferences.IPreferences;
+import org.openstreetmap.josm.spi.preferences.ListListSetting;
+import org.openstreetmap.josm.spi.preferences.ListSetting;
+import org.openstreetmap.josm.spi.preferences.MapListSetting;
import org.openstreetmap.josm.spi.preferences.Setting;
import org.openstreetmap.josm.spi.preferences.StringSetting;
-import org.openstreetmap.josm.data.preferences.sources.ExtendedSourceEntry;
-import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
import org.openstreetmap.josm.io.OfflineAccessException;
import org.openstreetmap.josm.io.OnlineResource;
-import org.openstreetmap.josm.spi.preferences.AbstractPreferences;
-import org.openstreetmap.josm.spi.preferences.IBaseDirectories;
-import org.openstreetmap.josm.spi.preferences.IPreferences;
+import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ColorHelper;
import org.openstreetmap.josm.tools.I18n;
@@ -92,34 +86,20 @@ import org.xml.sax.SAXException;
* @author imi
* @since 74
*/
-public class Preferences extends AbstractPreferences implements IBaseDirectories {
+public class Preferences extends AbstractPreferences {
private static final String COLOR_PREFIX = "color.";
+ private static final Pattern COLOR_LAYER_PATTERN = Pattern.compile("layer\\.(.+)");
+ private static final Pattern COLOR_MAPPAINT_PATTERN = Pattern.compile("mappaint\\.(.+?)\\.(.+)");
private static final String[] OBSOLETE_PREF_KEYS = {
- "imagery.layers.addedIds", /* remove entry after June 2017 */
"projection", /* remove entry after Nov. 2017 */
"projection.sub", /* remove entry after Nov. 2017 */
};
private static final long MAX_AGE_DEFAULT_PREFERENCES = TimeUnit.DAYS.toSeconds(50);
- /**
- * Internal storage for the preference directory.
- * Do not access this variable directly!
- * @see #getPreferencesDirectory()
- */
- private File preferencesDir;
-
- /**
- * Internal storage for the cache directory.
- */
- private File cacheDir;
-
- /**
- * Internal storage for the user data directory.
- */
- private File userdataDir;
+ private final IBaseDirectories dirs;
/**
* Determines if preferences file is saved each time a property is changed.
@@ -145,7 +125,9 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
/**
* Maps color keys to human readable color name
+ * @deprecated (since 12987) no longer supported
*/
+ @Deprecated
protected final SortedMap<String, String> colornames = new TreeMap<>();
/**
@@ -245,7 +227,16 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
* Constructs a new {@code Preferences}.
*/
public Preferences() {
- // Default constructor
+ this.dirs = Config.getDirs();
+ }
+
+ /**
+ * Constructs a new {@code Preferences}.
+ *
+ * @param dirs the directories to use for saving the preferences
+ */
+ public Preferences(IBaseDirectories dirs) {
+ this.dirs = dirs;
}
/**
@@ -253,7 +244,9 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
* @param pref existing preferences to copy
* @since 12634
*/
+ @SuppressWarnings("deprecation")
public Preferences(Preferences pref) {
+ this(pref.dirs);
settingsMap.putAll(pref.settingsMap);
defaultsMap.putAll(pref.defaultsMap);
colornames.putAll(pref.colornames);
@@ -418,6 +411,14 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
}
/**
+ * Get the base directories associated with this preference instance.
+ * @return the base directories
+ */
+ public IBaseDirectories getDirs() {
+ return dirs;
+ }
+
+ /**
* Returns the user defined preferences directory, containing the preferences.xml file
* @return The user defined preferences directory, containing the preferences.xml file
* @since 7834
@@ -428,32 +429,12 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
return getPreferencesDirectory(false);
}
- @Override
+ /**
+ * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()}
+ */
+ @Deprecated
public File getPreferencesDirectory(boolean createIfMissing) {
- if (preferencesDir == null) {
- String path;
- path = System.getProperty("josm.pref");
- if (path != null) {
- preferencesDir = new File(path).getAbsoluteFile();
- } else {
- path = System.getProperty("josm.home");
- if (path != null) {
- preferencesDir = new File(path).getAbsoluteFile();
- } else {
- preferencesDir = Main.platform.getDefaultPrefDirectory();
- }
- }
- }
- if (createIfMissing && !preferencesDir.exists() && !preferencesDir.mkdirs()) {
- Logging.warn(tr("Failed to create missing preferences directory: {0}", preferencesDir.getAbsoluteFile()));
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("<html>Failed to create missing preferences directory: {0}</html>", preferencesDir.getAbsoluteFile()),
- tr("Error"),
- JOptionPane.ERROR_MESSAGE
- );
- }
- return preferencesDir;
+ return dirs.getPreferencesDirectory(createIfMissing);
}
/**
@@ -468,32 +449,12 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
return getUserDataDirectory(false);
}
- @Override
+ /**
+ * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()}
+ */
+ @Deprecated
public File getUserDataDirectory(boolean createIfMissing) {
- if (userdataDir == null) {
- String path;
- path = System.getProperty("josm.userdata");
- if (path != null) {
- userdataDir = new File(path).getAbsoluteFile();
- } else {
- path = System.getProperty("josm.home");
- if (path != null) {
- userdataDir = new File(path).getAbsoluteFile();
- } else {
- userdataDir = Main.platform.getDefaultUserDataDirectory();
- }
- }
- }
- if (createIfMissing && !userdataDir.exists() && !userdataDir.mkdirs()) {
- Logging.warn(tr("Failed to create missing user data directory: {0}", userdataDir.getAbsoluteFile()));
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("<html>Failed to create missing user data directory: {0}</html>", userdataDir.getAbsoluteFile()),
- tr("Error"),
- JOptionPane.ERROR_MESSAGE
- );
- }
- return userdataDir;
+ return dirs.getUserDataDirectory(createIfMissing);
}
/**
@@ -501,7 +462,7 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
* @return The user preferences file (preferences.xml)
*/
public File getPreferenceFile() {
- return new File(getPreferencesDirectory(false), "preferences.xml");
+ return new File(dirs.getPreferencesDirectory(false), "preferences.xml");
}
/**
@@ -509,7 +470,7 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
* @return the cache file for default preferences
*/
public File getDefaultsCacheFile() {
- return new File(getCacheDirectory(true), "default_preferences.xml");
+ return new File(dirs.getCacheDirectory(true), "default_preferences.xml");
}
/**
@@ -517,7 +478,7 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
* @return The user plugin directory
*/
public File getPluginsDirectory() {
- return new File(getUserDataDirectory(false), "plugins");
+ return new File(dirs.getUserDataDirectory(false), "plugins");
}
/**
@@ -533,36 +494,12 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
return getCacheDirectory(true);
}
- @Override
+ /**
+ * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()}
+ */
+ @Deprecated
public File getCacheDirectory(boolean createIfMissing) {
- if (cacheDir == null) {
- String path = System.getProperty("josm.cache");
- if (path != null) {
- cacheDir = new File(path).getAbsoluteFile();
- } else {
- path = System.getProperty("josm.home");
- if (path != null) {
- cacheDir = new File(path, "cache");
- } else {
- path = get("cache.folder", null);
- if (path != null) {
- cacheDir = new File(path).getAbsoluteFile();
- } else {
- cacheDir = Main.platform.getDefaultCacheDirectory();
- }
- }
- }
- }
- if (createIfMissing && !cacheDir.exists() && !cacheDir.mkdirs()) {
- Logging.warn(tr("Failed to create missing cache directory: {0}", cacheDir.getAbsoluteFile()));
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("<html>Failed to create missing cache directory: {0}</html>", cacheDir.getAbsoluteFile()),
- tr("Error"),
- JOptionPane.ERROR_MESSAGE
- );
- }
- return cacheDir;
+ return dirs.getCacheDirectory(createIfMissing);
}
private static void addPossibleResourceDir(Set<String> locations, String s) {
@@ -580,8 +517,8 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
*/
public Collection<String> getAllPossiblePreferenceDirs() {
Set<String> locations = new HashSet<>();
- addPossibleResourceDir(locations, getPreferencesDirectory(false).getPath());
- addPossibleResourceDir(locations, getUserDataDirectory(false).getPath());
+ addPossibleResourceDir(locations, dirs.getPreferencesDirectory(false).getPath());
+ addPossibleResourceDir(locations, dirs.getUserDataDirectory(false).getPath());
addPossibleResourceDir(locations, System.getenv("JOSM_RESOURCES"));
addPossibleResourceDir(locations, System.getProperty("josm.resources"));
if (Main.isPlatformWindows()) {
@@ -632,13 +569,49 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
}
/**
+ * Get all named colors, including customized and the default ones.
+ * @return a map of all named colors (maps preference key to {@link ColorInfo})
+ */
+ public synchronized Map<String, ColorInfo> getAllNamedColors() {
+ final Map<String, ColorInfo> all = new TreeMap<>();
+ for (final Entry<String, Setting<?>> e : settingsMap.entrySet()) {
+ if (!e.getKey().startsWith(NamedColorProperty.NAMED_COLOR_PREFIX))
+ continue;
+ Utils.instanceOfAndCast(e.getValue(), ListSetting.class)
+ .map(d -> d.getValue())
+ .map(lst -> ColorInfo.fromPref(lst, false))
+ .ifPresent(info -> all.put(e.getKey(), info));
+ }
+ for (final Entry<String, Setting<?>> e : defaultsMap.entrySet()) {
+ if (!e.getKey().startsWith(NamedColorProperty.NAMED_COLOR_PREFIX))
+ continue;
+ Utils.instanceOfAndCast(e.getValue(), ListSetting.class)
+ .map(d -> d.getValue())
+ .map(lst -> ColorInfo.fromPref(lst, true))
+ .ifPresent(infoDef -> {
+ ColorInfo info = all.get(e.getKey());
+ if (info == null) {
+ all.put(e.getKey(), infoDef);
+ } else {
+ info.setDefaultValue(infoDef.getDefaultValue());
+ }
+ });
+ }
+ return all;
+ }
+
+ /**
* Gets all known colors (preferences starting with the color prefix)
* @return All colors
+ * @deprecated (since 12987) replaced by {@link #getAllNamedColors()}
*/
+ @Deprecated
public synchronized Map<String, String> getAllColors() {
final Map<String, String> all = new TreeMap<>();
for (final Entry<String, Setting<?>> e : defaultsMap.entrySet()) {
if (e.getKey().startsWith(COLOR_PREFIX) && e.getValue() instanceof StringSetting) {
+ if (e.getKey().startsWith(COLOR_PREFIX+"layer."))
+ continue; // do not add unchanged layer colors
StringSetting d = (StringSetting) e.getValue();
if (d.getValue() != null) {
all.put(e.getKey().substring(6), d.getValue());
@@ -744,8 +717,6 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
if (!defaults) {
/* currently unused, but may help to fix configuration issues in future */
putInt("josm.version", Version.getInstance().getVersion());
-
- updateSystemProperties();
}
File backupFile = new File(prefFile + "_backup");
@@ -799,7 +770,6 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
reader.parse();
settingsMap.clear();
settingsMap.putAll(reader.getSettings());
- updateSystemProperties();
removeObsolete(reader.getVersion());
}
@@ -846,7 +816,7 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
public void init(boolean reset) {
initSuccessful = false;
// get the preferences.
- File prefDir = getPreferencesDirectory(false);
+ File prefDir = dirs.getPreferencesDirectory(false);
if (prefDir.exists()) {
if (!prefDir.isDirectory()) {
Logging.warn(tr("Failed to initialize preferences. Preference directory ''{0}'' is not a directory.",
@@ -946,9 +916,6 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
*/
public void resetToInitialState() {
resetToDefault();
- preferencesDir = null;
- cacheDir = null;
- userdataDir = null;
saveOnPut = true;
initSuccessful = false;
}
@@ -968,24 +935,35 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
* @param colName name of the colour
* @param def default value
* @return a Color object for the configured colour, or the default value if none configured.
- * @deprecated Use a {@link ColorProperty} instead.
+ * @deprecated Use a {@link NamedColorProperty} instead.
*/
@Deprecated
public synchronized Color getColor(String colName, Color def) {
return getColor(colName, null, def);
}
- /* only for preferences */
+ /**
+ * only for preferences
+ * @deprecated (since 12987) no longer supported
+ */
+ @Deprecated
public synchronized String getColorName(String o) {
- Matcher m = Pattern.compile("mappaint\\.(.+?)\\.(.+)").matcher(o);
- if (m.matches()) {
- return tr("Paint style {0}: {1}", tr(I18n.escape(m.group(1))), tr(I18n.escape(m.group(2))));
- }
- m = Pattern.compile("layer (.+)").matcher(o);
+ Matcher m = COLOR_LAYER_PATTERN.matcher(o);
if (m.matches()) {
return tr("Layer: {0}", tr(I18n.escape(m.group(1))));
}
- return tr(I18n.escape(colornames.containsKey(o) ? colornames.get(o) : o));
+ String fullKey = COLOR_PREFIX + o;
+ if (colornames.containsKey(fullKey)) {
+ String name = colornames.get(fullKey);
+ Matcher m2 = COLOR_MAPPAINT_PATTERN.matcher(name);
+ if (m2.matches()) {
+ return tr("Paint style {0}: {1}", tr(I18n.escape(m2.group(1))), tr(I18n.escape(m2.group(2))));
+ } else {
+ return tr(I18n.escape(colornames.get(fullKey)));
+ }
+ } else {
+ return fullKey;
+ }
}
/**
@@ -996,12 +974,12 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
* @param specName name of the special colour settings
* @param def default value
* @return a Color object for the configured colour, or the default value if none configured.
- * @deprecated Use a {@link ColorProperty} instead.
- * You can replace this by: <code>new ColorProperty(colName, def).getChildColor(specName)</code>
+ * @deprecated Use a {@link NamedColorProperty} instead.
+ * You can replace this by: <code>new NamedColorProperty(colName, def).getChildColor(specName)</code>
*/
@Deprecated
public synchronized Color getColor(String colName, String specName, Color def) {
- String colKey = ColorProperty.getColorKey(colName);
+ String colKey = org.openstreetmap.josm.data.preferences.ColorProperty.getColorKey(colName);
registerColor(colKey, colName);
String colStr = specName != null ? get(COLOR_PREFIX+specName) : "";
if (colStr.isEmpty()) {
@@ -1019,7 +997,9 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
* @param colKey The key
* @param colName The name of the color.
* @since 10824
+ * @deprecated (since 12987) no longer supported
*/
+ @Deprecated
public void registerColor(String colKey, String colName) {
if (!colKey.equals(colName)) {
colornames.put(colKey, colName);
@@ -1030,7 +1010,9 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
* Gets the default color that was registered with the preference
* @param colKey The color name
* @return The color
+ * @deprecated (since 12989) no longer supported
*/
+ @Deprecated
public synchronized Color getDefaultColor(String colKey) {
StringSetting col = Utils.cast(defaultsMap.get(COLOR_PREFIX+colKey), StringSetting.class);
String colStr = col == null ? null : col.getValue();
@@ -1042,8 +1024,10 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
* @param colKey The color name
* @param val The color
* @return true if the setting was modified
- * @see ColorProperty#put(Color)
+ * @see NamedColorProperty#put(Color)
+ * @deprecated (since 12987) no longer supported (see {@link NamedColorProperty})
*/
+ @Deprecated
public synchronized boolean putColor(String colKey, Color val) {
return put(COLOR_PREFIX+colKey, val != null ? ColorHelper.color2html(val, true) : null);
}
@@ -1428,6 +1412,11 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
return StructUtils.deserializeStruct(hash, klass);
}
+ @Override
+ public Set<String> getKeySet() {
+ return Collections.unmodifiableSet(settingsMap.keySet());
+ }
+
/**
* Gets a map of all settings that are currently stored
* @return The settings
@@ -1445,37 +1434,6 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
}
/**
- * Updates system properties with the current values in the preferences.
- */
- public void updateSystemProperties() {
- if ("true".equals(get("prefer.ipv6", "auto")) && !"true".equals(Utils.updateSystemProperty("java.net.preferIPv6Addresses", "true"))) {
- // never set this to false, only true!
- Logging.info(tr("Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early startup)."));
- }
- Utils.updateSystemProperty("http.agent", Version.getInstance().getAgentString());
- Utils.updateSystemProperty("user.language", get("language"));
- // Workaround to fix a Java bug. This ugly hack comes from Sun bug database: https://bugs.openjdk.java.net/browse/JDK-6292739
- // Force AWT toolkit to update its internal preferences (fix #6345).
- // Does not work anymore with Java 9, to remove with Java 9 migration
- if (Utils.getJavaVersion() < 9 && !GraphicsEnvironment.isHeadless()) {
- try {
- Field field = Toolkit.class.getDeclaredField("resources");
- Utils.setObjectsAccessible(field);
- field.set(null, ResourceBundle.getBundle("sun.awt.resources.awt"));
- } catch (ReflectiveOperationException | RuntimeException e) { // NOPMD
- // Catch RuntimeException in order to catch InaccessibleObjectException, new in Java 9
- Logging.warn(e);
- }
- }
- // Possibility to disable SNI (not by default) in case of misconfigured https servers
- // See #9875 + http://stackoverflow.com/a/14884941/2257172
- // then https://josm.openstreetmap.de/ticket/12152#comment:5 for details
- if (getBoolean("jdk.tls.disableSNIExtension", false)) {
- Utils.updateSystemProperty("jsse.enableSNIExtension", "false");
- }
- }
-
- /**
* Replies the collection of plugin site URLs from where plugin lists can be downloaded.
* @return the collection of plugin site URLs
* @see #getOnlinePluginSites
@@ -1549,21 +1507,6 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
* @param loadedVersion JOSM version when the preferences file was written
*/
private void removeObsolete(int loadedVersion) {
- // drop in March 2017
- removeUrlFromEntries(loadedVersion, 10063,
- "validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
- "resource://data/validator/power.mapcss");
- // drop in March 2017
- if (loadedVersion < 11058) {
- migrateOldColorKeys();
- }
- // drop in September 2017
- if (loadedVersion < 11424) {
- addNewerDefaultEntry(
- "validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
- "resource://data/validator/territories.mapcss");
- }
-
for (String key : OBSOLETE_PREF_KEYS) {
if (settingsMap.containsKey(key)) {
settingsMap.remove(key);
@@ -1572,63 +1515,6 @@ public class Preferences extends AbstractPreferences implements IBaseDirectories
}
}
- private void migrateOldColorKeys() {
- settingsMap.keySet().stream()
- .filter(key -> key.startsWith(COLOR_PREFIX))
- .flatMap(this::searchOldColorKey)
- .collect(Collectors.toList()) // to avoid ConcurrentModificationException
- .forEach(entry -> {
- final String oldKey = entry.getKey();
- final String newKey = entry.getValue();
- Logging.info("Migrating old color key {0} => {1}", oldKey, newKey);
- put(newKey, get(oldKey));
- put(oldKey, null);
- });
- }
-
- private Stream<AbstractMap.SimpleImmutableEntry<String, String>> searchOldColorKey(String key) {
- final String newKey = ColorProperty.getColorKey(key.substring(COLOR_PREFIX.length()));
- return key.equals(newKey) || settingsMap.containsKey(newKey)
- ? Stream.empty()
- : Stream.of(new AbstractMap.SimpleImmutableEntry<>(key, newKey));
- }
-
- private void removeUrlFromEntries(int loadedVersion, int versionMax, String key, String urlPart) {
- if (loadedVersion < versionMax) {
- Setting<?> setting = settingsMap.get(key);
- if (setting instanceof MapListSetting) {
- List<Map<String, String>> l = new LinkedList<>();
- boolean modified = false;
- for (Map<String, String> map: ((MapListSetting) setting).getValue()) {
- String url = map.get("url");
- if (url != null && url.contains(urlPart)) {
- modified = true;
- } else {
- l.add(map);
- }
- }
- if (modified) {
- putListOfMaps(key, l);
- }
- }
- }
- }
-
- private void addNewerDefaultEntry(String key, final String url) {
- Setting<?> setting = settingsMap.get(key);
- if (setting instanceof MapListSetting) {
- List<Map<String, String>> l = new ArrayList<>(((MapListSetting) setting).getValue());
- if (l.stream().noneMatch(x -> x.containsValue(url))) {
- ValidatorPrefHelper helper = ValidatorPrefHelper.INSTANCE;
- Optional<ExtendedSourceEntry> val = helper.getDefault().stream().filter(x -> url.equals(x.url)).findFirst();
- if (val.isPresent()) {
- l.add(helper.serialize(val.get()));
- }
- putListOfMaps(key, l);
- }
- }
- }
-
/**
* Enables or not the preferences file auto-save mechanism (save each time a setting is changed).
* This behaviour is enabled by default.
diff --git a/src/org/openstreetmap/josm/data/UndoRedoHandler.java b/src/org/openstreetmap/josm/data/UndoRedoHandler.java
index b859062..ac58e77 100644
--- a/src/org/openstreetmap/josm/data/UndoRedoHandler.java
+++ b/src/org/openstreetmap/josm/data/UndoRedoHandler.java
@@ -1,15 +1,12 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data;
-import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedList;
-import java.util.Optional;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -92,18 +89,8 @@ public class UndoRedoHandler {
* @param c The command to execute. Must not be {@code null}.
*/
public synchronized void add(final Command c) {
- DataSet ds = Optional.ofNullable(c.getAffectedDataSet()).orElseGet(() -> Main.main.getEditDataSet());
- Collection<? extends OsmPrimitive> oldSelection = null;
- if (ds != null) {
- oldSelection = ds.getSelected();
- }
addNoRedraw(c);
afterAdd();
-
- // the command may have changed the selection so tell the listeners about the current situation
- if (ds != null) {
- fireIfSelectionChanged(ds, oldSelection);
- }
}
/**
@@ -121,9 +108,7 @@ public class UndoRedoHandler {
if (commands.isEmpty())
return;
DataSet ds = Main.main.getEditDataSet();
- Collection<? extends OsmPrimitive> oldSelection = null;
if (ds != null) {
- oldSelection = ds.getSelected();
ds.beginUpdate();
}
try {
@@ -141,9 +126,6 @@ public class UndoRedoHandler {
}
}
fireCommandsChanged();
- if (ds != null) {
- fireIfSelectionChanged(ds, oldSelection);
- }
}
/**
@@ -160,8 +142,6 @@ public class UndoRedoHandler {
public void redo(int num) {
if (redoCommands.isEmpty())
return;
- DataSet ds = Main.main.getEditDataSet();
- Collection<? extends OsmPrimitive> oldSelection = ds.getSelected();
for (int i = 0; i < num; ++i) {
final Command c = redoCommands.removeFirst();
c.executeCommand();
@@ -171,14 +151,6 @@ public class UndoRedoHandler {
}
}
fireCommandsChanged();
- fireIfSelectionChanged(ds, oldSelection);
- }
-
- private static void fireIfSelectionChanged(DataSet ds, Collection<? extends OsmPrimitive> oldSelection) {
- Collection<? extends OsmPrimitive> newSelection = ds.getSelected();
- if (!oldSelection.equals(newSelection)) {
- ds.fireSelectionChanged();
- }
}
/**
diff --git a/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java b/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
index f92066d..65cdd58 100644
--- a/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
+++ b/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
@@ -159,38 +159,38 @@ public class TMSCachedTileLoaderJob extends JCSCachedTileLoaderJob<String, Buffe
boolean status = result.equals(LoadResult.SUCCESS);
try {
- tile.finishLoading(); // whatever happened set that loading has finished
- // set tile metadata
- if (this.attributes != null) {
- for (Entry<String, String> e: this.attributes.getMetadata().entrySet()) {
- tile.putValue(e.getKey(), e.getValue());
- }
+ tile.finishLoading(); // whatever happened set that loading has finished
+ // set tile metadata
+ if (this.attributes != null) {
+ for (Entry<String, String> e: this.attributes.getMetadata().entrySet()) {
+ tile.putValue(e.getKey(), e.getValue());
}
+ }
- switch(result) {
- case SUCCESS:
- handleNoTileAtZoom();
- if (attributes != null) {
- int httpStatusCode = attributes.getResponseCode();
- if (httpStatusCode >= 400 && !isNoTileAtZoom()) {
- if (attributes.getErrorMessage() == null) {
- tile.setError(tr("HTTP error {0} when loading tiles", httpStatusCode));
- } else {
- tile.setError(tr("Error downloading tiles: {0}", attributes.getErrorMessage()));
- }
- status = false;
+ switch(result) {
+ case SUCCESS:
+ handleNoTileAtZoom();
+ if (attributes != null) {
+ int httpStatusCode = attributes.getResponseCode();
+ if (httpStatusCode >= 400 && !isNoTileAtZoom()) {
+ if (attributes.getErrorMessage() == null) {
+ tile.setError(tr("HTTP error {0} when loading tiles", httpStatusCode));
+ } else {
+ tile.setError(tr("Error downloading tiles: {0}", attributes.getErrorMessage()));
}
+ status = false;
}
- status &= tryLoadTileImage(object); //try to keep returned image as background
- break;
- case FAILURE:
- tile.setError("Problem loading tile");
- tryLoadTileImage(object);
- break;
- case CANCELED:
- tile.loadingCanceled();
- // do nothing
}
+ status &= tryLoadTileImage(object); //try to keep returned image as background
+ break;
+ case FAILURE:
+ tile.setError("Problem loading tile");
+ tryLoadTileImage(object);
+ break;
+ case CANCELED:
+ tile.loadingCanceled();
+ // do nothing
+ }
// always check, if there is some listener interested in fact, that tile has finished loading
if (listeners != null) { // listeners might be null, if some other thread notified already about success
@@ -269,7 +269,11 @@ public class TMSCachedTileLoaderJob extends JCSCachedTileLoaderJob<String, Buffe
if (object != null) {
byte[] content = object.getContent();
if (content.length > 0) {
- tile.loadImage(new ByteArrayInputStream(content));
+ try {
+ tile.loadImage(new ByteArrayInputStream(content));
+ } catch (UnsatisfiedLinkError e) {
+ throw new IOException(e);
+ }
if (tile.getImage() == null) {
tile.setError(tr("Could not load image from tile server"));
return false;
diff --git a/src/org/openstreetmap/josm/data/oauth/OAuthAccessTokenHolder.java b/src/org/openstreetmap/josm/data/oauth/OAuthAccessTokenHolder.java
index 8eef479..a6bf7d4 100644
--- a/src/org/openstreetmap/josm/data/oauth/OAuthAccessTokenHolder.java
+++ b/src/org/openstreetmap/josm/data/oauth/OAuthAccessTokenHolder.java
@@ -6,6 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import org.openstreetmap.josm.data.Preferences;
import org.openstreetmap.josm.io.auth.CredentialsAgent;
import org.openstreetmap.josm.io.auth.CredentialsAgentException;
+import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.Logging;
@@ -142,10 +143,36 @@ public class OAuthAccessTokenHolder {
* Initializes the content of this holder from the Access Token managed by the
* credential manager.
*
+ * @param cm the credential manager. Must not be null.
+ * @throws IllegalArgumentException if cm is null
+ */
+ public void init(CredentialsAgent cm) {
+ CheckParameterUtil.ensureParameterNotNull(cm, "cm");
+ OAuthToken token = null;
+ try {
+ token = cm.lookupOAuthAccessToken();
+ } catch (CredentialsAgentException e) {
+ Logging.error(e);
+ Logging.warn(tr("Failed to retrieve OAuth Access Token from credential manager"));
+ Logging.warn(tr("Current credential manager is of type ''{0}''", cm.getClass().getName()));
+ }
+ saveToPreferences = Config.getPref().getBoolean("oauth.access-token.save-to-preferences", true);
+ if (token != null) {
+ accessTokenKey = token.getKey();
+ accessTokenSecret = token.getSecret();
+ }
+ }
+
+ /**
+ * Initializes the content of this holder from the Access Token managed by the
+ * credential manager.
+ *
* @param pref the preferences. Must not be null.
* @param cm the credential manager. Must not be null.
* @throws IllegalArgumentException if cm is null
+ * @deprecated (since 12928) replaced by {@link #init(org.openstreetmap.josm.io.auth.CredentialsAgent)}
*/
+ @Deprecated
public void init(Preferences pref, CredentialsAgent cm) {
CheckParameterUtil.ensureParameterNotNull(pref, "pref");
CheckParameterUtil.ensureParameterNotNull(cm, "cm");
@@ -168,11 +195,36 @@ public class OAuthAccessTokenHolder {
* Saves the content of this holder to the preferences and a credential store managed
* by a credential manager.
*
+ * @param cm the credentials manager. Must not be null.
+ * @throws IllegalArgumentException if cm is null
+ */
+ public void save(CredentialsAgent cm) {
+ CheckParameterUtil.ensureParameterNotNull(cm, "cm");
+ Config.getPref().putBoolean("oauth.access-token.save-to-preferences", saveToPreferences);
+ try {
+ if (!saveToPreferences) {
+ cm.storeOAuthAccessToken(null);
+ } else {
+ cm.storeOAuthAccessToken(new OAuthToken(accessTokenKey, accessTokenSecret));
+ }
+ } catch (CredentialsAgentException e) {
+ Logging.error(e);
+ Logging.warn(tr("Failed to store OAuth Access Token to credentials manager"));
+ Logging.warn(tr("Current credential manager is of type ''{0}''", cm.getClass().getName()));
+ }
+ }
+
+ /**
+ * Saves the content of this holder to the preferences and a credential store managed
+ * by a credential manager.
+ *
* @param preferences the preferences. Must not be null.
* @param cm the credentials manager. Must not be null.
* @throws IllegalArgumentException if preferences is null
* @throws IllegalArgumentException if cm is null
+ * @deprecated (since 12928) replaced by {@link #save(org.openstreetmap.josm.io.auth.CredentialsAgent)}
*/
+ @Deprecated
public void save(Preferences preferences, CredentialsAgent cm) {
CheckParameterUtil.ensureParameterNotNull(preferences, "preferences");
CheckParameterUtil.ensureParameterNotNull(cm, "cm");
diff --git a/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java b/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
index afe4eb9..0ea116c 100644
--- a/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
+++ b/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
@@ -6,6 +6,7 @@ import java.util.Objects;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Preferences;
import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.Utils;
@@ -78,9 +79,29 @@ public class OAuthParameters {
/**
* Replies a set of parameters as defined in the preferences.
*
+ * @param apiUrl the API URL. Must not be null.
+ * @return the parameters
+ */
+ public static OAuthParameters createFromApiUrl(String apiUrl) {
+ OAuthParameters parameters = createDefault(apiUrl);
+ return new OAuthParameters(
+ Config.getPref().get("oauth.settings.consumer-key", parameters.getConsumerKey()),
+ Config.getPref().get("oauth.settings.consumer-secret", parameters.getConsumerSecret()),
+ Config.getPref().get("oauth.settings.request-token-url", parameters.getRequestTokenUrl()),
+ Config.getPref().get("oauth.settings.access-token-url", parameters.getAccessTokenUrl()),
+ Config.getPref().get("oauth.settings.authorise-url", parameters.getAuthoriseUrl()),
+ Config.getPref().get("oauth.settings.osm-login-url", parameters.getOsmLoginUrl()),
+ Config.getPref().get("oauth.settings.osm-logout-url", parameters.getOsmLogoutUrl()));
+ }
+
+ /**
+ * Replies a set of parameters as defined in the preferences.
+ *
* @param pref the preferences
* @return the parameters
+ * @deprecated (since 12928) replaced by {@link #createFromApiUrl(java.lang.String)}
*/
+ @Deprecated
public static OAuthParameters createFromPreferences(Preferences pref) {
OAuthParameters parameters = createDefault(pref.get("osm-server.url"));
return new OAuthParameters(
@@ -94,11 +115,26 @@ public class OAuthParameters {
}
/**
+ * Remembers the current values in the preferences.
+ */
+ public void rememberPreferences() {
+ Config.getPref().put("oauth.settings.consumer-key", getConsumerKey());
+ Config.getPref().put("oauth.settings.consumer-secret", getConsumerSecret());
+ Config.getPref().put("oauth.settings.request-token-url", getRequestTokenUrl());
+ Config.getPref().put("oauth.settings.access-token-url", getAccessTokenUrl());
+ Config.getPref().put("oauth.settings.authorise-url", getAuthoriseUrl());
+ Config.getPref().put("oauth.settings.osm-login-url", getOsmLoginUrl());
+ Config.getPref().put("oauth.settings.osm-logout-url", getOsmLogoutUrl());
+ }
+
+ /**
* Remembers the current values in the preferences <code>pref</code>.
*
* @param pref the preferences. Must not be null.
* @throws IllegalArgumentException if pref is null.
+ * @deprecated (since 12928) replaced by {@link #rememberPreferences()}
*/
+ @Deprecated
public void rememberPreferences(Preferences pref) {
CheckParameterUtil.ensureParameterNotNull(pref, "pref");
pref.put("oauth.settings.consumer-key", getConsumerKey());
@@ -128,7 +164,7 @@ public class OAuthParameters {
* @param osmLoginUrl the OSM login URL (for automatic mode)
* @param osmLogoutUrl the OSM logout URL (for automatic mode)
* @see #createDefault
- * @see #createFromPreferences
+ * @see #createFromApiUrl
* @since 9220
*/
public OAuthParameters(String consumerKey, String consumerSecret,
diff --git a/src/org/openstreetmap/josm/data/osm/DataSelectionListener.java b/src/org/openstreetmap/josm/data/osm/DataSelectionListener.java
index 4038b84..5eef12c 100644
--- a/src/org/openstreetmap/josm/data/osm/DataSelectionListener.java
+++ b/src/org/openstreetmap/josm/data/osm/DataSelectionListener.java
@@ -158,6 +158,11 @@ public interface DataSelectionListener {
}
return added;
}
+
+ @Override
+ public String toString() {
+ return "SelectionReplaceEvent [current=" + current + ", removed=" + removed + ", added=" + added + ']';
+ }
}
/**
@@ -202,6 +207,11 @@ public interface DataSelectionListener {
public Set<OsmPrimitive> getAdded() {
return Collections.unmodifiableSet(add);
}
+
+ @Override
+ public String toString() {
+ return "SelectionAddEvent [add=" + add + ", current=" + current + ']';
+ }
}
/**
@@ -247,6 +257,11 @@ public interface DataSelectionListener {
public Set<OsmPrimitive> getAdded() {
return Collections.emptySet();
}
+
+ @Override
+ public String toString() {
+ return "SelectionRemoveEvent [remove=" + remove + ", current=" + current + ']';
+ }
}
/**
@@ -297,5 +312,10 @@ public interface DataSelectionListener {
public Set<OsmPrimitive> getAdded() {
return Collections.unmodifiableSet(add);
}
+
+ @Override
+ public String toString() {
+ return "SelectionToggleEvent [current=" + current + ", remove=" + remove + ", add=" + add + ']';
+ }
}
}
diff --git a/src/org/openstreetmap/josm/data/osm/DataSet.java b/src/org/openstreetmap/josm/data/osm/DataSet.java
index 0a172ee..a0e92c6 100644
--- a/src/org/openstreetmap/josm/data/osm/DataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/DataSet.java
@@ -206,7 +206,7 @@ public final class DataSet extends QuadBucketPrimitiveStore implements Data, Pro
// Transparently register as projection change listener. No need to explicitly remove
// the listener, projection change listeners are managed as WeakReferences.
Main.addProjectionChangeListener(this);
- addSelectionListener((DataSelectionListener) e -> fireDreprecatedSelectionChange(e.getSelection()));
+ addSelectionListener((DataSelectionListener) e -> fireDeprecatedSelectionChange(e.getSelection()));
}
/**
@@ -681,10 +681,10 @@ public final class DataSet extends QuadBucketPrimitiveStore implements Data, Pro
*/
@Deprecated
public void fireSelectionChanged() {
- fireDreprecatedSelectionChange(getAllSelected());
+ fireDeprecatedSelectionChange(getAllSelected());
}
- private static void fireDreprecatedSelectionChange(Collection<? extends OsmPrimitive> currentSelection) {
+ private static void fireDeprecatedSelectionChange(Collection<? extends OsmPrimitive> currentSelection) {
for (SelectionChangedListener l : selListeners) {
l.selectionChanged(currentSelection);
}
diff --git a/src/org/openstreetmap/josm/data/osm/Node.java b/src/org/openstreetmap/josm/data/osm/Node.java
index bde0341..b9969e9 100644
--- a/src/org/openstreetmap/josm/data/osm/Node.java
+++ b/src/org/openstreetmap/josm/data/osm/Node.java
@@ -41,17 +41,6 @@ public final class Node extends OsmPrimitive implements INode {
*/
private Object eastNorthCacheKey;
- /**
- * Determines if this node has valid coordinates.
- * @return {@code true} if this node has valid coordinates
- * @since 7828
- */
- @Override
- public boolean isLatLonKnown() {
- // We cannot use default implementation - if we remove this implementation, we will break binary compatibility.
- return !Double.isNaN(lat) && !Double.isNaN(lon);
- }
-
@Override
public void setCoor(LatLon coor) {
updateCoor(coor, null);
diff --git a/src/org/openstreetmap/josm/data/osm/OsmUtils.java b/src/org/openstreetmap/josm/data/osm/OsmUtils.java
index ae2eaf8..e2622a5 100644
--- a/src/org/openstreetmap/josm/data/osm/OsmUtils.java
+++ b/src/org/openstreetmap/josm/data/osm/OsmUtils.java
@@ -138,4 +138,18 @@ public final class OsmUtils {
}
return p;
}
+
+ /**
+ * Returns the layer value of primitive (null for layer 0).
+ * @param w OSM primitive
+ * @return the value of "layer" key, or null if absent or set to 0 (default value)
+ * @since 12986
+ */
+ public static String getLayer(OsmPrimitive w) {
+ String layer1 = w.get("layer");
+ if ("0".equals(layer1)) {
+ layer1 = null; // 0 is default value for layer.
+ }
+ return layer1;
+ }
}
diff --git a/src/org/openstreetmap/josm/data/osm/Way.java b/src/org/openstreetmap/josm/data/osm/Way.java
index 01c11fd..a1de0e7 100644
--- a/src/org/openstreetmap/josm/data/osm/Way.java
+++ b/src/org/openstreetmap/josm/data/osm/Way.java
@@ -666,16 +666,16 @@ public final class Way extends OsmPrimitive implements IWay {
}
return false;
}
-
+
/**
- * Replies true if all nodes of the way are drawable, false otherwise.
- * @return true if all nodes of the way are drawable, false otherwise.
- * @since 12876
+ * Replies true if all nodes of the way have known lat/lon, false otherwise.
+ * @return true if all nodes of the way have known lat/lon, false otherwise
+ * @since 13033
*/
- public boolean hasOnlyDrawableNodes() {
+ public boolean hasOnlyLocatableNodes() {
Node[] nodes = this.nodes;
for (Node node : nodes) {
- if (!node.isDrawable())
+ if (!node.isLatLonKnown())
return false;
}
return true;
@@ -688,7 +688,7 @@ public final class Way extends OsmPrimitive implements IWay {
@Override
public boolean isDrawable() {
- return super.isDrawable() && hasOnlyDrawableNodes();
+ return super.isDrawable() && hasOnlyLocatableNodes();
}
/**
diff --git a/src/org/openstreetmap/josm/data/osm/WaySegment.java b/src/org/openstreetmap/josm/data/osm/WaySegment.java
index 6a52eff..18d2d31 100644
--- a/src/org/openstreetmap/josm/data/osm/WaySegment.java
+++ b/src/org/openstreetmap/josm/data/osm/WaySegment.java
@@ -24,10 +24,14 @@ public final class WaySegment implements Comparable<WaySegment> {
* Constructs a new {@code WaySegment}.
* @param w The way
* @param i The node lower index
+ * @throws IllegalArgumentException in case of invalid index
*/
public WaySegment(Way w, int i) {
way = w;
lowerIndex = i;
+ if (i < 0 || i >= w.getNodesCount() - 1) {
+ throw new IllegalArgumentException(toString());
+ }
}
/**
diff --git a/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java b/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
index 83ab791..76b556c 100644
--- a/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
+++ b/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
@@ -11,6 +11,7 @@ import java.util.stream.Stream;
import javax.swing.SwingUtilities;
import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.DataIntegrityProblemException;
import org.openstreetmap.josm.data.osm.DataSelectionListener;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
@@ -18,6 +19,7 @@ import org.openstreetmap.josm.gui.MainApplication;
import org.openstreetmap.josm.gui.layer.MainLayerManager;
import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
+import org.openstreetmap.josm.tools.bugreport.BugReport;
/**
* Similar like {@link DatasetEventManager}, just for selection events.
@@ -177,18 +179,16 @@ public class SelectionEventManager implements DataSelectionListener, ActiveLayer
// Relying on this allows components to not have to monitor layer changes.
// If we would not do this, e.g. the move command would have a hard time tracking which layer
// the last moved selection was in.
- SelectionReplaceEvent event = new SelectionReplaceEvent(oldDataSet,
- new HashSet<>(oldDataSet.getAllSelected()), Stream.empty());
- selectionChanged(event);
+ selectionChanged(new SelectionReplaceEvent(oldDataSet,
+ new HashSet<>(oldDataSet.getAllSelected()), Stream.empty()));
oldDataSet.removeSelectionListener(this);
}
DataSet newDataSet = e.getSource().getEditDataSet();
if (newDataSet != null) {
newDataSet.addSelectionListener(this);
// Fake a selection add
- SelectionReplaceEvent event = new SelectionReplaceEvent(newDataSet,
- Collections.emptySet(), newDataSet.getAllSelected().stream());
- selectionChanged(event);
+ selectionChanged(new SelectionReplaceEvent(newDataSet,
+ Collections.emptySet(), newDataSet.getAllSelected().stream()));
}
}
@@ -200,7 +200,11 @@ public class SelectionEventManager implements DataSelectionListener, ActiveLayer
private static void fireEvent(List<ListenerInfo> listeners, SelectionChangeEvent event) {
for (ListenerInfo listener: listeners) {
- listener.fire(event);
+ try {
+ listener.fire(event);
+ } catch (DataIntegrityProblemException e) {
+ throw BugReport.intercept(e).put("event", event).put("listeners", listeners);
+ }
}
}
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/ComputeStyleListWorker.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/ComputeStyleListWorker.java
index e9cefe8..45e82c1 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/ComputeStyleListWorker.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/ComputeStyleListWorker.java
@@ -35,7 +35,7 @@ public class ComputeStyleListWorker extends RecursiveTask<List<StyleRecord>> imp
private final transient List<? extends OsmPrimitive> input;
private final transient List<StyleRecord> output;
- private final transient ElemStyles styles = MapPaintStyles.getStyles();
+ private final transient ElemStyles styles;
private final int directExecutionTaskSize;
private final double circum;
private final NavigatableComponent nc;
@@ -54,11 +54,28 @@ public class ComputeStyleListWorker extends RecursiveTask<List<StyleRecord>> imp
*/
ComputeStyleListWorker(double circum, NavigatableComponent nc,
final List<? extends OsmPrimitive> input, List<StyleRecord> output, int directExecutionTaskSize) {
+ this(circum, nc, input, output, directExecutionTaskSize, MapPaintStyles.getStyles());
+ }
+
+ /**
+ * Constructs a new {@code ComputeStyleListWorker}.
+ * @param circum distance on the map in meters that 100 screen pixels represent
+ * @param nc navigatable component
+ * @param input the primitives to process
+ * @param output the list of styles to which styles will be added
+ * @param directExecutionTaskSize the threshold deciding whether to subdivide the tasks
+ * @param styles the {@link ElemStyles} instance used to generate primitive {@link StyleElement}s.
+ * @since 12964
+ */
+ ComputeStyleListWorker(double circum, NavigatableComponent nc,
+ final List<? extends OsmPrimitive> input, List<StyleRecord> output, int directExecutionTaskSize,
+ ElemStyles styles) {
this.circum = circum;
this.nc = nc;
this.input = input;
this.output = output;
this.directExecutionTaskSize = directExecutionTaskSize;
+ this.styles = styles;
this.drawArea = circum <= Config.getPref().getInt("mappaint.fillareas", 10_000_000);
this.drawMultipolygon = drawArea && Config.getPref().getBoolean("mappaint.multipolygon", true);
this.drawRestriction = Config.getPref().getBoolean("mappaint.restriction", true);
@@ -74,7 +91,7 @@ public class ComputeStyleListWorker extends RecursiveTask<List<StyleRecord>> imp
for (int fromIndex = 0; fromIndex < input.size(); fromIndex += directExecutionTaskSize) {
final int toIndex = Math.min(fromIndex + directExecutionTaskSize, input.size());
tasks.add(new ComputeStyleListWorker(circum, nc, input.subList(fromIndex, toIndex),
- new ArrayList<>(directExecutionTaskSize), directExecutionTaskSize).fork());
+ new ArrayList<>(directExecutionTaskSize), directExecutionTaskSize, styles).fork());
}
for (ForkJoinTask<List<StyleRecord>> task : tasks) {
output.addAll(task.join());
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 7957c90..c5e0620 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java
@@ -4,14 +4,10 @@ package org.openstreetmap.josm.data.osm.visitor.paint;
import static org.openstreetmap.josm.tools.I18n.marktr;
import java.awt.Color;
-import java.util.List;
-import java.util.Optional;
import org.openstreetmap.josm.data.preferences.CachingProperty;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
-import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintSylesUpdateListener;
-import org.openstreetmap.josm.gui.mappaint.StyleSource;
/**
* The colors used to paint the map, especially with the wireframe renderer
@@ -87,30 +83,11 @@ public enum PaintColors {
*/
private final String name;
private final Color defaultColor;
- private final ColorProperty baseProperty;
+ private final NamedColorProperty baseProperty;
private final CachingProperty<Color> property;
- private static volatile Color backgroundColorCache;
-
- private static final MapPaintSylesUpdateListener STYLE_OVERRIDE_LISTENER = new MapPaintSylesUpdateListener() {
- //TODO: Listen to wireframe map mode changes.
- @Override
- public void mapPaintStylesUpdated() {
- backgroundColorCache = null;
- }
-
- @Override
- public void mapPaintStyleEntryUpdated(int idx) {
- mapPaintStylesUpdated();
- }
- };
-
- static {
- MapPaintStyles.addMapPaintSylesUpdateListener(STYLE_OVERRIDE_LISTENER);
- }
-
PaintColors(String name, Color defaultColor) {
- baseProperty = new ColorProperty(name, defaultColor);
+ baseProperty = new NamedColorProperty(name, defaultColor);
property = baseProperty.cached();
this.name = name;
this.defaultColor = defaultColor;
@@ -137,19 +114,7 @@ public enum PaintColors {
* @return the background color
*/
public static Color getBackgroundColor() {
- if (backgroundColorCache != null)
- return backgroundColorCache;
- List<StyleSource> sources = MapPaintStyles.getStyles().getStyleSources();
- for (StyleSource s : sources) {
- if (!s.active) {
- continue;
- }
- Color backgroundColorOverride = s.getBackgroundColorOverride();
- if (backgroundColorOverride != null) {
- backgroundColorCache = backgroundColorOverride;
- }
- }
- return Optional.ofNullable(backgroundColorCache).orElseGet(BACKGROUND::get);
+ return MapPaintStyles.getStyles().getBackgroundColor();
}
/**
@@ -157,7 +122,7 @@ public enum PaintColors {
* @return The property that is used to access the color.
* @since 10874
*/
- public ColorProperty getProperty() {
+ public NamedColorProperty getProperty() {
return baseProperty;
}
}
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 98a6d53..a4337a7 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
@@ -64,6 +64,8 @@ import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
import org.openstreetmap.josm.gui.NavigatableComponent;
import org.openstreetmap.josm.gui.draw.MapViewPath;
import org.openstreetmap.josm.gui.draw.MapViewPositionAndRotation;
+import org.openstreetmap.josm.gui.mappaint.ElemStyles;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement;
import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.HorizontalTextAlignment;
import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.VerticalTextAlignment;
@@ -260,6 +262,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
private double scale;
private MapPaintSettings paintSettings;
+ private ElemStyles styles;
private Color highlightColorTransparent;
@@ -344,6 +347,15 @@ public class StyledMapRenderer extends AbstractMapRenderer {
super(g, nc, isInactiveMode);
Component focusOwner = FocusManager.getCurrentManager().getFocusOwner();
useWiderHighlight = !(focusOwner instanceof AbstractButton || focusOwner == nc);
+ this.styles = MapPaintStyles.getStyles();
+ }
+
+ /**
+ * Set the {@link ElemStyles} instance to use for this renderer.
+ * @param styles the {@code ElemStyles} instance to use
+ */
+ public void setStyles(ElemStyles styles) {
+ this.styles = styles;
}
private void displaySegments(MapViewPath path, Path2D orientationArrows, Path2D onewayArrows, Path2D onewayArrowsCasing,
@@ -1359,7 +1371,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
public void getColors() {
super.getColors();
this.highlightColorTransparent = new Color(highlightColor.getRed(), highlightColor.getGreen(), highlightColor.getBlue(), 100);
- this.backgroundColor = PaintColors.getBackgroundColor();
+ this.backgroundColor = styles.getBackgroundColor();
}
@Override
@@ -1625,9 +1637,9 @@ public class StyledMapRenderer extends AbstractMapRenderer {
// Reason: Make sure, ElemStyles.getStyleCacheWithRange is not called for the same primitive in parallel threads.
// (Could be synchronized, but try to avoid this for performance reasons.)
THREAD_POOL.invoke(new ComputeStyleListWorker(circum, nc, relations, allStyleElems,
- Math.max(20, relations.size() / THREAD_POOL.getParallelism() / 3)));
+ Math.max(20, relations.size() / THREAD_POOL.getParallelism() / 3), styles));
THREAD_POOL.invoke(new ComputeStyleListWorker(circum, nc, new CompositeList<>(nodes, ways), allStyleElems,
- Math.max(100, (nodes.size() + ways.size()) / THREAD_POOL.getParallelism() / 3)));
+ Math.max(100, (nodes.size() + ways.size()) / THREAD_POOL.getParallelism() / 3), styles));
if (!benchmark.renderSort()) {
return;
diff --git a/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java b/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java
index 1ecf57d..86e3c9d 100644
--- a/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java
+++ b/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java
@@ -1,8 +1,8 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.preferences;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.spi.preferences.IPreferences;
import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
import org.openstreetmap.josm.tools.ListenableWeakReference;
@@ -151,7 +151,7 @@ public abstract class AbstractProperty<T> {
/**
* The preferences object this property is for.
*/
- protected final Preferences preferences;
+ protected final IPreferences preferences;
protected final String key;
protected final T defaultValue;
@@ -163,13 +163,13 @@ public abstract class AbstractProperty<T> {
*/
public AbstractProperty(String key, T defaultValue) {
// Main.pref should not change in production but may change during tests.
- preferences = Main.pref;
+ preferences = Config.getPref();
this.key = key;
this.defaultValue = defaultValue;
}
/**
- * Store the default value to {@link Preferences}.
+ * Store the default value to the preferences.
*/
protected void storeDefaultValue() {
if (getPreferences() != null) {
@@ -190,7 +190,7 @@ public abstract class AbstractProperty<T> {
* @return true if {@code Main.pref} contains this property.
*/
public boolean isSet() {
- return !getPreferences().get(key).isEmpty();
+ return getPreferences().getKeySet().contains(key);
}
/**
@@ -205,7 +205,7 @@ public abstract class AbstractProperty<T> {
* Removes this property from JOSM preferences (i.e replace it by its default value).
*/
public void remove() {
- put(getDefaultValue());
+ getPreferences().put(key, null);
}
/**
@@ -226,13 +226,22 @@ public abstract class AbstractProperty<T> {
/**
* Gets the preferences used for this property.
* @return The preferences for this property.
- * @since 10824
+ * @since 12999
*/
- protected Preferences getPreferences() {
+ protected IPreferences getPreferences() {
return preferences;
}
/**
+ * Creates a new {@link CachingProperty} instance for this property.
+ * @return The new caching property instance.
+ * @since 12983
+ */
+ public CachingProperty<T> cached() {
+ return new CachingProperty<>(this);
+ }
+
+ /**
* Adds a listener that listens only for changes to this preference key.
* @param listener The listener to add.
* @since 10824
diff --git a/src/org/openstreetmap/josm/data/preferences/AbstractToStringProperty.java b/src/org/openstreetmap/josm/data/preferences/AbstractToStringProperty.java
index 55185d9..59f6ad7 100644
--- a/src/org/openstreetmap/josm/data/preferences/AbstractToStringProperty.java
+++ b/src/org/openstreetmap/josm/data/preferences/AbstractToStringProperty.java
@@ -145,11 +145,4 @@ public abstract class AbstractToStringProperty<T> extends AbstractProperty<T> {
return new ChildProperty<>(this, key);
}
- /**
- * Creates a new {@link CachingProperty} instance for this property.
- * @return The new caching property instance.
- */
- public CachingProperty<T> cached() {
- return new CachingProperty<>(this);
- }
}
diff --git a/src/org/openstreetmap/josm/data/preferences/CachingProperty.java b/src/org/openstreetmap/josm/data/preferences/CachingProperty.java
index 8e03e6a..ea3ee69 100644
--- a/src/org/openstreetmap/josm/data/preferences/CachingProperty.java
+++ b/src/org/openstreetmap/josm/data/preferences/CachingProperty.java
@@ -14,7 +14,7 @@ import org.openstreetmap.josm.data.preferences.AbstractProperty.ValueChangeListe
public class CachingProperty<T> extends AbstractProperty<T> implements ValueChangeListener<T> {
private T cache;
- private boolean cacheActive;
+ private boolean cacheValid;
private final AbstractProperty<T> toCache;
/**
@@ -29,9 +29,9 @@ public class CachingProperty<T> extends AbstractProperty<T> implements ValueChan
@Override
public synchronized T get() {
- if (!cacheActive) {
+ if (!cacheValid) {
cache = toCache.get();
- cacheActive = true;
+ cacheValid = true;
}
return cache;
}
@@ -43,6 +43,6 @@ public class CachingProperty<T> extends AbstractProperty<T> implements ValueChan
@Override
public synchronized void valueChanged(ValueChangeEvent<? extends T> e) {
- cacheActive = false;
+ cacheValid = false;
}
}
diff --git a/src/org/openstreetmap/josm/data/preferences/CollectionProperty.java b/src/org/openstreetmap/josm/data/preferences/CollectionProperty.java
index 27351b0..a0f7ad9 100644
--- a/src/org/openstreetmap/josm/data/preferences/CollectionProperty.java
+++ b/src/org/openstreetmap/josm/data/preferences/CollectionProperty.java
@@ -1,10 +1,9 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.preferences;
+import java.util.ArrayList;
import java.util.Collection;
-import org.openstreetmap.josm.Main;
-
/**
* A property containing a {@code Collection} of {@code String} as value.
* @deprecated use {@link ListProperty}
@@ -19,18 +18,18 @@ public class CollectionProperty extends AbstractProperty<Collection<String>> {
*/
public CollectionProperty(String key, Collection<String> defaultValue) {
super(key, defaultValue);
- if (Main.pref != null) {
+ if (getPreferences() != null) {
get();
}
}
@Override
public Collection<String> get() {
- return getPreferences().getCollection(getKey(), getDefaultValue());
+ return getPreferences().getList(getKey(), new ArrayList<>(getDefaultValue()));
}
@Override
public boolean put(Collection<String> value) {
- return getPreferences().putCollection(getKey(), value);
+ return getPreferences().putList(getKey(), new ArrayList<>(value));
}
}
diff --git a/src/org/openstreetmap/josm/data/preferences/ColorInfo.java b/src/org/openstreetmap/josm/data/preferences/ColorInfo.java
new file mode 100644
index 0000000..bd89d29
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/preferences/ColorInfo.java
@@ -0,0 +1,151 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.preferences;
+
+import java.awt.Color;
+import java.util.List;
+import org.openstreetmap.josm.tools.ColorHelper;
+
+/**
+ * Data class to hold information on a named color setting.
+ */
+public class ColorInfo {
+
+ private String category;
+ private String source;
+ private String name;
+ private Color value;
+ private Color defaultValue;
+
+ /**
+ * Constructs a new {@code ColorInfo}.
+ */
+ public ColorInfo() {
+ }
+
+ /**
+ * Constructs a new {@code ColorInfo}.
+ * @param category the category of the color setting
+ * @param source the source (related file), can be null
+ * @param name the color name
+ * @param value the color value set in the preferences, null if not set
+ * @param defaultValue the default value for this color setting, can be null
+ * @see org.openstreetmap.josm.data.preferences.NamedColorProperty
+ */
+ public ColorInfo(String category, String source, String name, Color value, Color defaultValue) {
+ this.category = category;
+ this.source = source;
+ this.name = name;
+ this.value = value;
+ this.defaultValue = defaultValue;
+ }
+
+ /**
+ * Get the category.
+ * @return the category
+ */
+ public String getCategory() {
+ return category;
+ }
+
+ /**
+ * Get the source.
+ * @return the source, can be null
+ */
+ public String getSource() {
+ return source;
+ }
+
+ /**
+ * Get the name.
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Get the color value in the preferences (if set).
+ * @return the color value, can be null
+ */
+ public Color getValue() {
+ return value;
+ }
+
+ /**
+ * Get the default value for this color setting.
+ * @return the default value, can be null
+ */
+ public Color getDefaultValue() {
+ return defaultValue;
+ }
+
+ /**
+ * Set the category.
+ * @param category the category
+ */
+ public void setCategory(String category) {
+ this.category = category;
+ }
+
+ /**
+ * Set the source.
+ * @param source the source
+ */
+ public void setSource(String source) {
+ this.source = source;
+ }
+
+ /**
+ * Set the name.
+ * @param name the name
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * Set the color value.
+ * @param value the value
+ */
+ public void setValue(Color value) {
+ this.value = value;
+ }
+
+ /**
+ * Set the default value.
+ * @param defaultValue the default value
+ */
+ public void setDefaultValue(Color defaultValue) {
+ this.defaultValue = defaultValue;
+ }
+
+ /**
+ * Constructs a new {@code ColorInfo} from raw preference value.
+ * @param lst the list
+ * @param isDefault if the list represents a default value or not
+ * @return corresponding {@code ColorInfo} object or null in case of invalid input
+ */
+ public static ColorInfo fromPref(List<String> lst, boolean isDefault) {
+ if (lst == null || lst.size() < 4) {
+ return null;
+ }
+ Color clr = ColorHelper.html2color(lst.get(0));
+ if (clr == null) {
+ return null;
+ }
+ ColorInfo info = new ColorInfo();
+ if (isDefault) {
+ info.defaultValue = clr;
+ } else {
+ info.value = clr;
+ }
+ info.category = lst.get(1);
+ info.source = lst.get(2);
+ if (info.source.isEmpty()) {
+ info.source = null;
+ }
+ info.name = lst.get(3);
+ return info;
+ }
+
+}
diff --git a/src/org/openstreetmap/josm/data/preferences/ColorProperty.java b/src/org/openstreetmap/josm/data/preferences/ColorProperty.java
index 06bfc37..5d1f274 100644
--- a/src/org/openstreetmap/josm/data/preferences/ColorProperty.java
+++ b/src/org/openstreetmap/josm/data/preferences/ColorProperty.java
@@ -4,13 +4,16 @@ package org.openstreetmap.josm.data.preferences;
import java.awt.Color;
import java.util.Locale;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ColorHelper;
/**
* A property containing a {@link Color} value.
* @since 5464
+ * @deprecated (since 12987) replaced by {@link NamedColorProperty}
*/
+ at Deprecated
public class ColorProperty extends AbstractToStringProperty<Color> {
private final String name;
@@ -33,7 +36,7 @@ public class ColorProperty extends AbstractToStringProperty<Color> {
super(getColorKey(colName), defaultValue);
CheckParameterUtil.ensureParameterNotNull(defaultValue, "defaultValue");
this.name = colName;
- getPreferences().registerColor(getColorKey(colName), colName);
+ Main.pref.registerColor(getColorKey(colName), colName);
}
@Override
diff --git a/src/org/openstreetmap/josm/data/preferences/EnumProperty.java b/src/org/openstreetmap/josm/data/preferences/EnumProperty.java
index 623dab5..4edd0f7 100644
--- a/src/org/openstreetmap/josm/data/preferences/EnumProperty.java
+++ b/src/org/openstreetmap/josm/data/preferences/EnumProperty.java
@@ -1,7 +1,7 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.preferences;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.spi.preferences.Config;
/**
* A property containing an {@code Enum} value.
@@ -22,7 +22,7 @@ public class EnumProperty<T extends Enum<T>> extends ParametrizedEnumProperty<T>
public EnumProperty(String key, Class<T> enumClass, T defaultValue) {
super(enumClass, defaultValue);
this.key = key;
- if (Main.pref != null) {
+ if (Config.getPref() != null) {
get();
}
}
diff --git a/src/org/openstreetmap/josm/data/preferences/FallbackProperty.java b/src/org/openstreetmap/josm/data/preferences/FallbackProperty.java
new file mode 100644
index 0000000..a8a52a7
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/preferences/FallbackProperty.java
@@ -0,0 +1,99 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.preferences;
+
+import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+
+/**
+ * Property that wraps another property along with a fallback property that is used as default value.
+ *
+ * @param <T> The content type
+ * @since 12987
+ */
+public class FallbackProperty<T> extends AbstractProperty<T> {
+
+ private final AbstractProperty<T> property;
+ private final AbstractProperty<T> fallback;
+
+ /**
+ * Constructs a new {@code FallbackProperty}.
+ * @param property the wrapped property
+ * @param fallback fallback property that takes effect in the {@link #get()} method when
+ * {@code property} is not set
+ */
+ public FallbackProperty(AbstractProperty<T> property, AbstractProperty<T> fallback) {
+ super(property.getKey(), null);
+ CheckParameterUtil.ensureParameterNotNull(property, "property");
+ CheckParameterUtil.ensureParameterNotNull(fallback, "fallback");
+ this.property = property;
+ this.fallback = fallback;
+ }
+
+ /**
+ * Get the wrapped property.
+ * @return the wrapped property
+ */
+ public AbstractProperty<T> getDelegateProperty() {
+ return property;
+ }
+
+ /**
+ * Get the fallback property.
+ * @return the fallback property
+ */
+ public AbstractProperty<T> getFallbackProperty() {
+ return fallback;
+ }
+
+ @Override
+ protected void storeDefaultValue() {
+ // Default value hidden in preferences.
+ }
+
+ @Override
+ public boolean isSet() {
+ return property.isSet();
+ }
+
+ @Override
+ public T getDefaultValue() {
+ return fallback.getDefaultValue();
+ }
+
+ @Override
+ public void remove() {
+ property.remove();
+ }
+
+ @Override
+ public T get() {
+ if (property.isSet()) {
+ return property.get();
+ }
+ return fallback.get();
+ }
+
+ @Override
+ public boolean put(T value) {
+ return property.put(value);
+ }
+
+ @Override
+ protected void addListenerImpl(PreferenceChangedListener adapter) {
+ property.addListenerImpl(adapter);
+ fallback.addListenerImpl(adapter);
+ }
+
+ @Override
+ public void addWeakListener(ValueChangeListener<? super T> listener) {
+ property.addWeakListener(listener);
+ fallback.addWeakListener(listener);
+ }
+
+ @Override
+ protected void removeListenerImpl(PreferenceChangedListener adapter) {
+ property.removeListenerImpl(adapter);
+ fallback.removeListenerImpl(adapter);
+ }
+
+}
diff --git a/src/org/openstreetmap/josm/data/preferences/IntegerProperty.java b/src/org/openstreetmap/josm/data/preferences/IntegerProperty.java
index 36beb5a..f543996 100644
--- a/src/org/openstreetmap/josm/data/preferences/IntegerProperty.java
+++ b/src/org/openstreetmap/josm/data/preferences/IntegerProperty.java
@@ -1,8 +1,6 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.preferences;
-import org.openstreetmap.josm.Main;
-
/**
* A property containing an {@code Integer} value.
* @since 3246
@@ -16,7 +14,7 @@ public class IntegerProperty extends AbstractToStringProperty<Integer> {
*/
public IntegerProperty(String key, int defaultValue) {
super(key, defaultValue);
- if (Main.pref != null) {
+ if (getPreferences() != null) {
get();
}
}
diff --git a/src/org/openstreetmap/josm/data/preferences/JosmBaseDirectories.java b/src/org/openstreetmap/josm/data/preferences/JosmBaseDirectories.java
new file mode 100644
index 0000000..7e2009b
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/preferences/JosmBaseDirectories.java
@@ -0,0 +1,135 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.preferences;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.File;
+
+import javax.swing.JOptionPane;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.spi.preferences.IBaseDirectories;
+import org.openstreetmap.josm.tools.Logging;
+
+/**
+ * Class provides base directory locations for JOSM.
+ * @since 13021
+ */
+public final class JosmBaseDirectories implements IBaseDirectories {
+
+ private JosmBaseDirectories() {
+ // hide constructor
+ }
+
+ private static class InstanceHolder {
+ static final JosmBaseDirectories INSTANCE = new JosmBaseDirectories();
+ }
+
+ public static JosmBaseDirectories getInstance() {
+ return InstanceHolder.INSTANCE;
+ }
+
+ /**
+ * Internal storage for the preference directory.
+ */
+ private File preferencesDir;
+
+ /**
+ * Internal storage for the cache directory.
+ */
+ private File cacheDir;
+
+ /**
+ * Internal storage for the user data directory.
+ */
+ private File userdataDir;
+
+ @Override
+ public File getPreferencesDirectory(boolean createIfMissing) {
+ if (preferencesDir == null) {
+ String path;
+ path = System.getProperty("josm.pref");
+ if (path != null) {
+ preferencesDir = new File(path).getAbsoluteFile();
+ } else {
+ path = System.getProperty("josm.home");
+ if (path != null) {
+ preferencesDir = new File(path).getAbsoluteFile();
+ } else {
+ preferencesDir = Main.platform.getDefaultPrefDirectory();
+ }
+ }
+ }
+ if (createIfMissing && !preferencesDir.exists() && !preferencesDir.mkdirs()) {
+ Logging.warn(tr("Failed to create missing preferences directory: {0}", preferencesDir.getAbsoluteFile()));
+ JOptionPane.showMessageDialog(
+ Main.parent,
+ tr("<html>Failed to create missing preferences directory: {0}</html>", preferencesDir.getAbsoluteFile()),
+ tr("Error"),
+ JOptionPane.ERROR_MESSAGE
+ );
+ }
+ return preferencesDir;
+ }
+
+ @Override
+ public File getUserDataDirectory(boolean createIfMissing) {
+ if (userdataDir == null) {
+ String path;
+ path = System.getProperty("josm.userdata");
+ if (path != null) {
+ userdataDir = new File(path).getAbsoluteFile();
+ } else {
+ path = System.getProperty("josm.home");
+ if (path != null) {
+ userdataDir = new File(path).getAbsoluteFile();
+ } else {
+ userdataDir = Main.platform.getDefaultUserDataDirectory();
+ }
+ }
+ }
+ if (createIfMissing && !userdataDir.exists() && !userdataDir.mkdirs()) {
+ Logging.warn(tr("Failed to create missing user data directory: {0}", userdataDir.getAbsoluteFile()));
+ JOptionPane.showMessageDialog(
+ Main.parent,
+ tr("<html>Failed to create missing user data directory: {0}</html>", userdataDir.getAbsoluteFile()),
+ tr("Error"),
+ JOptionPane.ERROR_MESSAGE
+ );
+ }
+ return userdataDir;
+ }
+
+ @Override
+ public File getCacheDirectory(boolean createIfMissing) {
+ if (cacheDir == null) {
+ String path = System.getProperty("josm.cache");
+ if (path != null) {
+ cacheDir = new File(path).getAbsoluteFile();
+ } else {
+ path = System.getProperty("josm.home");
+ if (path != null) {
+ cacheDir = new File(path, "cache");
+ } else {
+ path = Config.getPref().get("cache.folder", null);
+ if (path != null) {
+ cacheDir = new File(path).getAbsoluteFile();
+ } else {
+ cacheDir = Main.platform.getDefaultCacheDirectory();
+ }
+ }
+ }
+ }
+ if (createIfMissing && !cacheDir.exists() && !cacheDir.mkdirs()) {
+ Logging.warn(tr("Failed to create missing cache directory: {0}", cacheDir.getAbsoluteFile()));
+ JOptionPane.showMessageDialog(
+ Main.parent,
+ tr("<html>Failed to create missing cache directory: {0}</html>", cacheDir.getAbsoluteFile()),
+ tr("Error"),
+ JOptionPane.ERROR_MESSAGE
+ );
+ }
+ return cacheDir;
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/preferences/ListProperty.java b/src/org/openstreetmap/josm/data/preferences/ListProperty.java
index c04e1bb..58a4522 100644
--- a/src/org/openstreetmap/josm/data/preferences/ListProperty.java
+++ b/src/org/openstreetmap/josm/data/preferences/ListProperty.java
@@ -3,8 +3,6 @@ package org.openstreetmap.josm.data.preferences;
import java.util.List;
-import org.openstreetmap.josm.Main;
-
/**
* A property containing a {@code List} of {@code String} as value.
*/
@@ -17,7 +15,7 @@ public class ListProperty extends AbstractProperty<List<String>> {
*/
public ListProperty(String key, List<String> defaultValue) {
super(key, defaultValue);
- if (Main.pref != null) {
+ if (getPreferences() != null) {
get();
}
}
diff --git a/src/org/openstreetmap/josm/data/preferences/NamedColorProperty.java b/src/org/openstreetmap/josm/data/preferences/NamedColorProperty.java
new file mode 100644
index 0000000..29166cc
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/preferences/NamedColorProperty.java
@@ -0,0 +1,178 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.preferences;
+
+import java.awt.Color;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.ColorHelper;
+
+/**
+ * A property containing a {@link Color} value with additional information associated to it.
+ *
+ * The additional information is used to describe the color in the
+ * {@link org.openstreetmap.josm.gui.preferences.display.ColorPreference}, so it can be recognized
+ * and customized by the user.
+ * @since 12987
+ */
+public class NamedColorProperty extends AbstractProperty<Color> {
+
+ public static final String NAMED_COLOR_PREFIX = "clr.";
+
+ public static final String COLOR_CATEGORY_GENERAL = "general";
+ public static final String COLOR_CATEGORY_MAPPAINT = "mappaint";
+ public static final String COLOR_CATEGORY_LAYER = "layer";
+
+ private final String category;
+ private final String source;
+ private final String name;
+
+ /**
+ * Construct a new {@code NamedColorProperty}.
+ * @param category a category, can be any identifier, but the following values are recognized by
+ * the GUI preferences: {@link #COLOR_CATEGORY_GENERAL}, {@link #COLOR_CATEGORY_MAPPAINT} and
+ * {@link #COLOR_CATEGORY_LAYER}
+ * @param source a filename or similar associated with the color, can be null if not applicable
+ * @param name a short description of the color
+ * @param defaultValue the default value, can be null
+ */
+ public NamedColorProperty(String category, String source, String name, Color defaultValue) {
+ super(getKey(category, source, name), defaultValue);
+ CheckParameterUtil.ensureParameterNotNull(category, "category");
+ CheckParameterUtil.ensureParameterNotNull(name, "name");
+ this.category = category;
+ this.source = source;
+ this.name = name;
+ }
+
+ /**
+ * Construct a new {@code NamedColorProperty}.
+ * @param name a short description of the color
+ * @param defaultValue the default value, can be null
+ */
+ public NamedColorProperty(String name, Color defaultValue) {
+ this(COLOR_CATEGORY_GENERAL, null, name, defaultValue);
+ }
+
+ private static String getKey(String category, String source, String name) {
+ CheckParameterUtil.ensureParameterNotNull(category, "category");
+ CheckParameterUtil.ensureParameterNotNull(name, "name");
+ return NAMED_COLOR_PREFIX + category + "." + (source == null ? "" : source + ".") + name;
+ }
+
+ private List<String> getDefaultValuePref() {
+ return defaultValue == null ? null : getValuePref(defaultValue, category, source, name);
+ }
+
+ @Override
+ public Color get() {
+ List<String> data = getPreferences().getList(getKey(), getDefaultValuePref()); // store default value
+ if (super.isSet() && data != null && !data.isEmpty()) {
+ return ColorHelper.html2color(data.get(0));
+ }
+ return Optional.ofNullable(migrate()).orElse(defaultValue);
+ }
+
+ /**
+ * migrate to new color preferences scheme - remove 4 months after {@link ColorProperty} is removed.
+ * @return the old preferences value
+ */
+ private Color migrate() {
+ String s = getPreferences().get(getOldColorKey(), null);
+ if (s != null) {
+ Color c = ColorHelper.html2color(s);
+ if (c != null) {
+ put(c);
+ return c;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public boolean isSet() {
+ get(); // trigger migration
+ return super.isSet();
+ }
+
+ @SuppressWarnings("deprecation")
+ private String getOldColorKey() {
+ switch (category) {
+ case COLOR_CATEGORY_MAPPAINT:
+ return ColorProperty.getColorKey("mappaint." + (source == null ? "MapCSS" : source) + "." + name);
+ case COLOR_CATEGORY_LAYER:
+ {
+ String k = "layer " + (source == null ? "" : source);
+ return ColorProperty.getColorKey(k);
+ }
+ default:
+ {
+ String k = name;
+ if (source != null) {
+ k = source + "." + k;
+ }
+ return ColorProperty.getColorKey(k);
+ }
+ }
+ }
+
+ /**
+ * Get the category for this color.
+ * @return the category
+ */
+ public String getCategory() {
+ return category;
+ }
+
+ /**
+ * Get the source, i.e. a filename or layer name associated with the color.
+ * May return null if not applicable.
+ * @return the source
+ */
+ public String getSource() {
+ return source;
+ }
+
+ /**
+ * Get the color name (a short description of the color).
+ * @return the color name
+ */
+ public String getName() {
+ return name;
+ }
+
+ private static List<String> getValuePref(Color color, String category, String source, String name) {
+ CheckParameterUtil.ensureParameterNotNull(color, "color");
+ CheckParameterUtil.ensureParameterNotNull(category, "category");
+ CheckParameterUtil.ensureParameterNotNull(name, "name");
+ return Arrays.asList(ColorHelper.color2html(color, true), category, source == null ? "" : source, name);
+ }
+
+ @Override
+ public boolean put(Color value) {
+ return getPreferences().putList(getKey(), value == null ? null : getValuePref(value, category, source, name));
+ }
+
+ /**
+ * Return a more specialized color, that will fall back to this color, if not set explicitly.
+ * @param category the category of the specialized color
+ * @param source the source of the specialized color
+ * @param name the name of the specialized color
+ * @return a {@link FallbackProperty} that will the return the specialized color, if set, but
+ * fall back to this property as default value
+ */
+ public FallbackProperty<Color> getChildColor(String category, String source, String name) {
+ return new FallbackProperty<>(new NamedColorProperty(category, source, name, defaultValue), this);
+ }
+
+ /**
+ * Return a more specialized color, that will fall back to this color, if not set explicitly.
+ * @param name the name of the specialized color
+ * @return a {@link FallbackProperty} that will the return the specialized color, if set, but
+ * fall back to this property as default value
+ */
+ public FallbackProperty<Color> getChildColor(String name) {
+ return getChildColor(category, source, name);
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/validation/Severity.java b/src/org/openstreetmap/josm/data/validation/Severity.java
index c551b05..9ece41c 100644
--- a/src/org/openstreetmap/josm/data/validation/Severity.java
+++ b/src/org/openstreetmap/josm/data/validation/Severity.java
@@ -6,18 +6,18 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Color;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.tools.Logging;
/** The error severity */
public enum Severity {
// CHECKSTYLE.OFF: SingleSpaceSeparator
/** Error messages */
- ERROR(1, tr("Errors"), /* ICON(data/) */"error", new ColorProperty(marktr("validation error"), Color.RED).get()),
+ ERROR(1, tr("Errors"), /* ICON(data/) */"error", new NamedColorProperty(marktr("validation error"), Color.RED).get()),
/** Warning messages */
- WARNING(2, tr("Warnings"), /* ICON(data/) */"warning", new ColorProperty(marktr("validation warning"), Color.YELLOW).get()),
+ WARNING(2, tr("Warnings"), /* ICON(data/) */"warning", new NamedColorProperty(marktr("validation warning"), Color.YELLOW).get()),
/** Other messages */
- OTHER(3, tr("Other"), /* ICON(data/) */"other", new ColorProperty(marktr("validation other"), Color.CYAN).get());
+ OTHER(3, tr("Other"), /* ICON(data/) */"other", new NamedColorProperty(marktr("validation other"), Color.CYAN).get());
// CHECKSTYLE.ON: SingleSpaceSeparator
/** Numeric ordering of the severities, 1 being major, 3 being minor */
diff --git a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
index d06452a..097cbff 100644
--- a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
@@ -498,7 +498,6 @@ public final class DomainValidator extends AbstractValidator {
"chat", // chat Sand Fields, LLC
"cheap", // cheap Sand Cover, LLC
"chintai", // chintai CHINTAI Corporation
- "chloe", // chloe Richemont DNS Inc.
"christmas", // christmas Uniregistry, Corp.
"chrome", // chrome Charleston Road Registry Inc.
"chrysler", // chrysler FCA US LLC.
@@ -793,7 +792,6 @@ public final class DomainValidator extends AbstractValidator {
"house", // house Sugar Park, LLC
"how", // how Charleston Road Registry Inc.
"hsbc", // hsbc HSBC Holdings PLC
- "htc", // htc HTC corporation
"hughes", // hughes Hughes Satellite Systems Corporation
"hyatt", // hyatt Hyatt GTLD, L.L.C.
"hyundai", // hyundai Hyundai Motor Company
diff --git a/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java b/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java
index 0c94ef7..f2feab7 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java
@@ -29,7 +29,7 @@ public class ConditionalKeys extends Test.TagTest {
private final OpeningHourTest openingHourTest = new OpeningHourTest();
private static final Set<String> RESTRICTION_TYPES = new HashSet<>(Arrays.asList("oneway", "toll", "noexit", "maxspeed", "minspeed",
"maxstay", "maxweight", "maxaxleload", "maxheight", "maxwidth", "maxlength", "overtaking", "maxgcweight", "maxgcweightrating",
- "fee"));
+ "fee", "restriction"));
private static final Set<String> RESTRICTION_VALUES = new HashSet<>(Arrays.asList("yes", "official", "designated", "destination",
"delivery", "permissive", "private", "agricultural", "forestry", "no"));
private static final Set<String> TRANSPORT_MODES = new HashSet<>(Arrays.asList("access", "foot", "ski", "inline_skates", "ice_skates",
diff --git a/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java b/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
index e8c3a3c..dd91a11 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
@@ -12,6 +12,7 @@ import java.util.Objects;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.WaySegment;
@@ -29,7 +30,6 @@ import org.openstreetmap.josm.tools.Logging;
* @author frsantos
*/
public abstract class CrossingWays extends Test {
- protected static final int CROSSING_WAYS = 601;
static final String HIGHWAY = "highway";
static final String RAILWAY = "railway";
@@ -40,16 +40,20 @@ public abstract class CrossingWays extends Test {
/** The already detected ways in error */
private final Map<List<Way>, List<WaySegment>> seenWays = new HashMap<>(50);
+ private final int code;
+
/**
* General crossing ways test.
*/
public static class Ways extends CrossingWays {
+ protected static final int CROSSING_WAYS = 601;
+
/**
* Constructs a new crossing {@code Ways} test.
*/
public Ways() {
- super(tr("Crossing ways"));
+ super(tr("Crossing ways"), CROSSING_WAYS);
}
@Override
@@ -67,7 +71,7 @@ public abstract class CrossingWays extends Test {
boolean ignoreWaySegmentCombination(Way w1, Way w2) {
if (w1 == w2)
return false;
- if (!Objects.equals(getLayer(w1), getLayer(w2))) {
+ if (!Objects.equals(OsmUtils.getLayer(w1), OsmUtils.getLayer(w2))) {
return true;
}
if (w1.hasKey(HIGHWAY) && w2.hasKey(HIGHWAY) && !Objects.equals(w1.get("level"), w2.get("level"))) {
@@ -106,11 +110,13 @@ public abstract class CrossingWays extends Test {
*/
public static class Boundaries extends CrossingWays {
+ protected static final int CROSSING_BOUNDARIES = 602;
+
/**
* Constructs a new crossing {@code Boundaries} test.
*/
public Boundaries() {
- super(tr("Crossing boundaries"));
+ super(tr("Crossing boundaries"), CROSSING_BOUNDARIES);
}
@Override
@@ -142,11 +148,13 @@ public abstract class CrossingWays extends Test {
*/
public static class Barrier extends CrossingWays {
+ protected static final int CROSSING_BARRIERS = 603;
+
/**
* Constructs a new crossing {@code Barrier} test.
*/
public Barrier() {
- super(tr("Crossing barriers"));
+ super(tr("Crossing barriers"), CROSSING_BARRIERS);
}
@Override
@@ -156,7 +164,7 @@ public abstract class CrossingWays extends Test {
@Override
boolean ignoreWaySegmentCombination(Way w1, Way w2) {
- return !Objects.equals(getLayer(w1), getLayer(w2));
+ return !Objects.equals(OsmUtils.getLayer(w1), OsmUtils.getLayer(w2));
}
@Override
@@ -169,6 +177,9 @@ public abstract class CrossingWays extends Test {
* Self crossing ways test (for all the rest)
*/
public static class SelfCrossing extends CrossingWays {
+
+ protected static final int CROSSING_SELF = 604;
+
CrossingWays.Ways normalTest = new Ways();
CrossingWays.Barrier barrierTest = new Barrier();
CrossingWays.Boundaries boundariesTest = new Boundaries();
@@ -177,7 +188,7 @@ public abstract class CrossingWays extends Test {
* Constructs a new SelfIntersection test.
*/
public SelfCrossing() {
- super(tr("Self crossing"));
+ super(tr("Self crossing"), CROSSING_SELF);
}
@Override
@@ -200,11 +211,13 @@ public abstract class CrossingWays extends Test {
/**
* Constructs a new {@code CrossingWays} test.
* @param title The test title
- * @since 6691
+ * @param code The test code
+ * @since 12958
*/
- public CrossingWays(String title) {
+ public CrossingWays(String title, int code) {
super(title, tr("This test checks if two roads, railways, waterways or buildings crosses in the same layer, " +
"but are not connected by a node."));
+ this.code = code;
}
@Override
@@ -221,14 +234,6 @@ public abstract class CrossingWays extends Test {
seenWays.clear();
}
- static String getLayer(OsmPrimitive w) {
- String layer1 = w.get("layer");
- if ("0".equals(layer1)) {
- layer1 = null; // 0 is default value for layer.
- }
- return layer1;
- }
-
static boolean isCoastline(OsmPrimitive w) {
return w.hasTag("natural", "water", "coastline") || w.hasTag("landuse", "reservoir");
}
@@ -289,7 +294,7 @@ public abstract class CrossingWays extends Test {
highlight.add(es2);
final String message = createMessage(es1.way, es2.way);
- errors.add(TestError.builder(this, Severity.WARNING, CROSSING_WAYS)
+ errors.add(TestError.builder(this, Severity.WARNING, code)
.message(message)
.primitives(prims)
.highlightWaySegments(highlight)
diff --git a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
index 3a523b0..d336928 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
@@ -1,7 +1,6 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.validation.tests;
-import static org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.FixCommand.evaluateObject;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.BufferedReader;
@@ -501,15 +500,20 @@ public class MapCSSTagChecker extends Test.TagTest {
if (fixCommands.isEmpty() && !deletion) {
return null;
}
- final Selector matchingSelector = whichSelectorMatchesPrimitive(p);
- Collection<Command> cmds = new LinkedList<>();
- for (FixCommand fixCommand : fixCommands) {
- cmds.add(fixCommand.createCommand(p, matchingSelector));
- }
- if (deletion && !p.isDeleted()) {
- cmds.add(new DeleteCommand(p));
+ try {
+ final Selector matchingSelector = whichSelectorMatchesPrimitive(p);
+ Collection<Command> cmds = new LinkedList<>();
+ for (FixCommand fixCommand : fixCommands) {
+ cmds.add(fixCommand.createCommand(p, matchingSelector));
+ }
+ if (deletion && !p.isDeleted()) {
+ cmds.add(new DeleteCommand(p));
+ }
+ return new SequenceCommand(tr("Fix of {0}", getDescriptionForMatchingSelector(p, matchingSelector)), cmds);
+ } catch (IllegalArgumentException e) {
+ Logging.error(e);
+ return null;
}
- return new SequenceCommand(tr("Fix of {0}", getDescriptionForMatchingSelector(p, matchingSelector)), cmds);
}
/**
@@ -691,15 +695,19 @@ public class MapCSSTagChecker extends Test.TagTest {
final Environment env = new Environment(p, new MultiCascade(), Environment.DEFAULT_LAYER, null);
for (Set<TagCheck> schecks : checksCol) {
for (TagCheck check : schecks) {
- if (Severity.OTHER.equals(check.getSeverity()) && !includeOtherSeverity) {
+ boolean ignoreError = Severity.OTHER.equals(check.getSeverity()) && !includeOtherSeverity;
+ // Do not run "information" level checks if not wanted, unless they also set a MapCSS class
+ if (ignoreError && check.setClassExpressions.isEmpty()) {
continue;
}
final Selector selector = check.whichSelectorMatchesEnvironment(env);
if (selector != null) {
check.rule.declaration.execute(env);
- final TestError error = check.getErrorForPrimitive(p, selector, env, new MapCSSTagCheckerAndRule(check.rule));
- if (error != null) {
- r.add(error);
+ if (!ignoreError) {
+ final TestError error = check.getErrorForPrimitive(p, selector, env, new MapCSSTagCheckerAndRule(check.rule));
+ if (error != null) {
+ r.add(error);
+ }
}
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java b/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
index 008b20b..326f851 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
@@ -276,6 +276,7 @@ public class MultipolygonTest extends Test {
if (!sharedNodes.isEmpty()) {
for (int i = 0; i < allPolygons.size(); i++) {
PolyData pd1 = allPolygons.get(i);
+ checkPolygonForSelfIntersection(r, pd1);
for (int j = i + 1; j < allPolygons.size(); j++) {
PolyData pd2 = allPolygons.get(j);
if (!checkProblemMap(crossingPolyMap, pd1, pd2)) {
@@ -299,6 +300,42 @@ public class MultipolygonTest extends Test {
}
/**
+ * Check if a polygon ring is self-intersecting when the ring was build from multiple ways.
+ * An self intersection in a single way is checked in {@link SelfIntersectingWay}.
+ * @param r the relation
+ * @param pd the ring
+ */
+ private void checkPolygonForSelfIntersection(Relation r, PolyData pd) {
+ if (pd.getWayIds().size() == 1)
+ return;
+ List<Node> wayNodes = pd.getNodes();
+ int num = wayNodes.size();
+ Set<Node> nodes = new HashSet<>();
+ Node firstNode = wayNodes.get(0);
+ nodes.add(firstNode);
+ List<Node> isNodes = new ArrayList<>();
+ for (int i = 1; i < num - 1; i++) {
+ Node n = wayNodes.get(i);
+ if (nodes.contains(n)) {
+ isNodes.add(n);
+ } else {
+ nodes.add(n);
+ }
+ }
+ if (!isNodes.isEmpty()) {
+ List<OsmPrimitive> prims = new ArrayList<>();
+ prims.add(r);
+ prims.addAll(isNodes);
+ errors.add(TestError.builder(this, Severity.WARNING, CROSSING_WAYS)
+ .message(tr("Self-intersecting polygon ring"))
+ .primitives(prims)
+ .highlight(isNodes)
+ .build());
+
+ }
+ }
+
+ /**
* Detect intersections of multipolygon ways at nodes. If any way node is used by more than two ways
* or two times in one way and at least once in another way we found an intersection.
* @param r the relation
diff --git a/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java b/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
index e5ec8aa..ad60191 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
@@ -243,15 +243,20 @@ public class RelationChecker extends Test {
// no errors found till now. So member at least failed at matching the type
// it could also fail at memberExpression, but we can't guess at which
- // convert in localization friendly way to string of accepted types
- String typesStr = types.stream().map(x -> tr(x.getName())).collect(Collectors.joining("/"));
+ // Do not raise an error for incomplete ways for which we expect them to be closed, as we cannot know
+ boolean ignored = member.getMember().isIncomplete() && OsmPrimitiveType.WAY.equals(member.getType())
+ && !types.contains(TaggingPresetType.WAY) && types.contains(TaggingPresetType.CLOSEDWAY);
+ if (!ignored) {
+ // convert in localization friendly way to string of accepted types
+ String typesStr = types.stream().map(x -> tr(x.getName())).collect(Collectors.joining("/"));
- errors.add(TestError.builder(this, Severity.WARNING, WRONG_TYPE)
- .message(ROLE_VERIF_PROBLEM_MSG,
+ errors.add(TestError.builder(this, Severity.WARNING, WRONG_TYPE)
+ .message(ROLE_VERIF_PROBLEM_MSG,
marktr("Type ''{0}'' of relation member with role ''{1}'' does not match accepted types ''{2}'' in template {3}"),
member.getType(), member.getRole(), typesStr, name)
- .primitives(member.getMember().isUsable() ? member.getMember() : n)
- .build());
+ .primitives(member.getMember().isUsable() ? member.getMember() : n)
+ .build());
+ }
}
return false;
}
diff --git a/src/org/openstreetmap/josm/gui/DownloadParamType.java b/src/org/openstreetmap/josm/gui/DownloadParamType.java
index 496059b..b39845a 100644
--- a/src/org/openstreetmap/josm/gui/DownloadParamType.java
+++ b/src/org/openstreetmap/josm/gui/DownloadParamType.java
@@ -77,7 +77,7 @@ public enum DownloadParamType {
/**
* Download area specified on the command line as bounds string.
* @param rawGps Flag to download raw GPS tracks
- * @param s The bounds parameter
+ * @param s The bounds parameter. Coordinates must use dot decimal separator as comma is used to delimit values
* @return the complete download task (including post-download handler), or {@code null}
*/
private List<Future<?>> downloadFromParamBounds(final boolean rawGps, String s) {
diff --git a/src/org/openstreetmap/josm/gui/MainApplication.java b/src/org/openstreetmap/josm/gui/MainApplication.java
index 8d4912a..c2cbfdb 100644
--- a/src/org/openstreetmap/josm/gui/MainApplication.java
+++ b/src/org/openstreetmap/josm/gui/MainApplication.java
@@ -7,12 +7,15 @@ import static org.openstreetmap.josm.tools.I18n.trn;
import java.awt.BorderLayout;
import java.awt.Container;
import java.awt.Dimension;
+import java.awt.Font;
import java.awt.GraphicsEnvironment;
import java.awt.GridBagLayout;
+import java.awt.Toolkit;
import java.awt.event.KeyEvent;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Field;
import java.net.Authenticator;
import java.net.Inet6Address;
import java.net.InetAddress;
@@ -36,6 +39,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
+import java.util.ResourceBundle;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.Callable;
@@ -88,6 +92,7 @@ import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.UserInfo;
import org.openstreetmap.josm.data.osm.search.SearchMode;
+import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
import org.openstreetmap.josm.data.preferences.sources.SourceType;
import org.openstreetmap.josm.data.projection.ProjectionCLI;
import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFileSource;
@@ -146,6 +151,8 @@ import org.openstreetmap.josm.io.remotecontrol.RemoteControl;
import org.openstreetmap.josm.plugins.PluginHandler;
import org.openstreetmap.josm.plugins.PluginInformation;
import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
import org.openstreetmap.josm.tools.FontsManager;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.HttpClient;
@@ -922,16 +929,22 @@ public class MainApplication extends Main {
Logging.info(tr("Enabled detailed debug level (trace)"));
}
- Main.pref.init(args.hasOption(Option.RESET_PREFERENCES));
Config.setPreferencesInstance(Main.pref);
- Config.setBaseDirectoriesProvider(Main.pref);
+ Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
+ Main.pref.init(args.hasOption(Option.RESET_PREFERENCES));
args.getPreferencesToSet().forEach(Main.pref::put);
if (!language.isPresent()) {
I18n.set(Config.getPref().get("language", null));
}
- Main.pref.updateSystemProperties();
+ updateSystemProperties();
+ Main.pref.addPreferenceChangeListener(new PreferenceChangedListener() {
+ @Override
+ public void preferenceChanged(PreferenceChangeEvent e) {
+ updateSystemProperties();
+ }
+ });
checkIPv6();
@@ -979,7 +992,7 @@ public class MainApplication extends Main {
Authenticator.setDefault(DefaultAuthenticator.getInstance());
DefaultProxySelector proxySelector = new DefaultProxySelector(ProxySelector.getDefault());
ProxySelector.setDefault(proxySelector);
- OAuthAccessTokenHolder.getInstance().init(Main.pref, CredentialsManager.getInstance());
+ OAuthAccessTokenHolder.getInstance().init(CredentialsManager.getInstance());
setupCallbacks();
@@ -1071,6 +1084,38 @@ public class MainApplication extends Main {
}
/**
+ * Updates system properties with the current values in the preferences.
+ */
+ private static void updateSystemProperties() {
+ if ("true".equals(Config.getPref().get("prefer.ipv6", "auto"))
+ && !"true".equals(Utils.updateSystemProperty("java.net.preferIPv6Addresses", "true"))) {
+ // never set this to false, only true!
+ Logging.info(tr("Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early startup)."));
+ }
+ Utils.updateSystemProperty("http.agent", Version.getInstance().getAgentString());
+ Utils.updateSystemProperty("user.language", Config.getPref().get("language"));
+ // Workaround to fix a Java bug. This ugly hack comes from Sun bug database: https://bugs.openjdk.java.net/browse/JDK-6292739
+ // Force AWT toolkit to update its internal preferences (fix #6345).
+ // Does not work anymore with Java 9, to remove with Java 9 migration
+ if (Utils.getJavaVersion() < 9 && !GraphicsEnvironment.isHeadless()) {
+ try {
+ Field field = Toolkit.class.getDeclaredField("resources");
+ Utils.setObjectsAccessible(field);
+ field.set(null, ResourceBundle.getBundle("sun.awt.resources.awt"));
+ } catch (ReflectiveOperationException | RuntimeException e) { // NOPMD
+ // Catch RuntimeException in order to catch InaccessibleObjectException, new in Java 9
+ Logging.warn(e);
+ }
+ }
+ // Possibility to disable SNI (not by default) in case of misconfigured https servers
+ // See #9875 + http://stackoverflow.com/a/14884941/2257172
+ // then https://josm.openstreetmap.de/ticket/12152#comment:5 for details
+ if (Config.getPref().getBoolean("jdk.tls.disableSNIExtension", false)) {
+ Utils.updateSystemProperty("jsse.enableSNIExtension", "false");
+ }
+ }
+
+ /**
* Setup the sources for NTV2 grid shift files for projection support.
* @since 12795
*/
@@ -1172,6 +1217,17 @@ public class MainApplication extends Main {
"EditorPane", "FormattedTextField", "PasswordField", "TextArea", "TextField", "TextPane")) {
UIManager.put(p+".caretForeground", UIManager.getColor(p+".foreground"));
}
+
+ double menuFontFactor = Config.getPref().getDouble("gui.scale.menu.font", 1.0);
+ if (menuFontFactor != 1.0) {
+ for (String key : Arrays.asList(
+ "Menu.font", "MenuItem.font", "CheckBoxMenuItem.font", "RadioButtonMenuItem.font", "MenuItem.acceleratorFont")) {
+ Font font = UIManager.getFont(key);
+ if (font != null) {
+ UIManager.put(key, font.deriveFont(font.getSize2D() * (float) menuFontFactor));
+ }
+ }
+ }
}
private static InputStream openStream(URL url) throws IOException {
diff --git a/src/org/openstreetmap/josm/gui/MapFrame.java b/src/org/openstreetmap/josm/gui/MapFrame.java
index 3d646a6..a467a9c 100644
--- a/src/org/openstreetmap/josm/gui/MapFrame.java
+++ b/src/org/openstreetmap/josm/gui/MapFrame.java
@@ -50,7 +50,6 @@ import org.openstreetmap.josm.actions.mapmode.MapMode;
import org.openstreetmap.josm.actions.mapmode.ParallelWayAction;
import org.openstreetmap.josm.actions.mapmode.SelectAction;
import org.openstreetmap.josm.actions.mapmode.ZoomAction;
-import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
import org.openstreetmap.josm.data.ViewportData;
import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.data.preferences.IntegerProperty;
@@ -70,7 +69,6 @@ import org.openstreetmap.josm.gui.dialogs.UserListDialog;
import org.openstreetmap.josm.gui.dialogs.ValidatorDialog;
import org.openstreetmap.josm.gui.dialogs.properties.PropertiesDialog;
import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.LayerManager;
import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
@@ -79,6 +77,7 @@ import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
import org.openstreetmap.josm.gui.util.AdvancedKeyPressDetector;
import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
import org.openstreetmap.josm.tools.Destroyable;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -109,8 +108,6 @@ public class MapFrame extends JPanel implements Destroyable, ActiveLayerChangeLi
/**
* The view control displayed.
- * <p>
- * Accessing this is discouraged. Use the {@link LayerManager} to access map data.
*/
public final MapView mapView;
diff --git a/src/org/openstreetmap/josm/gui/MapScaler.java b/src/org/openstreetmap/josm/gui/MapScaler.java
index d659e50..21a17ec 100644
--- a/src/org/openstreetmap/josm/gui/MapScaler.java
+++ b/src/org/openstreetmap/josm/gui/MapScaler.java
@@ -14,7 +14,7 @@ import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleValue;
import javax.swing.JComponent;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.gui.help.Helpful;
/**
@@ -28,7 +28,7 @@ public class MapScaler extends JComponent implements Helpful, Accessible {
private static final int PADDING_LEFT = 5;
private static final int PADDING_RIGHT = 50;
- private static final ColorProperty SCALER_COLOR = new ColorProperty(marktr("scale"), Color.WHITE);
+ private static final NamedColorProperty SCALER_COLOR = new NamedColorProperty(marktr("scale"), Color.WHITE);
/**
* Constructs a new {@code MapScaler}.
diff --git a/src/org/openstreetmap/josm/gui/MapStatus.java b/src/org/openstreetmap/josm/gui/MapStatus.java
index 7006344..03d373c 100644
--- a/src/org/openstreetmap/josm/gui/MapStatus.java
+++ b/src/org/openstreetmap/josm/gui/MapStatus.java
@@ -70,8 +70,8 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.preferences.AbstractProperty;
import org.openstreetmap.josm.data.preferences.BooleanProperty;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
import org.openstreetmap.josm.data.preferences.DoubleProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.gui.help.Helpful;
import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor;
import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor.ProgressMonitorDialog;
@@ -79,6 +79,7 @@ import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.widgets.ImageLabel;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.tools.ColorHelper;
import org.openstreetmap.josm.tools.Destroyable;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -109,28 +110,28 @@ public final class MapStatus extends JPanel implements Helpful, Destroyable, Pre
* Property for map status background color.
* @since 6789
*/
- public static final ColorProperty PROP_BACKGROUND_COLOR = new ColorProperty(
- marktr("Status bar background"), "#b8cfe5");
+ public static final NamedColorProperty PROP_BACKGROUND_COLOR = new NamedColorProperty(
+ marktr("Status bar background"), ColorHelper.html2color("#b8cfe5"));
/**
* Property for map status background color (active state).
* @since 6789
*/
- public static final ColorProperty PROP_ACTIVE_BACKGROUND_COLOR = new ColorProperty(
- marktr("Status bar background: active"), "#aaff5e");
+ public static final NamedColorProperty PROP_ACTIVE_BACKGROUND_COLOR = new NamedColorProperty(
+ marktr("Status bar background: active"), ColorHelper.html2color("#aaff5e"));
/**
* Property for map status foreground color.
* @since 6789
*/
- public static final ColorProperty PROP_FOREGROUND_COLOR = new ColorProperty(
+ public static final NamedColorProperty PROP_FOREGROUND_COLOR = new NamedColorProperty(
marktr("Status bar foreground"), Color.black);
/**
* Property for map status foreground color (active state).
* @since 6789
*/
- public static final ColorProperty PROP_ACTIVE_FOREGROUND_COLOR = new ColorProperty(
+ public static final NamedColorProperty PROP_ACTIVE_FOREGROUND_COLOR = new NamedColorProperty(
marktr("Status bar foreground: active"), Color.black);
/**
diff --git a/src/org/openstreetmap/josm/gui/SelectionManager.java b/src/org/openstreetmap/josm/gui/SelectionManager.java
index 337fa53..225c7fd 100644
--- a/src/org/openstreetmap/josm/gui/SelectionManager.java
+++ b/src/org/openstreetmap/josm/gui/SelectionManager.java
@@ -19,6 +19,7 @@ import javax.swing.Action;
import org.openstreetmap.josm.actions.SelectByInternalPointAction;
import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
@@ -372,22 +373,23 @@ public class SelectionManager implements MouseListener, MouseMotionListener, Pro
clicked = true;
}
+ DataSet ds = MainApplication.getLayerManager().getEditDataSet();
if (clicked) {
Point center = new Point(selectionResult.xpoints[0], selectionResult.ypoints[0]);
OsmPrimitive osm = nc.getNearestNodeOrWay(center, OsmPrimitive::isSelectable, false);
if (osm != null) {
selection.add(osm);
}
- } else {
+ } else if (ds != null) {
// nodes
- for (Node n : MainApplication.getLayerManager().getEditDataSet().getNodes()) {
+ for (Node n : ds.getNodes()) {
if (n.isSelectable() && selectionResult.contains(nc.getPoint2D(n))) {
selection.add(n);
}
}
// ways
- for (Way w : MainApplication.getLayerManager().getEditDataSet().getWays()) {
+ for (Way w : ds.getWays()) {
if (!w.isSelectable() || w.getNodesCount() == 0) {
continue;
}
diff --git a/src/org/openstreetmap/josm/gui/autofilter/AutoFilterButton.java b/src/org/openstreetmap/josm/gui/autofilter/AutoFilterButton.java
index d9d0bfb..4e6f3d6 100644
--- a/src/org/openstreetmap/josm/gui/autofilter/AutoFilterButton.java
+++ b/src/org/openstreetmap/josm/gui/autofilter/AutoFilterButton.java
@@ -11,7 +11,7 @@ import javax.swing.BorderFactory;
import javax.swing.JButton;
import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.gui.MainApplication;
/**
@@ -20,7 +20,7 @@ import org.openstreetmap.josm.gui.MainApplication;
*/
public class AutoFilterButton extends JButton {
- private static final ColorProperty PROP_COLOR = new ColorProperty("auto.filter.button.color", new Color(0, 160, 160));
+ private static final NamedColorProperty PROP_COLOR = new NamedColorProperty("auto.filter.button.color", new Color(0, 160, 160));
private final AutoFilter filter;
diff --git a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
index 62cc20e..0bdc219 100644
--- a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
+++ b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
@@ -6,8 +6,11 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
+import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.Rectangle;
+import java.awt.geom.Area;
+import java.awt.geom.Path2D;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -18,8 +21,12 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
+import javax.swing.ButtonModel;
+import javax.swing.JToggleButton;
import javax.swing.JOptionPane;
import javax.swing.SpringLayout;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.ChangeEvent;
import org.openstreetmap.gui.jmapviewer.Coordinate;
import org.openstreetmap.gui.jmapviewer.JMapViewer;
@@ -40,8 +47,12 @@ import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
import org.openstreetmap.josm.data.imagery.TileLoaderFactory;
import org.openstreetmap.josm.data.osm.BBox;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.data.preferences.StringProperty;
+import org.openstreetmap.josm.gui.MainApplication;
import org.openstreetmap.josm.gui.layer.AbstractCachedTileSourceLayer;
+import org.openstreetmap.josm.gui.layer.MainLayerManager;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.layer.TMSLayer;
import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.tools.Logging;
@@ -49,7 +60,7 @@ import org.openstreetmap.josm.tools.Logging;
/**
* This panel displays a map and lets the user chose a {@link BBox}.
*/
-public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
+public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser, ChangeListener, MainLayerManager.ActiveLayerChangeListener {
/**
* A list of tile sources that can be used for displaying the map.
@@ -114,6 +125,7 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
}
private static final StringProperty PROP_MAPSTYLE = new StringProperty("slippy_map_chooser.mapstyle", "Mapnik");
+ private static final BooleanProperty PROP_SHOWDLAREA = new BooleanProperty("slippy_map_chooser.show_downloaded_area", true);
/**
* The property name used for the resize button.
* @see #addPropertyChangeListener(java.beans.PropertyChangeListener)
@@ -124,6 +136,7 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
private final transient OsmTileLoader uncachedLoader;
private final SizeButton iSizeButton;
+ private final ButtonModel showDownloadAreaButtonModel;
private final SourceButton iSourceButton;
private transient Bounds bbox;
@@ -166,10 +179,13 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
List<TileSource> tileSources = getAllTileSources();
- iSourceButton = new SourceButton(this, tileSources);
+ this.showDownloadAreaButtonModel = new JToggleButton.ToggleButtonModel();
+ this.showDownloadAreaButtonModel.setSelected(PROP_SHOWDLAREA.get());
+ this.showDownloadAreaButtonModel.addChangeListener(this);
+ iSourceButton = new SourceButton(this, tileSources, this.showDownloadAreaButtonModel);
add(iSourceButton);
- springLayout.putConstraint(SpringLayout.EAST, iSourceButton, 0, SpringLayout.EAST, this);
- springLayout.putConstraint(SpringLayout.NORTH, iSourceButton, 30, SpringLayout.NORTH, this);
+ springLayout.putConstraint(SpringLayout.EAST, iSourceButton, -2, SpringLayout.EAST, this);
+ springLayout.putConstraint(SpringLayout.NORTH, iSourceButton, 2, SpringLayout.NORTH, this);
iSizeButton = new SizeButton(this);
add(iSizeButton);
@@ -189,6 +205,8 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
iSourceButton.setCurrentMap(tileSources.get(0));
}
+ MainApplication.getLayerManager().addActiveLayerChangeListener(this);
+
new SlippyMapControler(this, this);
}
@@ -214,8 +232,38 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
* Draw the map.
*/
@Override
- public void paint(Graphics g) {
- super.paint(g);
+ public void paintComponent(Graphics g) {
+ super.paintComponent(g);
+ Graphics2D g2d = (Graphics2D) g;
+
+ // draw shaded area for non-downloaded region of current "edit layer", but only if there *is* a current "edit layer",
+ // and it has defined bounds. Routine is analogous to that in OsmDataLayer's paint routine (but just different
+ // enough to make sharing code impractical)
+ final OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
+ if (editLayer != null && this.showDownloadAreaButtonModel.isSelected() && !editLayer.data.getDataSources().isEmpty()) {
+ // initialize area with current viewport
+ Rectangle b = this.getBounds();
+ // ensure we comfortably cover full area
+ b.grow(100, 100);
+ Path2D p = new Path2D.Float();
+
+ // combine successively downloaded areas after converting to screen-space
+ for (Bounds bounds : editLayer.data.getDataSourceBounds()) {
+ if (bounds.isCollapsed()) {
+ continue;
+ }
+ Rectangle r = new Rectangle(this.getMapPosition(bounds.getMinLat(), bounds.getMinLon(), false));
+ r.add(this.getMapPosition(bounds.getMaxLat(), bounds.getMaxLon(), false));
+ p.append(r, false);
+ }
+ // subtract combined areas
+ Area a = new Area(b);
+ a.subtract(new Area(p));
+
+ // paint remainder
+ g2d.setPaint(new Color(0, 0, 0, 32));
+ g2d.fill(a);
+ }
// draw selection rectangle
if (iSelectionRectStart != null && iSelectionRectEnd != null) {
@@ -230,6 +278,18 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
}
}
+ @Override
+ public void activeOrEditLayerChanged(MainLayerManager.ActiveLayerChangeEvent e) {
+ this.repaint();
+ }
+
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ // fired for the stateChanged event of this.showDownloadAreaButtonModel
+ PROP_SHOWDLAREA.put(this.showDownloadAreaButtonModel.isSelected());
+ this.repaint();
+ }
+
/**
* Enables the disk tile cache.
* @param enabled true to enable, false to disable
@@ -298,6 +358,9 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
this.tileController.setTileCache(new MemoryTileCache());
this.setTileSource(tileSource);
PROP_MAPSTYLE.put(tileSource.getName()); // TODO Is name really unique?
+ if (this.iSourceButton.getCurrentSource() != tileSource) { // prevent infinite recursion
+ this.iSourceButton.setCurrentMap(tileSource);
+ }
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/bbox/SourceButton.java b/src/org/openstreetmap/josm/gui/bbox/SourceButton.java
index 6c995a1..d9236d6 100644
--- a/src/org/openstreetmap/josm/gui/bbox/SourceButton.java
+++ b/src/org/openstreetmap/josm/gui/bbox/SourceButton.java
@@ -1,92 +1,104 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.bbox;
-import java.awt.Color;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.RenderingHints;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
import java.util.Collection;
-
-import javax.swing.ImageIcon;
-import javax.swing.JComponent;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Objects;
+
+import javax.swing.AbstractButton;
+import javax.swing.ButtonGroup;
+import javax.swing.ButtonModel;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.JToggleButton;
import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.gui.widgets.PopupMenuButton;
import org.openstreetmap.josm.tools.ImageProvider;
/**
* Button that allows to choose the imagery source used for slippy map background.
* @since 1390
*/
-public class SourceButton extends JComponent {
-
- private static final int LAYER_HEIGHT = 20;
- private static final int LEFT_PADDING = 5;
- private static final int TOP_PADDING = 5;
- private static final int BOTTOM_PADDING = 5;
-
- private transient TileSource[] sources;
+public class SourceButton extends PopupMenuButton {
+ protected class TileSourceButtonModel extends JToggleButton.ToggleButtonModel implements ActionListener {
+ protected final TileSource tileSource;
- private final ImageIcon enlargeImage;
- private final ImageIcon shrinkImage;
- private final Dimension hiddenDimension;
-
- // Calculated after component is added to container
- private int barWidth;
- private Dimension shownDimension;
- private Font font;
+ public TileSourceButtonModel(TileSource tileSource) {
+ this.tileSource = tileSource;
+ this.addActionListener(this);
+ }
- private boolean isEnlarged;
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (SourceButton.this.slippyMapBBoxChooser.getTileController().getTileSource() != this.tileSource) { // prevent infinite recursion
+ SourceButton.this.slippyMapBBoxChooser.toggleMapSource(this.tileSource);
+ }
+ }
+ }
- private int currentMap;
- private final SlippyMapBBoxChooser slippyMapBBoxChooser;
+ protected final SlippyMapBBoxChooser slippyMapBBoxChooser;
+ protected final ButtonModel showDownloadAreaButtonModel;
+ private List<TileSource> sources;
+ private ButtonGroup sourceButtonGroup;
/**
* Constructs a new {@code SourceButton}.
* @param slippyMapBBoxChooser parent slippy map
* @param sources list of imagery sources to display
+ * @param showDownloadAreaButtonModel model for the "Show downloaded area" button
+ * @since 12955
*/
- public SourceButton(SlippyMapBBoxChooser slippyMapBBoxChooser, Collection<TileSource> sources) {
+ public SourceButton(
+ SlippyMapBBoxChooser slippyMapBBoxChooser,
+ Collection<TileSource> sources,
+ ButtonModel showDownloadAreaButtonModel
+ ) {
+ super(new ImageProvider("dialogs/layerlist").getResource().getImageIcon(new Dimension(16, 16)));
+ this.showDownloadAreaButtonModel = showDownloadAreaButtonModel;
this.slippyMapBBoxChooser = slippyMapBBoxChooser;
- setSources(sources);
- enlargeImage = ImageProvider.get("layer-switcher-maximize");
- shrinkImage = ImageProvider.get("layer-switcher-minimize");
+ this.setPreferredSize(new Dimension(24, 24));
+ this.setSources(sources);
+ }
+
+ protected void generatePopupMenu() {
+ JPopupMenu pm = new JPopupMenu();
+ this.sourceButtonGroup = new ButtonGroup();
+ for (TileSource ts : this.sources) {
+ JRadioButtonMenuItem menuItem = new JRadioButtonMenuItem(ts.getName());
+ TileSourceButtonModel buttonModel = new TileSourceButtonModel(ts);
+ menuItem.setModel(buttonModel);
+ pm.add(menuItem);
+ this.sourceButtonGroup.add(menuItem);
+
+ // attempt to initialize button group matching current state of slippyMapBBoxChooser
+ buttonModel.setSelected(this.slippyMapBBoxChooser.getTileController().getTileSource() == ts);
+ }
+
+ pm.addSeparator();
- hiddenDimension = new Dimension(enlargeImage.getIconWidth(), enlargeImage.getIconHeight());
- setPreferredSize(hiddenDimension);
+ JCheckBoxMenuItem showDownloadAreaItem = new JCheckBoxMenuItem(tr("Show downloaded area"));
+ showDownloadAreaItem.setModel(this.showDownloadAreaButtonModel);
+ pm.add(showDownloadAreaItem);
- addMouseListener(mouseListener);
+ this.setPopupMenu(pm);
}
- private final transient MouseListener mouseListener = new MouseAdapter() {
- @Override
- public void mouseReleased(MouseEvent e) {
- if (e.getButton() == MouseEvent.BUTTON1) {
- Point point = e.getPoint();
- if (isEnlarged) {
- if (barWidth < point.x && point.y < shrinkImage.getIconHeight()) {
- toggle();
- } else {
- int result = (point.y - 5) / LAYER_HEIGHT;
- if (result >= 0 && result < SourceButton.this.sources.length) {
- SourceButton.this.slippyMapBBoxChooser.toggleMapSource(SourceButton.this.sources[result]);
- currentMap = result;
- toggle();
- }
- }
- } else {
- toggle();
- }
- }
+ private void setSourceDefault() {
+ Enumeration<AbstractButton> elems = this.sourceButtonGroup.getElements();
+ if (elems.hasMoreElements()) {
+ elems.nextElement().setSelected(true);
}
- };
+ }
/**
* Set the tile sources.
@@ -94,52 +106,31 @@ public class SourceButton extends JComponent {
* @since 6364
*/
public final void setSources(Collection<TileSource> sources) {
- CheckParameterUtil.ensureParameterNotNull(sources, "sources");
- this.sources = sources.toArray(new TileSource[sources.size()]);
- shownDimension = null;
+ this.sources = new ArrayList<>(Objects.requireNonNull(sources, "sources"));
+ this.generatePopupMenu();
+ if (this.sourceButtonGroup.getSelection() == null) {
+ this.setSourceDefault();
+ }
}
- @Override
- protected void paintComponent(Graphics graphics) {
- Graphics2D g = (Graphics2D) graphics.create();
- try {
- calculateShownDimension();
- g.setFont(font);
- if (isEnlarged) {
- g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
- int radioButtonSize = 10;
-
- g.setColor(new Color(0, 0, 139, 179));
- g.fillRoundRect(0, 0, barWidth + shrinkImage.getIconWidth(),
- sources.length * LAYER_HEIGHT + TOP_PADDING + BOTTOM_PADDING, 10, 10);
- for (int i = 0; i < sources.length; i++) {
- g.setColor(Color.WHITE);
- g.fillOval(LEFT_PADDING, TOP_PADDING + i * LAYER_HEIGHT + 6, radioButtonSize, radioButtonSize);
- g.drawString(sources[i].getName(), LEFT_PADDING + radioButtonSize + LEFT_PADDING,
- TOP_PADDING + i * LAYER_HEIGHT + g.getFontMetrics().getHeight());
- if (currentMap == i) {
- g.setColor(Color.BLACK);
- g.fillOval(LEFT_PADDING + 1, TOP_PADDING + 7 + i * LAYER_HEIGHT, radioButtonSize - 2, radioButtonSize - 2);
- }
- }
-
- g.drawImage(shrinkImage.getImage(), barWidth, 0, null);
- } else {
- g.drawImage(enlargeImage.getImage(), 0, 0, null);
- }
- } finally {
- g.dispose();
- }
+ /**
+ * Get the tile sources.
+ * @return unmodifiable collection of tile sources
+ */
+ public final Collection<TileSource> getSources() {
+ return Collections.unmodifiableCollection(this.sources);
}
/**
- * Toggle the visibility of imagery source list.
+ * Get the currently-selected tile source.
+ * @return currently-selected tile source
*/
- public void toggle() {
- this.isEnlarged = !this.isEnlarged;
- calculateShownDimension();
- setPreferredSize(isEnlarged ? shownDimension : hiddenDimension);
- revalidate();
+ public final TileSource getCurrentSource() {
+ TileSourceButtonModel buttonModel = (TileSourceButtonModel) this.sourceButtonGroup.getSelection();
+ if (buttonModel != null) {
+ return buttonModel.tileSource;
+ }
+ return null;
}
/**
@@ -147,28 +138,15 @@ public class SourceButton extends JComponent {
* @param tileSource the new imagery source to use
*/
public void setCurrentMap(TileSource tileSource) {
- for (int i = 0; i < sources.length; i++) {
- if (sources[i].equals(tileSource)) {
- currentMap = i;
+ Enumeration<AbstractButton> elems = this.sourceButtonGroup.getElements();
+ while (elems.hasMoreElements()) {
+ AbstractButton b = elems.nextElement();
+ if (((TileSourceButtonModel) b.getModel()).tileSource == tileSource) {
+ b.setSelected(true);
return;
}
}
- currentMap = 0;
- }
-
- private void calculateShownDimension() {
- if (shownDimension == null) {
- font = getFont().deriveFont(Font.BOLD).deriveFont(15.0f);
- int textWidth = 0;
- FontMetrics fm = getFontMetrics(font);
- for (TileSource source: sources) {
- int width = fm.stringWidth(source.getName());
- if (width > textWidth) {
- textWidth = width;
- }
- }
- barWidth = textWidth + 50;
- shownDimension = new Dimension(barWidth + shrinkImage.getIconWidth(), sources.length * LAYER_HEIGHT + TOP_PADDING + BOTTOM_PADDING);
- }
+ // failed to find the correct one
+ this.setSourceDefault();
}
}
diff --git a/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java b/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java
index a935f72..83b538d 100644
--- a/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java
+++ b/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.GridBagLayout;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import javax.swing.JButton;
import javax.swing.JPanel;
@@ -14,10 +15,10 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Version;
import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.gui.widgets.UrlLabel;
+import org.openstreetmap.josm.io.CachedFile;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.WikiReader;
/**
* This is a panel that displays the current JOSM version and the ability to update JOSM.
@@ -60,7 +61,9 @@ public class JosmUpdatePanel extends JPanel {
private static int getTestedVersion() {
try {
- String testedString = new WikiReader().read(Main.getJOSMWebsite() + "/tested");
+ CachedFile testedVersion = new CachedFile(Main.getJOSMWebsite() + "/tested");
+ testedVersion.setMaxAge(60 * 15); // 15 Minutes
+ String testedString = new String(testedVersion.getByteContent(), StandardCharsets.ISO_8859_1);
return Integer.parseInt(testedString.trim());
} catch (NumberFormatException | IOException e) {
Logging.log(Logging.LEVEL_WARN, "Unable to detect current tested version of JOSM:", e);
diff --git a/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java b/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java
index 96e5a29..8fa3212 100644
--- a/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java
+++ b/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java
@@ -5,7 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.marktr;
import java.awt.Color;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
/**
* Conflict color constants.
@@ -81,10 +81,10 @@ public enum ConflictColors {
/** Conflict foreground: remove member */
FGCOLOR_MEMBER_REMOVE(marktr("Conflict foreground: remove member"), Color.black);
- private final ColorProperty property;
+ private final NamedColorProperty property;
ConflictColors(String name, Color defaultColor) {
- property = new ColorProperty(name, defaultColor);
+ property = new NamedColorProperty(name, defaultColor);
}
/**
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java b/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
index e3e6bef..0871297 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
@@ -518,31 +518,37 @@ public class CombinePrimitiveResolverDialog extends JDialog {
cmds.addAll(resolver.buildResolutionCommands(i));
}
} else if (!GraphicsEnvironment.isHeadless()) {
- // Build conflict resolution dialog
- final CombinePrimitiveResolverDialog dialog = new CombinePrimitiveResolverDialog(Main.parent, tagModel, relModel);
-
- // Ensure a proper title is displayed instead of a previous target (fix #7925)
- if (targetPrimitives.size() == 1) {
- dialog.setTargetPrimitive(targetPrimitives.iterator().next(), false);
- } else {
- dialog.setTargetPrimitive(null, false);
- }
-
- // Resolve tag conflicts
- GuiHelper.runInEDTAndWait(() -> {
- tagModel.fireTableDataChanged();
- relModel.fireTableDataChanged();
- dialog.updateTitle();
+ UserCancelException canceled = GuiHelper.runInEDTAndWaitAndReturn(() -> {
+ // Build conflict resolution dialog
+ final CombinePrimitiveResolverDialog dialog = new CombinePrimitiveResolverDialog(Main.parent, tagModel, relModel);
+
+ // Ensure a proper title is displayed instead of a previous target (fix #7925)
+ if (targetPrimitives.size() == 1) {
+ dialog.setTargetPrimitive(targetPrimitives.iterator().next(), false);
+ } else {
+ dialog.setTargetPrimitive(null, false);
+ }
+
+ // Resolve tag conflicts
+ GuiHelper.runInEDTAndWait(() -> {
+ tagModel.fireTableDataChanged();
+ relModel.fireTableDataChanged();
+ dialog.updateTitle();
+ });
+ dialog.setVisible(true);
+ if (!dialog.isApplied()) {
+ return new UserCancelException();
+ }
+
+ // Build commands
+ for (OsmPrimitive i : targetPrimitives) {
+ dialog.setTargetPrimitive(i, false);
+ cmds.addAll(dialog.buildResolutionCommands());
+ }
+ return null;
});
- dialog.setVisible(true);
- if (!dialog.isApplied()) {
- throw new UserCancelException();
- }
-
- // Build commands
- for (OsmPrimitive i : targetPrimitives) {
- dialog.setTargetPrimitive(i, false);
- cmds.addAll(dialog.buildResolutionCommands());
+ if (canceled != null) {
+ throw canceled;
}
}
return cmds;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
index 28dc563..db3b96e 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
@@ -51,7 +51,7 @@ import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
import org.openstreetmap.josm.gui.MainApplication;
@@ -77,8 +77,8 @@ import org.openstreetmap.josm.tools.Shortcut;
*/
public final class ConflictDialog extends ToggleDialog implements ActiveLayerChangeListener, IConflictListener, DataSelectionListener {
- private static final ColorProperty CONFLICT_COLOR = new ColorProperty(marktr("conflict"), Color.GRAY);
- private static final ColorProperty BACKGROUND_COLOR = new ColorProperty(marktr("background"), Color.BLACK);
+ private static final NamedColorProperty CONFLICT_COLOR = new NamedColorProperty(marktr("conflict"), Color.GRAY);
+ private static final NamedColorProperty BACKGROUND_COLOR = new NamedColorProperty(marktr("background"), Color.BLACK);
/** the collection of conflicts displayed by this conflict dialog */
private transient ConflictCollection conflicts;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java b/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
index 51bed4e..838d04b 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
@@ -79,6 +79,8 @@ public class LatLonDialog extends ExtendedDialog {
)) +
"<table><tr><td>" +
Utils.joinAsHtmlUnorderedList(Arrays.asList(
+ "49.29918 19.24788",
+ "49.29918, 19.24788",
"49.29918° 19.24788°",
"N 49.29918 E 19.24788",
"W 49°29.918' S 19°24.788'",
@@ -86,11 +88,11 @@ public class LatLonDialog extends ExtendedDialog {
"49.29918 N, 19.24788 E",
"49°29'21" N 19°24'38" E",
"49 29 51, 19 24 18",
- "49 29, 19 24",
- "E 49 29, N 19 24"
+ "49 29, 19 24"
)) +
"</td><td>" +
Utils.joinAsHtmlUnorderedList(Arrays.asList(
+ "E 49 29, N 19 24",
"49° 29; 19° 24",
"N 49° 29, W 19° 24",
"49° 29.5 S, 19° 24.6 E",
@@ -355,7 +357,7 @@ public class LatLonDialog extends ExtendedDialog {
/**
* Parses a east/north coordinate string
- * @param s The coordinates
+ * @param s The coordinates. Dot has to be used as decimal separator, as comma can be used to delimit values
* @return The east/north coordinates or <code>null</code> on error.
*/
public static EastNorth parseEastNorth(String s) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java b/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
index 1850729..9e73001 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
@@ -26,7 +26,6 @@ import java.util.Collection;
import java.util.List;
import javax.swing.AbstractAction;
-import javax.swing.DefaultButtonModel;
import javax.swing.DefaultListSelectionModel;
import javax.swing.ImageIcon;
import javax.swing.JCheckBox;
@@ -38,6 +37,7 @@ import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
import javax.swing.JTable;
+import javax.swing.JToggleButton.ToggleButtonModel;
import javax.swing.ListSelectionModel;
import javax.swing.SingleSelectionModel;
import javax.swing.SwingConstants;
@@ -125,7 +125,7 @@ public class MapPaintDialog extends ToggleDialog {
wfLabel.setFont(wfLabel.getFont().deriveFont(Font.PLAIN));
wfLabel.setLabelFor(cbWireframe);
- cbWireframe.setModel(new DefaultButtonModel() {
+ cbWireframe.setModel(new ToggleButtonModel() {
@Override
public void setSelected(boolean b) {
super.setSelected(b);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
index df21773..20f91f7 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
@@ -49,6 +49,7 @@ import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.PopupMenuHandler;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.dialogs.validator.ValidatorTreePanel;
+import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -318,7 +319,7 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
if (changed) {
tree.resetErrors();
OsmValidator.saveIgnoredErrors();
- MainApplication.getMap().repaint();
+ MainApplication.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(Layer::invalidate);
}
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java
index 5e5bff1..3cacda9 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java
@@ -9,6 +9,8 @@ import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
import java.util.EnumMap;
import java.util.Map;
@@ -59,7 +61,16 @@ public class BasicChangesetQueryPanel extends JPanel {
rb.addItemListener(selectedQueryHandler);
rbQueries.put(q, rb);
bgQueries.add(rb);
- lblQueries.put(q, new JMultilineLabel(""));
+ JMultilineLabel lbl = new JMultilineLabel("");
+ lbl.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ if (rb.isEnabled()) {
+ rb.setSelected(true);
+ }
+ }
+ });
+ lblQueries.put(q, lbl);
}
GridBagConstraints gc = new GridBagConstraints();
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
index f2c271b..9999ee9 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
@@ -23,7 +23,7 @@ import javax.swing.table.TableCellRenderer;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.data.preferences.CachingProperty;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
/**
* Cell renderer of tags table.
@@ -32,18 +32,18 @@ import org.openstreetmap.josm.data.preferences.ColorProperty;
public class PropertiesCellRenderer extends DefaultTableCellRenderer {
private static final CachingProperty<Color> SELECTED_FG
- = new ColorProperty(marktr("Discardable key: selection Foreground"), Color.GRAY).cached();
+ = new NamedColorProperty(marktr("Discardable key: selection Foreground"), Color.GRAY).cached();
private static final CachingProperty<Color> SELECTED_BG;
private static final CachingProperty<Color> NORMAL_FG
- = new ColorProperty(marktr("Discardable key: foreground"), Color.GRAY).cached();
+ = new NamedColorProperty(marktr("Discardable key: foreground"), Color.GRAY).cached();
private static final CachingProperty<Color> NORMAL_BG;
private static final CachingProperty<Boolean> DISCARDABLE
= new BooleanProperty("display.discardable-keys", false).cached();
static {
- SELECTED_BG = new ColorProperty(marktr("Discardable key: selection Background"),
+ SELECTED_BG = new NamedColorProperty(marktr("Discardable key: selection Background"),
Optional.ofNullable(UIManager.getColor("Table.selectionBackground")).orElse(Color.BLUE)).cached();
- NORMAL_BG = new ColorProperty(marktr("Discardable key: background"),
+ NORMAL_BG = new NamedColorProperty(marktr("Discardable key: background"),
Optional.ofNullable(UIManager.getColor("Table.background")).orElse(Color.WHITE)).cached();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
index 2455f70..f0a474f 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
@@ -62,6 +62,7 @@ import org.openstreetmap.josm.gui.MainApplication;
import org.openstreetmap.josm.gui.MainMenu;
import org.openstreetmap.josm.gui.ScrollViewport;
import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.AbstractRelationEditorAction;
import org.openstreetmap.josm.gui.dialogs.relation.actions.AddSelectedAfterSelection;
import org.openstreetmap.josm.gui.dialogs.relation.actions.AddSelectedAtEndAction;
import org.openstreetmap.josm.gui.dialogs.relation.actions.AddSelectedAtStartAction;
@@ -82,6 +83,7 @@ import org.openstreetmap.josm.gui.dialogs.relation.actions.RefreshAction;
import org.openstreetmap.josm.gui.dialogs.relation.actions.RemoveAction;
import org.openstreetmap.josm.gui.dialogs.relation.actions.RemoveSelectedAction;
import org.openstreetmap.josm.gui.dialogs.relation.actions.ReverseAction;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.SelectAction;
import org.openstreetmap.josm.gui.dialogs.relation.actions.SelectPrimitivesForSelectedMembersAction;
import org.openstreetmap.josm.gui.dialogs.relation.actions.SelectedMembersForSelectionAction;
import org.openstreetmap.josm.gui.dialogs.relation.actions.SetRoleAction;
@@ -142,6 +144,10 @@ public class GenericRelationEditor extends RelationEditor {
*/
private final ApplyAction applyAction;
/**
+ * Action for performing the {@link SelectAction}
+ */
+ private final SelectAction selectAction;
+ /**
* Action for performing the {@link DuplicateRelationAction}
*/
private final DuplicateRelationAction duplicateAction;
@@ -244,6 +250,7 @@ public class GenericRelationEditor extends RelationEditor {
refreshAction = new RefreshAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this);
applyAction = new ApplyAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this);
+ selectAction = new SelectAction(getLayer(), this);
duplicateAction = new DuplicateRelationAction(memberTableModel, tagEditorPanel.getModel(), getLayer());
deleteAction = new DeleteCurrentRelationAction(getLayer(), this);
addPropertyChangeListener(deleteAction);
@@ -251,7 +258,7 @@ public class GenericRelationEditor extends RelationEditor {
okAction = new OKAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this, tfRole);
cancelAction = new CancelAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this, tfRole);
- getContentPane().add(buildToolBar(refreshAction, applyAction, duplicateAction, deleteAction), BorderLayout.NORTH);
+ getContentPane().add(buildToolBar(refreshAction, applyAction, selectAction, duplicateAction, deleteAction), BorderLayout.NORTH);
getContentPane().add(tabbedPane, BorderLayout.CENTER);
getContentPane().add(buildOkCancelButtonPanel(okAction, cancelAction), BorderLayout.SOUTH);
@@ -330,6 +337,15 @@ public class GenericRelationEditor extends RelationEditor {
}
/**
+ * Select relation.
+ * @see SelectAction
+ * @since 12933
+ */
+ public void select() {
+ selectAction.actionPerformed(null);
+ }
+
+ /**
* Cancel changes.
* @see CancelAction
*/
@@ -339,21 +355,16 @@ public class GenericRelationEditor extends RelationEditor {
/**
* Creates the toolbar
- * @param refreshAction refresh action
- * @param applyAction apply action
- * @param duplicateAction duplicate action
- * @param deleteAction delete action
- *
+ * @param actions relation toolbar actions
* @return the toolbar
+ * @since 12933
*/
- protected static JToolBar buildToolBar(RefreshAction refreshAction, ApplyAction applyAction,
- DuplicateRelationAction duplicateAction, DeleteCurrentRelationAction deleteAction) {
+ protected static JToolBar buildToolBar(AbstractRelationEditorAction... actions) {
JToolBar tb = new JToolBar();
tb.setFloatable(false);
- tb.add(refreshAction);
- tb.add(applyAction);
- tb.add(duplicateAction);
- tb.add(deleteAction);
+ for (AbstractRelationEditorAction action : actions) {
+ tb.add(action);
+ }
return tb;
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java
index e6029f5..f24480a 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java
@@ -16,7 +16,7 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
* Abstract superclass of relation editor actions.
* @since 9496
*/
-abstract class AbstractRelationEditorAction extends AbstractAction implements TableModelListener, ListSelectionListener {
+public abstract class AbstractRelationEditorAction extends AbstractAction implements TableModelListener, ListSelectionListener {
protected final MemberTable memberTable;
protected final MemberTableModel memberTableModel;
protected final transient OsmDataLayer layer;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SelectAction.java b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SelectAction.java
new file mode 100644
index 0000000..14c8d25
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SelectAction.java
@@ -0,0 +1,44 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.relation.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * Select the currently edited relation.
+ * @since 12933
+ */
+public class SelectAction extends AbstractRelationEditorAction {
+
+ /**
+ * Constructs a new {@code SelectAction}.
+ * @param layer OSM data layer
+ * @param editor relation editor
+ */
+ public SelectAction(OsmDataLayer layer, IRelationEditor editor) {
+ super(null, null, null, layer, editor);
+ putValue(NAME, tr("Select"));
+ putValue(SHORT_DESCRIPTION, tr("Select the currently edited relation"));
+ new ImageProvider("dialogs", "select").getResource().attachImageIcon(this, true);
+ updateEnabledState();
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ Relation toSelect = editor.getRelation();
+ if (toSelect == null)
+ return;
+ layer.data.setSelected(toSelect);
+ }
+
+ @Override
+ protected void updateEnabledState() {
+ setEnabled(editor.getRelationSnapshot() != null);
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java b/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
index 19d41e5..e10d124 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
@@ -231,11 +231,12 @@ public class ValidatorTreePanel extends JTree implements Destroyable, DataSetLis
}
errorsByDescription.forEach((description, errors) -> {
+ boolean emptyDescription = description == null || description.isEmpty();
// Message node
final String msg;
if (groupNode != null) {
msg = tr("{0} ({1})", description, errors.size());
- } else if (description == null || description.isEmpty()) {
+ } else if (emptyDescription) {
msg = tr("{0} ({1})", message, errors.size());
} else {
msg = tr("{0} - {1} ({2})", message, description, errors.size());
@@ -247,7 +248,7 @@ public class ValidatorTreePanel extends JTree implements Destroyable, DataSetLis
severityNode.add(messageNode);
}
- if (oldSelectedRows.contains(description)) {
+ if (oldSelectedRows.contains(description) || (emptyDescription && oldSelectedRows.contains(message))) {
if (groupNode != null) {
expandedPaths.add(new TreePath(new Object[] {rootNode, severityNode, groupNode, messageNode}));
} else {
@@ -380,8 +381,7 @@ public class ValidatorTreePanel extends JTree implements Destroyable, DataSetLis
* Updates the current errors list
*/
public void resetErrors() {
- List<TestError> e = new ArrayList<>(errors);
- setErrors(e);
+ setErrors(new ArrayList<>(errors));
}
/**
diff --git a/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java b/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
index c8e6b3b..1d2793d 100644
--- a/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
+++ b/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
@@ -29,6 +29,8 @@ import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateForma
import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider;
+import org.openstreetmap.josm.tools.Logging;
import org.openstreetmap.josm.tools.OsmUrlToBounds;
/**
@@ -139,7 +141,7 @@ public class BoundingBoxSelection implements DownloadSelection {
double[] values = new double[4];
for (int i = 0; i < 4; i++) {
try {
- values[i] = Double.parseDouble(latlon[i].getText());
+ values[i] = JosmDecimalFormatSymbolsProvider.parseDouble(latlon[i].getText());
} catch (NumberFormatException ex) {
return null;
}
@@ -198,7 +200,7 @@ public class BoundingBoxSelection implements DownloadSelection {
protected void check() {
double value = 0;
try {
- value = Double.parseDouble(tfLatValue.getText());
+ value = JosmDecimalFormatSymbolsProvider.parseDouble(tfLatValue.getText());
} catch (NumberFormatException ex) {
setErrorMessage(tfLatValue, tr("The string ''{0}'' is not a valid double value.", tfLatValue.getText()));
return;
@@ -231,7 +233,7 @@ public class BoundingBoxSelection implements DownloadSelection {
protected void check() {
double value = 0;
try {
- value = Double.parseDouble(tfLonValue.getText());
+ value = JosmDecimalFormatSymbolsProvider.parseDouble(tfLonValue.getText());
} catch (NumberFormatException ex) {
setErrorMessage(tfLonValue, tr("The string ''{0}'' is not a valid double value.", tfLonValue.getText()));
return;
@@ -288,11 +290,12 @@ public class BoundingBoxSelection implements DownloadSelection {
protected Bounds build() {
double minlon, minlat, maxlon, maxlat;
try {
- minlat = Double.parseDouble(latlon[0].getText().trim());
- minlon = Double.parseDouble(latlon[1].getText().trim());
- maxlat = Double.parseDouble(latlon[2].getText().trim());
- maxlon = Double.parseDouble(latlon[3].getText().trim());
+ minlat = JosmDecimalFormatSymbolsProvider.parseDouble(latlon[0].getText().trim());
+ minlon = JosmDecimalFormatSymbolsProvider.parseDouble(latlon[1].getText().trim());
+ maxlat = JosmDecimalFormatSymbolsProvider.parseDouble(latlon[2].getText().trim());
+ maxlon = JosmDecimalFormatSymbolsProvider.parseDouble(latlon[3].getText().trim());
} catch (NumberFormatException e) {
+ Logging.trace(e);
return null;
}
if (!LatLon.isValidLon(minlon) || !LatLon.isValidLon(maxlon)
diff --git a/src/org/openstreetmap/josm/gui/download/OverpassDownloadSource.java b/src/org/openstreetmap/josm/gui/download/OverpassDownloadSource.java
index 8f3714c..bf09c24 100644
--- a/src/org/openstreetmap/josm/gui/download/OverpassDownloadSource.java
+++ b/src/org/openstreetmap/josm/gui/download/OverpassDownloadSource.java
@@ -123,7 +123,7 @@ public class OverpassDownloadSource implements DownloadSource<OverpassDownloadSo
}
});
- this.overpassQueryList = new UserQueryList(this, this.overpassQuery, "download.overpass.query");
+ this.overpassQueryList = new UserQueryList(this, this.overpassQuery, "download.overpass.queries");
this.overpassQueryList.setPreferredSize(new Dimension(350, 300));
EditSnippetAction edit = new EditSnippetAction();
diff --git a/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java b/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java
index c857b4b..788b0cf 100644
--- a/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java
+++ b/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java
@@ -90,11 +90,12 @@ public final class OverpassQueryWizardDialog extends ExtendedDialog {
panel.add(scroll, GBC.eol().fill(GBC.BOTH).anchor(GBC.CENTER));
List<String> items = new ArrayList<>(OVERPASS_WIZARD_HISTORY.get());
- Collections.reverse(items);
- queryWizard.setPossibleItems(items);
if (!items.isEmpty()) {
queryWizard.setText(items.get(0));
}
+ // HistoryComboBox needs the reversed list
+ Collections.reverse(items);
+ queryWizard.setPossibleItems(items);
setCancelButton(CANCEL + 1);
setDefaultButton(BUILD_AN_EXECUTE_QUERY + 1);
diff --git a/src/org/openstreetmap/josm/gui/history/OpenChangesetPopupMenu.java b/src/org/openstreetmap/josm/gui/history/OpenChangesetPopupMenu.java
index db4ec4a..f3019dd 100644
--- a/src/org/openstreetmap/josm/gui/history/OpenChangesetPopupMenu.java
+++ b/src/org/openstreetmap/josm/gui/history/OpenChangesetPopupMenu.java
@@ -52,17 +52,21 @@ public class OpenChangesetPopupMenu extends JPopupMenu {
private static final List<ChangesetViewerEntry> DEFAULT_ENTRIES = Arrays.asList(
new ChangesetViewerEntry(tr("View changeset in web browser"), Main.getBaseBrowseUrl() + "/changeset/{0}"),
- new ChangesetViewerEntry(tr("Open {0}", "OSM History Viewer"), "http://osmhv.openstreetmap.de/changeset.jsp?id={0}"),
new ChangesetViewerEntry(tr("Open {0}", "achavi (Augmented OSM Change Viewer)"), "https://overpass-api.de/achavi/?changeset={0}"),
- new ChangesetViewerEntry(tr("Open {0}", "OSMCha (OSM Changeset Analyzer)"), "https://osmcha.mapbox.com/changesets/{0}")
+ new ChangesetViewerEntry(tr("Open {0}", "OSMCha (OSM Changeset Analyzer)"), "https://osmcha.mapbox.com/changesets/{0}"),
+ new ChangesetViewerEntry(tr("Open {0}", "OSM History Viewer"), "http://osmhv.openstreetmap.de/changeset.jsp?id={0}"),
+ new ChangesetViewerEntry(tr("Open {0}", "WhoDidIt (OSM Changeset Analyzer)"),
+ "http://simon04.dev.openstreetmap.org/whodidit/index.html?changeset={0}&show=1")
);
/**
* Auxiliary class to save a link to a history viewer in the preferences.
*/
public static class ChangesetViewerEntry {
+ /** Name to be displayed in popup menu */
@StructEntry
public String name;
+ /** Templated service url. <code>{0}</code> will be replaced by changeset id */
@StructEntry
public String url;
@@ -78,8 +82,7 @@ public class OpenChangesetPopupMenu extends JPopupMenu {
}
Action toAction(final long changesetId) {
- final String url = MessageFormat.format(this.url, Long.toString(changesetId));
- return new OpenBrowserAction(name, url);
+ return new OpenBrowserAction(name, MessageFormat.format(this.url, Long.toString(changesetId)));
}
}
diff --git a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
index b526c1a..f4b5451 100644
--- a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
+++ b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
@@ -115,10 +115,12 @@ public class VersionInfoPanel extends JPanel implements ChangeListener {
changesetPanel.add(changesetButton, BorderLayout.CENTER);
final BasicArrowButton arrowButton = new BasicArrowButton(BasicArrowButton.SOUTH);
arrowButton.addActionListener(action -> {
- final OpenChangesetPopupMenu popupMenu = new OpenChangesetPopupMenu(changesetDialogAction.id);
- popupMenu.insert(changesetDialogAction, 0);
- ((AbstractButton) popupMenu.getComponent(0)).setText(tr("Open Changeset Manager"));
- popupMenu.show(arrowButton);
+ if (changesetDialogAction != null) { // fix #15444
+ final OpenChangesetPopupMenu popupMenu = new OpenChangesetPopupMenu(changesetDialogAction.id);
+ popupMenu.insert(changesetDialogAction, 0);
+ ((AbstractButton) popupMenu.getComponent(0)).setText(tr("Open Changeset Manager"));
+ popupMenu.show(arrowButton);
+ }
});
changesetPanel.add(arrowButton, BorderLayout.EAST);
pnlUserAndChangeset.add(changesetPanel, GBC.std().fill().weight(0, 0));
diff --git a/src/org/openstreetmap/josm/gui/io/CredentialDialog.java b/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
index fa45462..d35f4ae 100644
--- a/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
@@ -22,6 +22,7 @@ import java.util.Objects;
import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
+import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JDialog;
import javax.swing.JLabel;
@@ -29,7 +30,6 @@ import javax.swing.JPanel;
import javax.swing.JTextField;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -126,9 +126,9 @@ public class CredentialDialog extends JDialog {
protected JPanel createButtonPanel() {
JPanel pnl = new JPanel(new FlowLayout());
- pnl.add(new SideButton(new OKAction()));
- pnl.add(new SideButton(new CancelAction()));
- pnl.add(new SideButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Dialog/Password"))));
+ pnl.add(new JButton(new OKAction()));
+ pnl.add(new JButton(new CancelAction()));
+ pnl.add(new JButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Dialog/Password"))));
return pnl;
}
@@ -265,7 +265,6 @@ public class CredentialDialog extends JDialog {
gc.gridy = 5;
gc.weighty = 1.0;
add(new JPanel(), gc);
-
}
public CredentialPanel(CredentialDialog owner) {
@@ -374,8 +373,7 @@ public class CredentialDialog extends JDialog {
@Override
public void focusGained(FocusEvent e) {
if (e.getSource() instanceof JTextField) {
- JTextField tf = (JTextField) e.getSource();
- tf.selectAll();
+ ((JTextField) e.getSource()).selectAll();
}
}
}
@@ -409,8 +407,7 @@ public class CredentialDialog extends JDialog {
nextTF.selectAll();
return;
} else {
- OKAction okAction = owner.new OKAction();
- okAction.actionPerformed(null);
+ owner.new OKAction().actionPerformed(null);
}
}
}
@@ -420,11 +417,11 @@ public class CredentialDialog extends JDialog {
OKAction() {
putValue(NAME, tr("Authenticate"));
putValue(SHORT_DESCRIPTION, tr("Authenticate with the supplied username and password"));
- putValue(SMALL_ICON, ImageProvider.get("ok"));
+ new ImageProvider("ok").getResource().attachImageIcon(this);
}
@Override
- public void actionPerformed(ActionEvent arg0) {
+ public void actionPerformed(ActionEvent e) {
setCanceled(false);
setVisible(false);
}
@@ -434,7 +431,7 @@ public class CredentialDialog extends JDialog {
CancelAction() {
putValue(NAME, tr("Cancel"));
putValue(SHORT_DESCRIPTION, tr("Cancel authentication"));
- putValue(SMALL_ICON, ImageProvider.get("cancel"));
+ new ImageProvider("cancel").getResource().attachImageIcon(this);
}
public void cancel() {
@@ -443,7 +440,7 @@ public class CredentialDialog extends JDialog {
}
@Override
- public void actionPerformed(ActionEvent arg0) {
+ public void actionPerformed(ActionEvent e) {
cancel();
}
}
diff --git a/src/org/openstreetmap/josm/gui/layer/GpxLayer.java b/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
index f19d2ce..460b568 100644
--- a/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
@@ -25,7 +25,7 @@ import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeListener;
import org.openstreetmap.josm.data.gpx.GpxTrack;
import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.data.projection.Projection;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
@@ -99,7 +99,7 @@ public class GpxLayer extends Layer {
}
@Override
- protected ColorProperty getBaseColorProperty() {
+ protected NamedColorProperty getBaseColorProperty() {
return GpxDrawHelper.DEFAULT_COLOR;
}
diff --git a/src/org/openstreetmap/josm/gui/layer/Layer.java b/src/org/openstreetmap/josm/gui/layer/Layer.java
index 2a3c32b..b036d2e 100644
--- a/src/org/openstreetmap/josm/gui/layer/Layer.java
+++ b/src/org/openstreetmap/josm/gui/layer/Layer.java
@@ -28,7 +28,7 @@ import org.openstreetmap.josm.data.ProjectionBounds;
import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
import org.openstreetmap.josm.data.preferences.AbstractProperty;
import org.openstreetmap.josm.data.preferences.AbstractProperty.ValueChangeListener;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.data.projection.Projection;
import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
import org.openstreetmap.josm.tools.Destroyable;
@@ -203,10 +203,9 @@ public abstract class Layer extends AbstractMapViewPaintable implements Destroya
* @since 10824
*/
public AbstractProperty<Color> getColorProperty() {
- ColorProperty base = getBaseColorProperty();
+ NamedColorProperty base = getBaseColorProperty();
if (base != null) {
- // cannot cache this - name may change.
- return base.getChildColor("layer " + getName());
+ return base.getChildColor(NamedColorProperty.COLOR_CATEGORY_LAYER, getName(), base.getName());
} else {
return null;
}
@@ -217,7 +216,7 @@ public abstract class Layer extends AbstractMapViewPaintable implements Destroya
* @return The property or <code>null</code> if this layer is not colored.
* @since 10824
*/
- protected ColorProperty getBaseColorProperty() {
+ protected NamedColorProperty getBaseColorProperty() {
return null;
}
diff --git a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
index 4bc317b..9e13b2f 100644
--- a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
@@ -80,8 +80,8 @@ import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
import org.openstreetmap.josm.data.osm.visitor.paint.MapRendererFactory;
import org.openstreetmap.josm.data.osm.visitor.paint.Rendering;
import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.data.preferences.StringProperty;
import org.openstreetmap.josm.data.projection.Projection;
import org.openstreetmap.josm.data.validation.TestError;
@@ -152,8 +152,8 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, D
*/
public static final StringProperty PROPERTY_SAVE_EXTENSION = new StringProperty("save.extension.osm", "osm");
- private static final ColorProperty PROPERTY_BACKGROUND_COLOR = new ColorProperty(marktr("background"), Color.BLACK);
- private static final ColorProperty PROPERTY_OUTSIDE_COLOR = new ColorProperty(marktr("outside downloaded area"), Color.YELLOW);
+ private static final NamedColorProperty PROPERTY_BACKGROUND_COLOR = new NamedColorProperty(marktr("background"), Color.BLACK);
+ private static final NamedColorProperty PROPERTY_OUTSIDE_COLOR = new NamedColorProperty(marktr("outside downloaded area"), Color.YELLOW);
/** List of recent relations */
private final Map<Relation, Void> recentRelations = new LruCache(PROPERTY_RECENT_RELATIONS_NUMBER.get()+1);
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
index 566ed85..e64731f 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
@@ -12,6 +12,7 @@ import java.awt.Image;
import java.awt.MediaTracker;
import java.awt.Point;
import java.awt.Rectangle;
+import java.awt.RenderingHints;
import java.awt.Toolkit;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
@@ -27,6 +28,7 @@ import javax.swing.JComponent;
import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.tools.ExifReader;
+import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Logging;
/**
@@ -460,6 +462,10 @@ public class ImageDisplay extends JComponent {
}
}
+ /**
+ * Sets the On-Screen-Display text.
+ * @param text text to display on top of the image
+ */
public void setOsdText(String text) {
this.osdText = text;
repaint();
@@ -479,6 +485,10 @@ public class ImageDisplay extends JComponent {
errorLoading = this.errorLoading;
}
+ if (g instanceof Graphics2D) {
+ ((Graphics2D) g).setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+ }
+
Dimension size = getSize();
if (file == null) {
g.setColor(Color.black);
@@ -501,10 +511,20 @@ public class ImageDisplay extends JComponent {
(int) ((size.height - noImageSize.getHeight()) / 2));
} else {
Rectangle target = calculateDrawImageRectangle(visibleRect, size);
- g.drawImage(image,
- target.x, target.y, target.x + target.width, target.y + target.height,
- visibleRect.x, visibleRect.y, visibleRect.x + visibleRect.width, visibleRect.y + visibleRect.height,
- null);
+ // See https://community.oracle.com/docs/DOC-983611 - The Perils of Image.getScaledInstance()
+ // Pre-scale image when downscaling by more than two times to avoid aliasing from default algorithm
+ if (selectedRect == null && (target.width < visibleRect.width/2 || target.height < visibleRect.height/2)) {
+ BufferedImage buffImage = ImageProvider.toBufferedImage(image);
+ g.drawImage(ImageProvider.createScaledImage(buffImage, target.width, target.height, RenderingHints.VALUE_INTERPOLATION_BILINEAR),
+ target.x, target.y, target.x + target.width, target.y + target.height,
+ visibleRect.x, visibleRect.y, visibleRect.x + target.width, visibleRect.y + target.height,
+ null);
+ } else {
+ g.drawImage(image,
+ target.x, target.y, target.x + target.width, target.y + target.height,
+ visibleRect.x, visibleRect.y, visibleRect.x + visibleRect.width, visibleRect.y + visibleRect.height,
+ null);
+ }
if (selectedRect != null) {
Point topLeft = img2compCoord(visibleRect, selectedRect.x, selectedRect.y, size);
Point bottomRight = img2compCoord(visibleRect,
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
index df2aa51..99f826d 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
@@ -12,6 +12,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.awt.event.WindowEvent;
import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import javax.swing.AbstractAction;
import javax.swing.Box;
@@ -334,6 +335,13 @@ public final class ImageViewerDialog extends ToggleDialog implements LayerChange
osd.append(tr("\nDirection {0}\u00b0", Math.round(entry.getExifImgDir())));
}
DateFormat dtf = DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM);
+ // Make sure date/time format includes milliseconds
+ if (dtf instanceof SimpleDateFormat) {
+ String pattern = ((SimpleDateFormat) dtf).toPattern();
+ if (!pattern.contains(".SSS")) {
+ dtf = new SimpleDateFormat(pattern.replace(":ss", ":ss.SSS"));
+ }
+ }
if (entry.hasExifTime()) {
osd.append(tr("\nEXIF time: {0}", dtf.format(entry.getExifTime())));
}
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/Offset.java b/src/org/openstreetmap/josm/gui/layer/geoimage/Offset.java
index c9f4f11..6e0a642 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/Offset.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/Offset.java
@@ -8,6 +8,7 @@ import java.util.Locale;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
+import org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider;
import org.openstreetmap.josm.tools.Pair;
/**
@@ -57,7 +58,7 @@ public final class Offset {
if (offset.startsWith("+")) {
offset = offset.substring(1);
}
- return Offset.milliseconds(Math.round(Double.parseDouble(offset) * 1000));
+ return Offset.milliseconds(Math.round(JosmDecimalFormatSymbolsProvider.parseDouble(offset) * 1000));
} catch (NumberFormatException nfe) {
throw (ParseException) new ParseException(error, 0).initCause(nfe);
}
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java b/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
index 9934d89..db54a83 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
@@ -42,7 +42,7 @@ import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeEvent;
import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeListener;
import org.openstreetmap.josm.data.gpx.WayPoint;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.MapViewState;
import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -68,7 +68,7 @@ public class GpxDrawHelper implements SoMChangeListener, MapViewPaintable.LayerP
* The color that is used for drawing GPX points.
* @since 10824
*/
- public static final ColorProperty DEFAULT_COLOR = new ColorProperty(marktr("gps point"), Color.magenta);
+ public static final NamedColorProperty DEFAULT_COLOR = new NamedColorProperty(marktr("gps point"), Color.magenta);
private final GpxData data;
private final GpxLayer layer;
@@ -265,7 +265,10 @@ public class GpxDrawHelper implements SoMChangeListener, MapViewPaintable.LayerP
*/
public Color getColor(String layerName, boolean ignoreCustom) {
if (ignoreCustom || getColorMode(layerName) == ColorMode.NONE) {
- return DEFAULT_COLOR.getChildColor(specName(layerName)).get();
+ return DEFAULT_COLOR.getChildColor(
+ NamedColorProperty.COLOR_CATEGORY_LAYER,
+ layerName,
+ DEFAULT_COLOR.getName()).get();
} else {
return null;
}
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
index 592b364..b9a08b8 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
@@ -37,7 +37,7 @@ import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.data.gpx.GpxLink;
import org.openstreetmap.josm.data.gpx.WayPoint;
import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.gui.MainApplication;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
@@ -78,7 +78,7 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
public AudioMarker syncAudioMarker;
private static final Color DEFAULT_COLOR = Color.magenta;
- private static final ColorProperty COLOR_PROPERTY = new ColorProperty(marktr("gps marker"), DEFAULT_COLOR);
+ private static final NamedColorProperty COLOR_PROPERTY = new NamedColorProperty(marktr("gps marker"), DEFAULT_COLOR);
/**
* Constructs a new {@code MarkerLayer}.
@@ -162,7 +162,7 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
}
@Override
- protected ColorProperty getBaseColorProperty() {
+ protected NamedColorProperty getBaseColorProperty() {
return COLOR_PROPERTY;
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java b/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
index 6a1e2a5..e8ed1c5 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
@@ -9,6 +9,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Optional;
import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
@@ -16,6 +17,7 @@ import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -68,6 +70,8 @@ public class ElemStyles implements PreferenceChangedListener {
private final Map<String, String> preferenceCache = new HashMap<>();
+ private volatile Color backgroundColorCache;
+
/**
* Constructs a new {@code ElemStyles}.
*/
@@ -95,6 +99,21 @@ public class ElemStyles implements PreferenceChangedListener {
return Collections.<StyleSource>unmodifiableList(styleSources);
}
+ public Color getBackgroundColor() {
+ if (backgroundColorCache != null)
+ return backgroundColorCache;
+ for (StyleSource s : styleSources) {
+ if (!s.active) {
+ continue;
+ }
+ Color backgroundColorOverride = s.getBackgroundColorOverride();
+ if (backgroundColorOverride != null) {
+ backgroundColorCache = backgroundColorOverride;
+ }
+ }
+ return Optional.ofNullable(backgroundColorCache).orElseGet(PaintColors.BACKGROUND::get);
+ }
+
/**
* Create the list of styles for one primitive.
*
@@ -450,6 +469,7 @@ public class ElemStyles implements PreferenceChangedListener {
*/
void clear() {
styleSources.clear();
+ invalidate();
}
/**
@@ -458,6 +478,7 @@ public class ElemStyles implements PreferenceChangedListener {
*/
void add(StyleSource style) {
styleSources.add(style);
+ invalidate();
}
/**
@@ -466,7 +487,9 @@ public class ElemStyles implements PreferenceChangedListener {
* @return {@code true} if this list contained the specified element
*/
boolean remove(StyleSource style) {
- return styleSources.remove(style);
+ boolean result = styleSources.remove(style);
+ invalidate();
+ return result;
}
/**
@@ -476,6 +499,11 @@ public class ElemStyles implements PreferenceChangedListener {
void setStyleSources(Collection<StyleSource> sources) {
styleSources.clear();
styleSources.addAll(sources);
+ invalidate();
+ }
+
+ private void invalidate() {
+ backgroundColorCache = null;
}
/**
diff --git a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
index b2b24b6..8772d37 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
@@ -45,6 +45,22 @@ public final class MapPaintStyles {
"presets/misc/deprecated.svg",
"misc/deprecated.png");
+ private static final ListenerList<MapPaintSylesUpdateListener> listeners = ListenerList.createUnchecked();
+
+ static {
+ listeners.addListener(new MapPaintSylesUpdateListener() {
+ @Override
+ public void mapPaintStylesUpdated() {
+ SwingUtilities.invokeLater(styles::clearCached);
+ }
+
+ @Override
+ public void mapPaintStyleEntryUpdated(int index) {
+ mapPaintStylesUpdated();
+ }
+ });
+ }
+
private static ElemStyles styles = new ElemStyles();
/**
@@ -440,22 +456,6 @@ public final class MapPaintStyles {
void mapPaintStyleEntryUpdated(int index);
}
- private static final ListenerList<MapPaintSylesUpdateListener> listeners = ListenerList.createUnchecked();
-
- static {
- listeners.addListener(new MapPaintSylesUpdateListener() {
- @Override
- public void mapPaintStylesUpdated() {
- SwingUtilities.invokeLater(styles::clearCached);
- }
-
- @Override
- public void mapPaintStyleEntryUpdated(int index) {
- mapPaintStylesUpdated();
- }
- });
- }
-
/**
* Add a listener that listens to global style changes.
* @param listener The listener
diff --git a/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java b/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java
index 300d819..38454be 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java
@@ -3,18 +3,15 @@ package org.openstreetmap.josm.gui.mappaint;
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.awt.Graphics2D;
-import java.awt.Point;
+import java.awt.Dimension;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Locale;
-import java.util.Map;
import java.util.Optional;
import java.util.function.Supplier;
import java.util.logging.Level;
@@ -23,28 +20,23 @@ import javax.imageio.ImageIO;
import org.openstreetmap.gui.jmapviewer.OsmMercator;
import org.openstreetmap.josm.CLIModule;
-import org.openstreetmap.josm.tools.I18n;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.Preferences;
import org.openstreetmap.josm.data.ProjectionBounds;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.coor.conversion.LatLonParser;
import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
-import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
-import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
-import org.openstreetmap.josm.data.preferences.sources.SourceType;
+import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
import org.openstreetmap.josm.data.projection.Projection;
import org.openstreetmap.josm.data.projection.Projections;
-import org.openstreetmap.josm.gui.NavigatableComponent;
-import org.openstreetmap.josm.gui.mappaint.StyleSetting.BooleanStyleSetting;
-import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
+import org.openstreetmap.josm.gui.mappaint.RenderingHelper.StyleData;
import org.openstreetmap.josm.io.IllegalDataException;
import org.openstreetmap.josm.io.OsmReader;
import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.spi.preferences.MemoryPreferences;
+import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider;
import org.openstreetmap.josm.tools.Logging;
import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
@@ -141,21 +133,12 @@ public class RenderingCLI implements CLIModule {
}
/**
- * Data class to save style settings along with the corresponding style url.
- */
- private static class StyleData {
- public String styleUrl;
- public Map<String, String> settings = new HashMap<>();
- }
-
- /**
* Data class to hold return values for {@link #determineRenderingArea(DataSet)}.
*
* Package private access for unit tests.
*/
static class RenderingArea {
public Bounds bounds;
- public ProjectionBounds projBounds;
public double scale; // in east-north units per pixel (unlike the --scale option, which is in meter per meter)
}
@@ -173,7 +156,12 @@ public class RenderingCLI implements CLIModule {
try {
parseArguments(argArray);
initialize();
- run();
+ DataSet ds = loadDataset();
+ RenderingArea area = determineRenderingArea(ds);
+ RenderingHelper rh = new RenderingHelper(ds, area.bounds, area.scale, argStyles);
+ checkPreconditions(rh);
+ BufferedImage image = rh.render();
+ writeImageToFile(image);
} catch (FileNotFoundException e) {
if (Logging.isDebugEnabled()) {
e.printStackTrace();
@@ -275,7 +263,7 @@ public class RenderingCLI implements CLIModule {
break;
case SCALE:
try {
- argScale = Double.parseDouble(getopt.getOptarg());
+ argScale = JosmDecimalFormatSymbolsProvider.parseDouble(getopt.getOptarg());
} catch (NumberFormatException nfe) {
throw new IllegalArgumentException(
tr("Expected floating point number for option {0}, but got ''{1}''", "--scale", getopt.getOptarg()));
@@ -297,7 +285,7 @@ public class RenderingCLI implements CLIModule {
break;
case WIDTH_M:
try {
- argWidthM = Double.parseDouble(getopt.getOptarg());
+ argWidthM = JosmDecimalFormatSymbolsProvider.parseDouble(getopt.getOptarg());
} catch (NumberFormatException nfe) {
throw new IllegalArgumentException(
tr("Expected floating point number for option {0}, but got ''{1}''", "--width-m", getopt.getOptarg()));
@@ -307,7 +295,7 @@ public class RenderingCLI implements CLIModule {
break;
case HEIGHT_M:
try {
- argHeightM = Double.parseDouble(getopt.getOptarg());
+ argHeightM = JosmDecimalFormatSymbolsProvider.parseDouble(getopt.getOptarg());
} catch (NumberFormatException nfe) {
throw new IllegalArgumentException(
tr("Expected floating point number for option {0}, but got ''{1}''", "--height-m", getopt.getOptarg()));
@@ -346,7 +334,7 @@ public class RenderingCLI implements CLIModule {
tr("Expected integer number for option {0}, but got ''{1}''", "--max-image-size", getopt.getOptarg()));
}
if (argMaxImageSize < 0) throw new IllegalArgumentException(
- tr("Expected integer number => 0 for option {0}, but got ''{1}''", "--max-image-size", getopt.getOptarg()));
+ tr("Expected integer number >= 0 for option {0}, but got ''{1}''", "--max-image-size", getopt.getOptarg()));
break;
default:
throw new AssertionError("Unexpected option index: " + getopt.getLongind());
@@ -431,7 +419,7 @@ public class RenderingCLI implements CLIModule {
void initialize() {
Logging.setLogLevel(getLogLevel());
- Config.setBaseDirectoriesProvider(new Preferences()); // for right-left-hand traffic cache file
+ Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance()); // for right-left-hand traffic cache file
Config.setPreferencesInstance(new MemoryPreferences());
Config.getPref().putBoolean("mappaint.auto_reload_local_styles", false); // unnecessary to listen for external changes
String projCode = Optional.ofNullable(argProjection).orElse("epsg:3857");
@@ -550,100 +538,37 @@ public class RenderingCLI implements CLIModule {
RenderingArea ra = new RenderingArea();
ra.bounds = bounds;
- ra.projBounds = pb;
ra.scale = scale;
return ra;
}
- private void run() throws FileNotFoundException, IllegalDataException, IOException {
-
+ private DataSet loadDataset() throws FileNotFoundException, IllegalDataException {
if (argInput == null) {
throw new IllegalArgumentException(tr("Missing argument - input data file ({0})", "--input|-i"));
}
- DataSet ds;
try {
- ds = OsmReader.parseDataSet(new FileInputStream(argInput), null);
+ return OsmReader.parseDataSet(new FileInputStream(argInput), null);
} catch (IllegalDataException e) {
throw new IllegalDataException(tr("In .osm data file ''{0}'' - ", argInput) + e.getMessage());
}
+ }
- RenderingArea area = determineRenderingArea(ds);
- double widthEn = area.projBounds.maxEast - area.projBounds.minEast;
- double heightEn = area.projBounds.maxNorth - area.projBounds.minNorth;
- int widthPx = (int) Math.round(widthEn / area.scale);
- int heightPx = (int) Math.round(heightEn / area.scale);
- Logging.debug("image size (px): {0}x{1}", widthPx, heightPx);
+ private void checkPreconditions(RenderingHelper rh) {
+ if (argStyles.isEmpty())
+ throw new IllegalArgumentException(tr("Missing argument - at least one style expected ({0})", "--style"));
+ Dimension imgSize = rh.getImageSize();
+ Logging.debug("image size (px): {0}x{1}", imgSize.width, imgSize.height);
int maxSize = Optional.ofNullable(argMaxImageSize).orElse(DEFAULT_MAX_IMAGE_SIZE);
- if (maxSize != 0 && (widthPx > maxSize || heightPx > maxSize)) {
+ if (maxSize != 0 && (imgSize.width > maxSize || imgSize.height > maxSize)) {
throw new IllegalArgumentException(
tr("Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to change limit)",
- widthPx, heightPx, maxSize, "--max-image-size"));
- }
-
- // load the styles
- MapCSSStyleSource.STYLE_SOURCE_LOCK.writeLock().lock();
- try {
- MapPaintStyles.getStyles().clear();
- if (argStyles.isEmpty())
- throw new IllegalArgumentException(tr("Missing argument - at least one style expected ({0})", "--style"));
- for (StyleData sd : argStyles) {
- SourceEntry se = new SourceEntry(SourceType.MAP_PAINT_STYLE, sd.styleUrl,
- "cliRenderingStyle", "cli rendering style '" + sd.styleUrl + "'", true /* active */);
- StyleSource source = MapPaintStyles.addStyle(se);
- if (!source.getErrors().isEmpty()) {
- throw new IllegalDataException("Failed to load style file. Errors: " + source.getErrors());
- }
- for (String key : sd.settings.keySet()) {
- BooleanStyleSetting match = source.settings.stream()
- .filter(s -> s instanceof BooleanStyleSetting)
- .map(s -> (BooleanStyleSetting) s)
- .filter(bs -> bs.prefKey.endsWith(":" + key))
- .findFirst().orElse(null);
- if (match == null) {
- Logging.warn(tr("Style setting not found: ''{0}''", key));
- } else {
- boolean value = Boolean.parseBoolean(sd.settings.get(key));
- Logging.trace("setting applied: ''{0}:{1}''", key, value);
- match.setValue(value);
- }
- }
- if (!sd.settings.isEmpty()) {
- source.loadStyleSource(); // reload to apply settings
- }
- }
- } finally {
- MapCSSStyleSource.STYLE_SOURCE_LOCK.writeLock().unlock();
+ imgSize.width, imgSize.height, maxSize, "--max-image-size"));
}
+ }
- NavigatableComponent nc = new NavigatableComponent() {
- {
- setBounds(0, 0, widthPx, heightPx);
- updateLocationState();
- }
-
- @Override
- protected boolean isVisibleOnScreen() {
- return true;
- }
-
- @Override
- public Point getLocationOnScreen() {
- return new Point(0, 0);
- }
- };
- nc.zoomTo(area.projBounds.getCenter(), area.scale);
-
- // render the data
- BufferedImage image = new BufferedImage(widthPx, heightPx, BufferedImage.TYPE_INT_ARGB);
- Graphics2D g = image.createGraphics();
- g.setColor(PaintColors.getBackgroundColor());
- g.fillRect(0, 0, widthPx, heightPx);
- new StyledMapRenderer(g, nc, false).render(ds, false, area.bounds);
-
- // write to file
+ private void writeImageToFile(BufferedImage image) throws IOException {
String output = Optional.ofNullable(argOutput).orElse("out.png");
ImageIO.write(image, "png", new File(output));
}
-
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/RenderingHelper.java b/src/org/openstreetmap/josm/gui/mappaint/RenderingHelper.java
new file mode 100644
index 0000000..d174069
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/mappaint/RenderingHelper.java
@@ -0,0 +1,188 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.mappaint;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.RenderingHints;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.ProjectionBounds;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
+import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.gui.NavigatableComponent;
+import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
+import org.openstreetmap.josm.io.IllegalDataException;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Logging;
+
+/**
+ * Class to render osm data to a file.
+ * @since 12963
+ */
+public class RenderingHelper {
+
+ private final DataSet ds;
+ private final Bounds bounds;
+ private final ProjectionBounds projBounds;
+ private final double scale;
+ private final Collection<StyleData> styles;
+ private Color backgroundColor;
+ private boolean fillBackground = true;
+
+ /**
+ * Data class to save style settings along with the corresponding style URL.
+ */
+ public static class StyleData {
+ public String styleUrl;
+ public Map<String, String> settings = new HashMap<>();
+ }
+
+ /**
+ * Construct a new {@code RenderingHelper}.
+ * @param ds the dataset to render
+ * @param bounds the bounds of the are to render
+ * @param scale the scale to render at (east/north units per pixel)
+ * @param styles the styles to use for rendering
+ */
+ public RenderingHelper(DataSet ds, Bounds bounds, double scale, Collection<StyleData> styles) {
+ CheckParameterUtil.ensureParameterNotNull(ds, "ds");
+ CheckParameterUtil.ensureParameterNotNull(bounds, "bounds");
+ CheckParameterUtil.ensureParameterNotNull(styles, "styles");
+ this.ds = ds;
+ this.bounds = bounds;
+ this.scale = scale;
+ this.styles = styles;
+ Projection proj = Main.getProjection();
+ projBounds = new ProjectionBounds();
+ projBounds.extend(proj.latlon2eastNorth(bounds.getMin()));
+ projBounds.extend(proj.latlon2eastNorth(bounds.getMax()));
+ }
+
+ /**
+ * Set the background color to use for rendering.
+ *
+ * @param backgroundColor the background color to use, {@code} means
+ * to determine the background color automatically from the style
+ * @see #setFillBackground(boolean)
+ * @since 12966
+ */
+ public void setBackgroundColor(Color backgroundColor) {
+ this.backgroundColor = backgroundColor;
+ }
+
+ /**
+ * Decide if background should be filled or left transparent.
+ * @param fillBackground true, if background should be filled
+ * @see #setBackgroundColor(java.awt.Color)
+ * @since 12966
+ */
+ public void setFillBackground(boolean fillBackground) {
+ this.fillBackground = fillBackground;
+ }
+
+ Dimension getImageSize() {
+ double widthEn = projBounds.maxEast - projBounds.minEast;
+ double heightEn = projBounds.maxNorth - projBounds.minNorth;
+ int widthPx = (int) Math.round(widthEn / scale);
+ int heightPx = (int) Math.round(heightEn / scale);
+ return new Dimension(widthPx, heightPx);
+ }
+
+ /**
+ * Invoke the renderer.
+ *
+ * @return the rendered image
+ * @throws IOException in case of an IOException
+ * @throws IllegalDataException when illegal data is encountered (style has errors, etc.)
+ */
+ public BufferedImage render() throws IOException, IllegalDataException {
+ // load the styles
+ ElemStyles elemStyles = new ElemStyles();
+ MapCSSStyleSource.STYLE_SOURCE_LOCK.writeLock().lock();
+ try {
+ for (StyleData sd : styles) {
+ MapCSSStyleSource source = new MapCSSStyleSource(sd.styleUrl, "cliRenderingStyle", "cli rendering style '" + sd.styleUrl + "'");
+ source.loadStyleSource();
+ elemStyles.add(source);
+ if (!source.getErrors().isEmpty()) {
+ throw new IllegalDataException("Failed to load style file. Errors: " + source.getErrors());
+ }
+ for (String key : sd.settings.keySet()) {
+ StyleSetting.BooleanStyleSetting match = source.settings.stream()
+ .filter(s -> s instanceof StyleSetting.BooleanStyleSetting)
+ .map(s -> (StyleSetting.BooleanStyleSetting) s)
+ .filter(bs -> bs.prefKey.endsWith(":" + key))
+ .findFirst().orElse(null);
+ if (match == null) {
+ Logging.warn(tr("Style setting not found: ''{0}''", key));
+ } else {
+ boolean value = Boolean.parseBoolean(sd.settings.get(key));
+ Logging.trace("setting applied: ''{0}:{1}''", key, value);
+ match.setValue(value);
+ }
+ }
+ if (!sd.settings.isEmpty()) {
+ source.loadStyleSource(); // reload to apply settings
+ }
+ }
+ } finally {
+ MapCSSStyleSource.STYLE_SOURCE_LOCK.writeLock().unlock();
+ }
+
+ Dimension imgDimPx = getImageSize();
+ NavigatableComponent nc = new NavigatableComponent() {
+ {
+ setBounds(0, 0, imgDimPx.width, imgDimPx.height);
+ updateLocationState();
+ }
+
+ @Override
+ protected boolean isVisibleOnScreen() {
+ return true;
+ }
+
+ @Override
+ public Point getLocationOnScreen() {
+ return new Point(0, 0);
+ }
+ };
+ nc.zoomTo(projBounds.getCenter(), scale);
+
+ // render the data
+ BufferedImage image = new BufferedImage(imgDimPx.width, imgDimPx.height, BufferedImage.TYPE_INT_ARGB);
+ Graphics2D g = image.createGraphics();
+
+ // Force all render hints to be defaults - do not use platform values
+ g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+ g.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
+ g.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
+ g.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE);
+ g.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+ g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+ g.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE);
+ g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+
+ if (fillBackground) {
+ g.setColor(Optional.ofNullable(backgroundColor).orElse(elemStyles.getBackgroundColor()));
+ g.fillRect(0, 0, imgDimPx.width, imgDimPx.height);
+ }
+ StyledMapRenderer smr = new StyledMapRenderer(g, nc, false);
+ smr.setStyles(elemStyles);
+ smr.render(ds, false, bounds);
+ return image;
+ }
+
+}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java
index 55b257b..9bcf679 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java
@@ -768,8 +768,9 @@ public final class ConditionFactory {
}
static boolean selected(Environment e) { // NO_UCD (unused code)
- Cascade c = e.mc.getCascade(e.layer);
- c.setDefaultSelectedHandling(false);
+ if (e.mc != null) {
+ e.mc.getCascade(e.layer).setDefaultSelectedHandling(false);
+ }
return e.osm.isSelected();
}
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
index 4fa3393..258bfe7 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
@@ -17,7 +17,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.gui.mappaint.Keyword;
import org.openstreetmap.josm.gui.mappaint.mapcss.Condition;
import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.Context;
@@ -1133,7 +1133,12 @@ Object literal() :
{
LOOKAHEAD(2)
pref=ident() t=<HEXCOLOR>
- { return new ColorProperty("mappaint." + (sheet == null ? "MapCSS" : sheet.title) + "." + pref, t.image).get(); }
+ {
+ return new NamedColorProperty(
+ NamedColorProperty.COLOR_CATEGORY_MAPPAINT,
+ sheet == null ? "MapCSS" : sheet.title, pref,
+ ColorHelper.html2color(t.image)).get();
+ }
|
t=<IDENT> { return new Keyword(t.image); }
|
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
index bcb01bd..08f8a2c 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
@@ -437,7 +437,7 @@ public class MapCSSStyleSource extends StyleSource {
}
} catch (IOException e) {
Logging.warn(tr("Failed to load Mappaint styles from ''{0}''. Exception was: {1}", url, e.toString()));
- Logging.error(e);
+ Logging.log(Logging.LEVEL_ERROR, e);
logError(e);
} catch (TokenMgrError e) {
Logging.warn(tr("Failed to parse Mappaint styles from ''{0}''. Error was: {1}", url, e.getMessage()));
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
index e423725..b5339c7 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
@@ -7,6 +7,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.NoSuchElementException;
+import java.util.Objects;
import java.util.Set;
import java.util.function.IntFunction;
import java.util.function.IntSupplier;
@@ -15,6 +16,7 @@ import java.util.regex.PatternSyntaxException;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.OsmUtils;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Way;
@@ -257,14 +259,19 @@ public interface Selector {
}
private final class CrossingFinder extends AbstractFinder {
+
+ private final String layer;
+
private CrossingFinder(Environment e) {
super(e);
CheckParameterUtil.ensureThat(e.osm instanceof Way, "Only ways are supported");
+ layer = OsmUtils.getLayer(e.osm);
}
@Override
public void visit(Way w) {
- if (e.child == null && left.matches(new Environment(w).withParent(e.osm))
+ if (e.child == null && Objects.equals(layer, OsmUtils.getLayer(w))
+ && left.matches(new Environment(w).withParent(e.osm))
&& e.osm instanceof Way && Geometry.PolygonIntersection.CROSSING.equals(
Geometry.polygonIntersection(w.getNodes(), ((Way) e.osm).getNodes()))) {
e.child = w;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
index c4b9984..fe4bf02 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
@@ -356,6 +356,10 @@ public class LineElement extends StyleElement {
}
}
float dashesOffset = c.get(type.prefix + DASHES_OFFSET, 0f, Float.class);
+ if (dashesOffset < 0f) {
+ Logging.warn("Found negative " + DASHES_OFFSET + ": " + dashesOffset);
+ dashesOffset = 0f;
+ }
Color dashesBackground = c.get(type.prefix + DASHES_BACKGROUND_COLOR, null, Color.class);
if (dashesBackground != null) {
pAlpha = Utils.colorFloat2int(c.get(type.prefix + DASHES_BACKGROUND_OPACITY, null, Float.class));
diff --git a/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java b/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java
index 21db876..61aefa0 100644
--- a/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java
+++ b/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java
@@ -129,11 +129,24 @@ public abstract class AbstractAuthorizationUI extends VerticallyScrollablePanel
public abstract boolean isSaveAccessTokenToPreferences();
/**
+ * Initializes the authorisation UI.
+ *
+ * @param paramApiUrl the API URL. Must not be null.
+ * @throws IllegalArgumentException if paramApiUrl is null
+ */
+ public void initialize(String paramApiUrl) {
+ CheckParameterUtil.ensureParameterNotNull(paramApiUrl, "paramApiUrl");
+ pnlAdvancedProperties.initialize(paramApiUrl);
+ }
+
+ /**
* Initializes the authorisation UI with preference values in <code>pref</code>.
*
* @param pref the preferences. Must not be null.
* @throws IllegalArgumentException if pref is null
+ * @deprecated (since 12928) replaced by {@link #initialize(java.lang.String)}
*/
+ @Deprecated
public void initFromPreferences(Preferences pref) {
CheckParameterUtil.ensureParameterNotNull(pref, "pref");
pnlAdvancedProperties.initFromPreferences(pref);
diff --git a/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java b/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
index 658bb2a..723fd9a 100644
--- a/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
+++ b/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
@@ -23,6 +23,7 @@ import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
+import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -256,9 +257,30 @@ public class AdvancedOAuthPropertiesPanel extends VerticallyScrollablePanel {
/**
* Initializes the panel from the values in the preferences <code>preferences</code>.
*
+ * @param paramApiUrl the API URL. Must not be null.
+ * @throws IllegalArgumentException if paramApiUrl is null
+ */
+ public void initialize(String paramApiUrl) {
+ CheckParameterUtil.ensureParameterNotNull(paramApiUrl, "paramApiUrl");
+ setApiUrl(paramApiUrl);
+ boolean useDefault = Config.getPref().getBoolean("oauth.settings.use-default", true);
+ ilUseDefault.setEnabled(false);
+ if (useDefault) {
+ resetToDefaultSettings();
+ } else {
+ setAdvancedParameters(OAuthParameters.createFromApiUrl(paramApiUrl));
+ }
+ ilUseDefault.setEnabled(true);
+ }
+
+ /**
+ * Initializes the panel from the values in the preferences <code>preferences</code>.
+ *
* @param pref the preferences. Must not be null.
* @throws IllegalArgumentException if pref is null
+ * @deprecated (since 12928) replaced by {@link #initialize(java.lang.String)}
*/
+ @Deprecated
public void initFromPreferences(Preferences pref) {
CheckParameterUtil.ensureParameterNotNull(pref, "pref");
setApiUrl(pref.get("osm-server.url"));
@@ -274,10 +296,24 @@ public class AdvancedOAuthPropertiesPanel extends VerticallyScrollablePanel {
/**
* Remembers the current values in the preferences <code>pref</code>.
+ */
+ public void rememberPreferences() {
+ Config.getPref().putBoolean("oauth.settings.use-default", cbUseDefaults.isSelected());
+ if (cbUseDefaults.isSelected()) {
+ new OAuthParameters(null, null, null, null, null, null, null).rememberPreferences();
+ } else {
+ getAdvancedParameters().rememberPreferences();
+ }
+ }
+
+ /**
+ * Remembers the current values in the preferences <code>pref</code>.
*
* @param pref the preferences. Must not be null.
* @throws IllegalArgumentException if pref is null.
+ * @deprecated (since 12928) replaced by {@link #rememberPreferences()}
*/
+ @Deprecated
public void rememberPreferences(Preferences pref) {
CheckParameterUtil.ensureParameterNotNull(pref, "pref");
pref.putBoolean("oauth.settings.use-default", cbUseDefaults.isSelected());
diff --git a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
index 6dc4366..de7fc7d 100644
--- a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
+++ b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
@@ -168,8 +168,34 @@ public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
/**
* Initializes the panel with values from the preferences
+ * @param paramApiUrl the API URL
+ */
+ @Override
+ public void initialize(String paramApiUrl) {
+ super.initialize(paramApiUrl);
+ CredentialsAgent cm = CredentialsManager.getInstance();
+ try {
+ PasswordAuthentication pa = cm.lookup(RequestorType.SERVER, OsmApi.getOsmApi().getHost());
+ if (pa == null) {
+ tfUserName.setText("");
+ tfPassword.setText("");
+ } else {
+ tfUserName.setText(pa.getUserName() == null ? "" : pa.getUserName());
+ tfPassword.setText(pa.getPassword() == null ? "" : String.valueOf(pa.getPassword()));
+ }
+ } catch (CredentialsAgentException e) {
+ Logging.error(e);
+ tfUserName.setText("");
+ tfPassword.setText("");
+ }
+ }
+
+ /**
+ * Initializes the panel with values from the preferences
* @param pref Preferences structure
+ * @deprecated (since 12928) replaced by {@link #initialize(java.lang.String)}
*/
+ @Deprecated
@Override
public void initFromPreferences(Preferences pref) {
super.initFromPreferences(pref);
diff --git a/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java b/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
index 0955084..db5a450 100644
--- a/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
+++ b/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
@@ -39,7 +39,6 @@ import javax.swing.event.HyperlinkListener;
import javax.swing.text.html.HTMLEditorKit;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
import org.openstreetmap.josm.data.oauth.OAuthAccessTokenHolder;
import org.openstreetmap.josm.data.oauth.OAuthParameters;
import org.openstreetmap.josm.data.oauth.OAuthToken;
@@ -308,12 +307,9 @@ public class OAuthAuthorizationWizard extends JDialog {
*
*/
public void initFromPreferences() {
- // Copy current JOSM preferences to update API url with the one used in this wizard
- Preferences copyPref = new Preferences(Main.pref);
- copyPref.put("osm-server.url", apiUrl);
- pnlFullyAutomaticAuthorisationUI.initFromPreferences(copyPref);
- pnlSemiAutomaticAuthorisationUI.initFromPreferences(copyPref);
- pnlManualAuthorisationUI.initFromPreferences(copyPref);
+ pnlFullyAutomaticAuthorisationUI.initialize(apiUrl);
+ pnlSemiAutomaticAuthorisationUI.initialize(apiUrl);
+ pnlManualAuthorisationUI.initialize(apiUrl);
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/DefaultPreferenceSetting.java b/src/org/openstreetmap/josm/gui/preferences/DefaultPreferenceSetting.java
index 1977a87..12fcbe3 100644
--- a/src/org/openstreetmap/josm/gui/preferences/DefaultPreferenceSetting.java
+++ b/src/org/openstreetmap/josm/gui/preferences/DefaultPreferenceSetting.java
@@ -1,11 +1,18 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences;
+import javax.swing.JCheckBox;
+import javax.swing.JTextField;
+
+import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider;
+import org.openstreetmap.josm.tools.Logging;
+
/**
* Abstract base class for {@link PreferenceSetting} implementations.
*
- * Handles the flag that indicates if a PreferenceSetting is and expert option
- * or not.
+ * Handles the flag that indicates if a PreferenceSetting is and expert option or not.
+ * @since 4968
*/
public abstract class DefaultPreferenceSetting implements PreferenceSetting {
@@ -33,4 +40,46 @@ public abstract class DefaultPreferenceSetting implements PreferenceSetting {
public boolean isExpert() {
return isExpert;
}
+
+ /**
+ * Saves state from a {@link JCheckBox} to a boolean preference.
+ * @param prefName preference name
+ * @param cb check box
+ * @since 13050
+ */
+ protected static void saveBoolean(String prefName, JCheckBox cb) {
+ Config.getPref().putBoolean(prefName, cb.isSelected());
+ }
+
+ /**
+ * Saves text from a {@link JTextField} to a double preference.
+ * @param prefName preference name
+ * @param tf text field
+ * @since 13050
+ */
+ protected static void saveDouble(String prefName, JTextField tf) {
+ String text = tf.getText();
+ try {
+ Config.getPref().putDouble(prefName, JosmDecimalFormatSymbolsProvider.parseDouble(text));
+ } catch (NumberFormatException e) {
+ Logging.warn("Unable to save '" + text + "' as a double value for preference " + prefName);
+ Logging.trace(e);
+ }
+ }
+
+ /**
+ * Saves text from a {@link JTextField} to an integer preference.
+ * @param prefName preference name
+ * @param tf text field
+ * @since 13050
+ */
+ protected static void saveInt(String prefName, JTextField tf) {
+ String text = tf.getText();
+ try {
+ Config.getPref().putInt(prefName, Integer.parseInt(text));
+ } catch (NumberFormatException e) {
+ Logging.warn("Unable to save '" + text + "' as an integer value for preference " + prefName);
+ Logging.trace(e);
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java b/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java
index 0a7f62b..8f63f0e 100644
--- a/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java
+++ b/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java
@@ -28,7 +28,7 @@ import javax.swing.UIManager;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableModel;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.spi.preferences.ListListSetting;
import org.openstreetmap.josm.spi.preferences.ListSetting;
import org.openstreetmap.josm.spi.preferences.MapListSetting;
@@ -335,10 +335,10 @@ public class PreferencesTable extends JTable {
static final class SettingCellRenderer extends DefaultTableCellRenderer {
private final Color backgroundColor = UIManager.getColor("Table.background");
- private final Color changedColor = new ColorProperty(
+ private final Color changedColor = new NamedColorProperty(
marktr("Advanced Background: Changed"),
new Color(200, 255, 200)).get();
- private final Color nonDefaultColor = new ColorProperty(
+ private final Color nonDefaultColor = new NamedColorProperty(
marktr("Advanced Background: NonDefault"),
new Color(255, 255, 200)).get();
diff --git a/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java b/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java
index 54db066..6b5c9df 100644
--- a/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java
@@ -133,17 +133,17 @@ public final class AudioPreference extends DefaultTabPreferenceSetting {
@Override
public boolean ok() {
Config.getPref().putBoolean("audio.menuinvisible", !audioMenuVisible.isSelected());
- Config.getPref().putBoolean("marker.traceaudio", markerAudioTraceVisible.isSelected());
- Config.getPref().putBoolean("marker.buttonlabels", markerButtonLabels.isSelected());
- Config.getPref().putBoolean("marker.audiofromexplicitwaypoints", audioMarkersFromExplicitWaypoints.isSelected());
- Config.getPref().putBoolean("marker.audiofromuntimedwaypoints", audioMarkersFromUntimedWaypoints.isSelected());
- Config.getPref().putBoolean("marker.audiofromnamedtrackpoints", audioMarkersFromNamedTrackpoints.isSelected());
- Config.getPref().putBoolean("marker.audiofromwavtimestamps", audioMarkersFromWavTimestamps.isSelected());
- Config.getPref().putBoolean("marker.audiofromstart", audioMarkersFromStart.isSelected());
- Config.getPref().put("audio.forwardbackamount", audioForwardBackAmount.getText());
- Config.getPref().put("audio.fastfwdmultiplier", audioFastForwardMultiplier.getText());
- Config.getPref().put("audio.leadin", audioLeadIn.getText());
- Config.getPref().put("audio.calibration", audioCalibration.getText());
+ saveBoolean("marker.traceaudio", markerAudioTraceVisible);
+ saveBoolean("marker.buttonlabels", markerButtonLabels);
+ saveBoolean("marker.audiofromexplicitwaypoints", audioMarkersFromExplicitWaypoints);
+ saveBoolean("marker.audiofromuntimedwaypoints", audioMarkersFromUntimedWaypoints);
+ saveBoolean("marker.audiofromnamedtrackpoints", audioMarkersFromNamedTrackpoints);
+ saveBoolean("marker.audiofromwavtimestamps", audioMarkersFromWavTimestamps);
+ saveBoolean("marker.audiofromstart", audioMarkersFromStart);
+ saveDouble("audio.forwardbackamount", audioForwardBackAmount);
+ saveDouble("audio.fastfwdmultiplier", audioFastForwardMultiplier);
+ saveDouble("audio.leadin", audioLeadIn);
+ saveDouble("audio.calibration", audioCalibration);
return false;
}
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java b/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
index b848d7c..407d389 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
@@ -4,16 +4,20 @@ package org.openstreetmap.josm.gui.preferences.display;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Color;
+import java.awt.Component;
import java.awt.Dimension;
+import java.awt.Font;
import java.awt.GridBagLayout;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
+import java.text.Collator;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.TreeMap;
-import java.util.Vector;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
import javax.swing.BorderFactory;
import javax.swing.Box;
@@ -26,11 +30,16 @@ import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.ListSelectionModel;
import javax.swing.event.ListSelectionEvent;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableCellRenderer;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
+import javax.swing.table.AbstractTableModel;
+import javax.swing.table.DefaultTableCellRenderer;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.preferences.ColorInfo;
import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.data.validation.Severity;
import org.openstreetmap.josm.gui.MapScaler;
import org.openstreetmap.josm.gui.MapStatus;
@@ -45,15 +54,18 @@ import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ColorHelper;
import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.I18n;
/**
* Color preferences.
+ *
+ * GUI preference to let the user customize named colors.
+ * @see NamedColorProperty
*/
-public class ColorPreference implements SubPreferenceSetting {
+public class ColorPreference implements SubPreferenceSetting, ListSelectionListener, TableModelListener {
/**
* Factory used to create a new {@code ColorPreference}.
@@ -65,100 +77,241 @@ public class ColorPreference implements SubPreferenceSetting {
}
}
- private DefaultTableModel tableModel;
+ private ColorTableModel tableModel;
private JTable colors;
- private final List<String> del = new ArrayList<>();
private JButton colorEdit;
private JButton defaultSet;
private JButton remove;
+ private static class ColorEntry {
+ String key;
+ ColorInfo info;
+
+ ColorEntry(String key, ColorInfo info) {
+ CheckParameterUtil.ensureParameterNotNull(key, "key");
+ CheckParameterUtil.ensureParameterNotNull(info, "info");
+ this.key = key;
+ this.info = info;
+ }
+
+ /**
+ * Get a description of the color based on the given info.
+ * @return a description of the color
+ */
+ public String getDisplay() {
+ switch (info.getCategory()) {
+ case NamedColorProperty.COLOR_CATEGORY_LAYER:
+ String v = null;
+ if (info.getSource() != null) {
+ v = info.getSource();
+ }
+ if (!info.getName().isEmpty()) {
+ if (v == null) {
+ v = tr(I18n.escape(info.getName()));
+ } else {
+ v += " - " + tr(I18n.escape(info.getName()));
+ }
+ }
+ return tr("Layer: {0}", v);
+ case NamedColorProperty.COLOR_CATEGORY_MAPPAINT:
+ if (info.getSource() != null)
+ return tr("Paint style {0}: {1}", tr(I18n.escape(info.getSource())), tr(info.getName()));
+ // fall through
+ default:
+ if (info.getSource() != null)
+ return tr(I18n.escape(info.getSource())) + " - " + tr(I18n.escape(info.getName()));
+ else
+ return tr(I18n.escape(info.getName()));
+ }
+ }
+
+ /**
+ * Get the color value to display.
+ * Either value (if set) or default value.
+ * @return the color value to display
+ */
+ public Color getDisplayColor() {
+ return Optional.ofNullable(info.getValue()).orElse(info.getDefaultValue());
+ }
+
+ /**
+ * Check if color has been customized by the user or not.
+ * @return true if the color is at its default value, false if it is customized by the user.
+ */
+ public boolean isDefault() {
+ return info.getValue() == null || Objects.equals(info.getValue(), info.getDefaultValue());
+ }
+
+ /**
+ * Convert to a {@link NamedColorProperty}.
+ * @return a {@link NamedColorProperty}
+ */
+ public NamedColorProperty toProperty() {
+ return new NamedColorProperty(info.getCategory(), info.getSource(),
+ info.getName(), info.getDefaultValue());
+ }
+ }
+
+ private static class ColorTableModel extends AbstractTableModel {
+
+ private final List<ColorEntry> data;
+ private final List<ColorEntry> deleted;
+
+ ColorTableModel() {
+ this.data = new ArrayList<>();
+ this.deleted = new ArrayList<>();
+ }
+
+ public void addEntry(ColorEntry entry) {
+ data.add(entry);
+ }
+
+ public void removeEntry(int row) {
+ deleted.add(data.get(row));
+ data.remove(row);
+ fireTableDataChanged();
+ }
+
+ public ColorEntry getEntry(int row) {
+ return data.get(row);
+ }
+
+ public List<ColorEntry> getData() {
+ return data;
+ }
+
+ public List<ColorEntry> getDeleted() {
+ return deleted;
+ }
+
+ public void clear() {
+ data.clear();
+ deleted.clear();
+ }
+
+ @Override
+ public int getRowCount() {
+ return data.size();
+ }
+
+ @Override
+ public int getColumnCount() {
+ return 2;
+ }
+
+ @Override
+ public Object getValueAt(int rowIndex, int columnIndex) {
+ return columnIndex == 0 ? data.get(rowIndex) : data.get(rowIndex).getDisplayColor();
+ }
+
+ @Override
+ public String getColumnName(int column) {
+ return column == 0 ? tr("Name") : tr("Color");
+ }
+
+ @Override
+ public boolean isCellEditable(int rowIndex, int columnIndex) {
+ return false;
+ }
+
+ @Override
+ public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
+ if (columnIndex == 1 && aValue instanceof Color) {
+ data.get(rowIndex).info.setValue((Color) aValue);
+ fireTableRowsUpdated(rowIndex, rowIndex);
+ }
+ }
+ }
+
/**
* Set the colors to be shown in the preference table. This method creates a table model if
* none exists and overwrites all existing values.
* @param colorMap the map holding the colors
- * (key = color id (without prefixes, so only <code>background</code>; not <code>color.background</code>),
- * value = html representation of the color.
+ * (key = preference key, value = {@link ColorInfo} instance)
*/
- public void setColorModel(Map<String, String> colorMap) {
+ public void setColors(Map<String, ColorInfo> colorMap) {
if (tableModel == null) {
- tableModel = new DefaultTableModel();
- tableModel.addColumn(tr("Name"));
- tableModel.addColumn(tr("Color"));
+ tableModel = new ColorTableModel();
}
+ tableModel.clear();
- // clear old model:
- while (tableModel.getRowCount() > 0) {
- tableModel.removeRow(0);
- }
// fill model with colors:
- Map<String, String> colorKeyList = new TreeMap<>();
- Map<String, String> colorKeyListMappaint = new TreeMap<>();
- Map<String, String> colorKeyListLayer = new TreeMap<>();
- for (String key : colorMap.keySet()) {
- if (key.startsWith("layer ")) {
- colorKeyListLayer.put(getName(key), key);
- } else if (key.startsWith("mappaint.")) {
- // use getName(key)+key, as getName() may be ambiguous
- colorKeyListMappaint.put(getName(key)+key, key);
- } else {
- colorKeyList.put(getName(key), key);
- }
- }
- addColorRows(colorMap, colorKeyList);
- addColorRows(colorMap, colorKeyListMappaint);
- addColorRows(colorMap, colorKeyListLayer);
+ colorMap.entrySet().stream()
+ .map(e -> new ColorEntry(e.getKey(), e.getValue()))
+ .sorted((e1, e2) -> {
+ int cat = Integer.compare(
+ getCategroyPriority(e1.info.getCategory()),
+ getCategroyPriority(e2.info.getCategory()));
+ if (cat != 0) return cat;
+ return Collator.getInstance().compare(e1.getDisplay(), e2.getDisplay());
+ })
+ .forEach(tableModel::addEntry);
+
if (this.colors != null) {
this.colors.repaint();
}
+
}
- private void addColorRows(Map<String, String> colorMap, Map<String, String> keyMap) {
- for (String value : keyMap.values()) {
- Vector<Object> row = new Vector<>(2);
- String html = colorMap.get(value);
- Color color = ColorHelper.html2color(html);
- if (color == null) {
- Logging.warn("Unable to get color from '"+html+"' for color preference '"+value+'\'');
- }
- row.add(value);
- row.add(color);
- tableModel.addRow(row);
+ private static int getCategroyPriority(String category) {
+ switch (category) {
+ case NamedColorProperty.COLOR_CATEGORY_GENERAL: return 1;
+ case NamedColorProperty.COLOR_CATEGORY_MAPPAINT: return 2;
+ case NamedColorProperty.COLOR_CATEGORY_LAYER: return 3;
+ default: return 4;
}
}
/**
+ * Set the colors to be shown in the preference table. This method creates a table model if
+ * none exists and overwrites all existing values.
+ * @param colorMap the map holding the colors
+ * (key = color id (without prefixes, so only <code>background</code>; not <code>color.background</code>),
+ * value = html representation of the color.
+ * @deprecated (since 12987) replaced by {@link #setColors(java.util.Map)}
+ */
+ @Deprecated
+ public void setColorModel(Map<String, String> colorMap) {
+ setColors(colorMap.entrySet().stream().collect(Collectors.toMap(e->e.getKey(), e->
+ new ColorInfo(NamedColorProperty.COLOR_CATEGORY_GENERAL, null, e.getKey(), ColorHelper.html2color(e.getValue()), null))));
+ }
+
+ /**
+ * Returns a map with the colors in the table (key = preference key, value = color info).
+ * @return a map holding the colors.
+ */
+ public Map<String, ColorInfo> getColors() {
+ return tableModel.getData().stream().collect(Collectors.toMap(e -> e.key, e -> e.info));
+ }
+
+ /**
* Returns a map with the colors in the table (key = color name without prefix, value = html color code).
* @return a map holding the colors.
+ * @deprecated replaced by {@link #getColors()}
*/
+ @Deprecated
public Map<String, String> getColorModel() {
- String key;
- String value;
Map<String, String> colorMap = new HashMap<>();
- for (int row = 0; row < tableModel.getRowCount(); ++row) {
- key = (String) tableModel.getValueAt(row, 0);
- value = ColorHelper.color2html((Color) tableModel.getValueAt(row, 1));
- colorMap.put(key, value);
+ for (ColorEntry e : tableModel.getData()) {
+ colorMap.put(e.key, ColorHelper.color2html(e.getDisplayColor()));
}
return colorMap;
}
- private static String getName(String o) {
- return Main.pref.getColorName(o);
- }
-
@Override
public void addGui(final PreferenceTabbedPane gui) {
fixColorPrefixes();
- setColorModel(Main.pref.getAllColors());
+ setColors(Main.pref.getAllNamedColors());
colorEdit = new JButton(tr("Choose"));
colorEdit.addActionListener(e -> {
int sel = colors.getSelectedRow();
- JColorChooser chooser = new JColorChooser((Color) colors.getValueAt(sel, 1));
+ ColorEntry ce = tableModel.getEntry(sel);
+ JColorChooser chooser = new JColorChooser(ce.getDisplayColor());
int answer = JOptionPane.showConfirmDialog(
gui, chooser,
- tr("Choose a color for {0}", getName((String) colors.getValueAt(sel, 0))),
+ tr("Choose a color for {0}", ce.getDisplay()),
JOptionPane.OK_CANCEL_OPTION,
JOptionPane.PLAIN_MESSAGE);
if (answer == JOptionPane.OK_OPTION) {
@@ -168,17 +321,18 @@ public class ColorPreference implements SubPreferenceSetting {
defaultSet = new JButton(tr("Set to default"));
defaultSet.addActionListener(e -> {
int sel = colors.getSelectedRow();
- String name = (String) colors.getValueAt(sel, 0);
- Color c = Main.pref.getDefaultColor(name);
+ ColorEntry ce = tableModel.getEntry(sel);
+ Color c = ce.info.getDefaultValue();
if (c != null) {
colors.setValueAt(c, sel, 1);
}
});
JButton defaultAll = new JButton(tr("Set all to default"));
defaultAll.addActionListener(e -> {
- for (int i = 0; i < colors.getRowCount(); ++i) {
- String name = (String) colors.getValueAt(i, 0);
- Color c = Main.pref.getDefaultColor(name);
+ List<ColorEntry> data = tableModel.getData();
+ for (int i = 0; i < data.size(); ++i) {
+ ColorEntry ce = data.get(i);
+ Color c = ce.info.getDefaultValue();
if (c != null) {
colors.setValueAt(c, i, 1);
}
@@ -187,27 +341,13 @@ public class ColorPreference implements SubPreferenceSetting {
remove = new JButton(tr("Remove"));
remove.addActionListener(e -> {
int sel = colors.getSelectedRow();
- del.add((String) colors.getValueAt(sel, 0));
- tableModel.removeRow(sel);
+ tableModel.removeEntry(sel);
});
remove.setEnabled(false);
colorEdit.setEnabled(false);
defaultSet.setEnabled(false);
- colors = new JTable(tableModel) {
- @Override
- public boolean isCellEditable(int row, int column) {
- return false;
- }
-
- @Override public void valueChanged(ListSelectionEvent e) {
- super.valueChanged(e);
- int sel = getSelectedRow();
- remove.setEnabled(sel >= 0 && isRemoveColor(sel));
- colorEdit.setEnabled(sel >= 0);
- defaultSet.setEnabled(sel >= 0);
- }
- };
+ colors = new JTable(tableModel);
colors.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent me) {
@@ -217,23 +357,48 @@ public class ColorPreference implements SubPreferenceSetting {
}
});
colors.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- final TableCellRenderer oldColorsRenderer = colors.getDefaultRenderer(Object.class);
- colors.setDefaultRenderer(Object.class, (t, o, selected, focus, row, column) -> {
- if (o == null)
- return new JLabel();
- if (column == 1) {
- Color c = (Color) o;
- JLabel l = new JLabel(ColorHelper.color2html(c));
- GuiHelper.setBackgroundReadable(l, c);
- l.setOpaque(true);
- return l;
+ colors.getColumnModel().getColumn(0).setCellRenderer(new DefaultTableCellRenderer() {
+ @Override
+ public Component getTableCellRendererComponent(
+ JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+ Component comp = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+ if (value != null && comp instanceof JLabel) {
+ JLabel label = (JLabel) comp;
+ ColorEntry e = (ColorEntry) value;
+ label.setText(e.getDisplay());
+ if (!e.isDefault()) {
+ label.setFont(label.getFont().deriveFont(Font.BOLD));
+ } else {
+ label.setFont(label.getFont().deriveFont(Font.PLAIN));
+ }
+ return label;
+ }
+ return comp;
+ }
+ });
+ colors.getColumnModel().getColumn(1).setCellRenderer(new DefaultTableCellRenderer() {
+ @Override
+ public Component getTableCellRendererComponent(
+ JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+ Component comp = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+ if (value != null && comp instanceof JLabel) {
+ JLabel label = (JLabel) comp;
+ Color c = (Color) value;
+ label.setText(ColorHelper.color2html(c));
+ GuiHelper.setBackgroundReadable(label, c);
+ label.setOpaque(true);
+ return label;
+ }
+ return comp;
}
- return oldColorsRenderer.getTableCellRendererComponent(t, getName(o.toString()), selected, focus, row, column);
});
colors.getColumnModel().getColumn(1).setWidth(100);
colors.setToolTipText(tr("Colors used by different objects in JOSM."));
colors.setPreferredScrollableViewportSize(new Dimension(100, 112));
+ colors.getSelectionModel().addListSelectionListener(this);
+ colors.getModel().addTableModelListener(this);
+
JPanel panel = new JPanel(new GridBagLayout());
panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
JScrollPane scrollpane = new JScrollPane(colors);
@@ -249,8 +414,8 @@ public class ColorPreference implements SubPreferenceSetting {
gui.getDisplayPreference().addSubTab(this, tr("Colors"), panel);
}
- Boolean isRemoveColor(int row) {
- return ((String) colors.getValueAt(row, 0)).startsWith("layer ");
+ private boolean isRemoveColor(ColorEntry ce) {
+ return ce.info.getCategory().equals(NamedColorProperty.COLOR_CATEGORY_LAYER);
}
/**
@@ -271,13 +436,15 @@ public class ColorPreference implements SubPreferenceSetting {
@Override
public boolean ok() {
boolean ret = false;
- for (String d : del) {
- Config.getPref().put("color."+d, null);
+ for (ColorEntry d : tableModel.getDeleted()) {
+ d.toProperty().remove();
}
- for (int i = 0; i < colors.getRowCount(); ++i) {
- String key = (String) colors.getValueAt(i, 0);
- if (Main.pref.putColor(key, (Color) colors.getValueAt(i, 1)) && key.startsWith("mappaint.")) {
- ret = true;
+ for (ColorEntry e : tableModel.getData()) {
+ if (e.info.getValue() != null) {
+ if (e.toProperty().put(e.info.getValue())
+ && e.key.startsWith("mappaint.")) {
+ ret = true;
+ }
}
}
OsmDataLayer.createHatchTexture();
@@ -293,4 +460,22 @@ public class ColorPreference implements SubPreferenceSetting {
public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
return gui.getDisplayPreference();
}
+
+ @Override
+ public void valueChanged(ListSelectionEvent e) {
+ updateEnabledState();
+ }
+
+ @Override
+ public void tableChanged(TableModelEvent e) {
+ updateEnabledState();
+ }
+
+ private void updateEnabledState() {
+ int sel = colors.getSelectedRow();
+ ColorEntry ce = sel >= 0 ? tableModel.getEntry(sel) : null;
+ remove.setEnabled(ce != null && isRemoveColor(ce));
+ colorEdit.setEnabled(ce != null);
+ defaultSet.setEnabled(ce != null && !ce.isDefault());
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java b/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
index 7534432..27d8e33 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
@@ -25,6 +25,7 @@ import javax.swing.JSlider;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ExpertToggleAction;
import org.openstreetmap.josm.data.PreferencesUtils;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.gui.layer.gpx.GpxDrawHelper;
import org.openstreetmap.josm.gui.layer.markerlayer.Marker;
import org.openstreetmap.josm.gui.layer.markerlayer.Marker.TemplateEntryProperty;
@@ -328,7 +329,8 @@ public class GPXSettingsPanel extends JPanel implements ValidationListener {
final Color color;
// ask the GPX draw for the correct color of that layer ( if there is one )
if (null != layerName) {
- color = GpxDrawHelper.DEFAULT_COLOR.getChildColor(layerName).get();
+ color = GpxDrawHelper.DEFAULT_COLOR.getChildColor(
+ NamedColorProperty.COLOR_CATEGORY_LAYER, layerName, GpxDrawHelper.DEFAULT_COLOR.getName()).get();
} else {
color = GpxDrawHelper.DEFAULT_COLOR.getDefaultValue();
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java b/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
index 390d718..14f2816 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
@@ -59,7 +59,7 @@ import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryBounds;
import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
import org.openstreetmap.josm.data.imagery.OffsetBookmark;
import org.openstreetmap.josm.data.imagery.Shape;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.gui.MainApplication;
import org.openstreetmap.josm.gui.download.DownloadDialog;
import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
@@ -247,7 +247,7 @@ public final class ImageryPreference extends DefaultTabPreferenceSetting {
*/
private static class ImageryURLTableCellRenderer extends DefaultTableCellRenderer {
- private static final ColorProperty IMAGERY_BACKGROUND_COLOR = new ColorProperty(
+ private static final NamedColorProperty IMAGERY_BACKGROUND_COLOR = new NamedColorProperty(
marktr("Imagery Background: Default"),
new Color(200, 255, 200));
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
index df04b92..18477af 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
@@ -17,7 +17,6 @@ import javax.swing.JPanel;
import javax.swing.JRadioButton;
import javax.swing.JSeparator;
-import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.oauth.OAuthAccessTokenHolder;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
@@ -133,7 +132,7 @@ public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel im
}
/**
- * Saves the current values to preferences
+ * Saves the current values to the preferences
*/
public final void saveToPreferences() {
// save the authentication method
@@ -148,7 +147,7 @@ public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel im
// save username and password and clear the OAuth token
pnlBasicAuthPreferences.saveToPreferences();
OAuthAccessTokenHolder.getInstance().clear();
- OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManager.getInstance());
+ OAuthAccessTokenHolder.getInstance().save(CredentialsManager.getInstance());
} else if ("oauth".equals(authMethod)) {
// clear the password in the preferences
pnlBasicAuthPreferences.clearPassword();
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
index c28a578..ab8e21f 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
@@ -22,7 +22,6 @@ import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.oauth.OAuthAccessTokenHolder;
import org.openstreetmap.josm.data.oauth.OAuthParameters;
import org.openstreetmap.josm.data.oauth.OAuthToken;
@@ -95,7 +94,7 @@ public class OAuthAuthenticationPreferencesPanel extends JPanel implements Prope
gc.weightx = 1.0;
gc.weighty = 1.0;
pnl.add(pnlAdvancedProperties, gc);
- pnlAdvancedProperties.initFromPreferences(Main.pref);
+ pnlAdvancedProperties.initialize(OsmApi.getOsmApi().getServerUrl());
pnlAdvancedProperties.setBorder(
BorderFactory.createCompoundBorder(
BorderFactory.createLineBorder(Color.GRAY, 1),
@@ -161,8 +160,8 @@ public class OAuthAuthenticationPreferencesPanel extends JPanel implements Prope
*/
public void saveToPreferences() {
OAuthAccessTokenHolder.getInstance().setSaveToPreferences(cbSaveToPreferences.isSelected());
- OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManager.getInstance());
- pnlAdvancedProperties.rememberPreferences(Main.pref);
+ OAuthAccessTokenHolder.getInstance().save(CredentialsManager.getInstance());
+ pnlAdvancedProperties.rememberPreferences();
}
/**
@@ -358,7 +357,7 @@ public class OAuthAuthenticationPreferencesPanel extends JPanel implements Prope
@Override
public void actionPerformed(ActionEvent evt) {
OAuthToken token = OAuthAccessTokenHolder.getInstance().getAccessToken();
- OAuthParameters parameters = OAuthParameters.createFromPreferences(Main.pref);
+ OAuthParameters parameters = OAuthParameters.createFromApiUrl(OsmApi.getOsmApi().getServerUrl());
TestAccessTokenTask task = new TestAccessTokenTask(
OAuthAuthenticationPreferencesPanel.this,
apiUrl,
diff --git a/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java b/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
index adce020..d4ed405 100644
--- a/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
@@ -44,7 +44,7 @@ import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.widgets.JosmComboBox;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
@@ -159,10 +159,10 @@ public class PrefJPanel extends JPanel {
private class ShortcutTableCellRenderer extends DefaultTableCellRenderer {
- private final transient ColorProperty SHORTCUT_BACKGROUND_USER_COLOR = new ColorProperty(
+ private final transient NamedColorProperty SHORTCUT_BACKGROUND_USER_COLOR = new NamedColorProperty(
marktr("Shortcut Background: User"),
new Color(200, 255, 200));
- private final transient ColorProperty SHORTCUT_BACKGROUND_MODIFIED_COLOR = new ColorProperty(
+ private final transient NamedColorProperty SHORTCUT_BACKGROUND_MODIFIED_COLOR = new NamedColorProperty(
marktr("Shortcut Background: Modified"),
new Color(255, 255, 200));
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
index 74d16a2..5a0b1e1 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
@@ -483,7 +483,7 @@ public class TaggingPreset extends AbstractAction implements ActiveLayerChangeLi
return DIALOG_ANSWER_CANCEL;
} else if (p.getComponentCount() != 0 && (sel.isEmpty() || p.hasElements)) {
String title = trn("Change {0} object", "Change {0} objects", sel.size(), sel.size());
- if (sel.isEmpty()) {
+ if (!showNewRelation && sel.isEmpty()) {
if (originalSelectionEmpty) {
title = tr("Nothing selected!");
} else {
diff --git a/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java b/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
index 5951ae1..c7bfa06 100644
--- a/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
+++ b/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
@@ -19,6 +19,8 @@ import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateFormat;
import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider;
+import org.openstreetmap.josm.tools.Logging;
import org.openstreetmap.josm.tools.OsmUrlToBounds;
/**
@@ -98,15 +100,16 @@ public class BoundingBoxSelectionPanel extends JPanel {
public Bounds getBoundingBox() {
double minlon, minlat, maxlon, maxlat;
try {
- minlat = Double.parseDouble(tfLatLon[0].getText().trim());
- minlon = Double.parseDouble(tfLatLon[1].getText().trim());
- maxlat = Double.parseDouble(tfLatLon[2].getText().trim());
- maxlon = Double.parseDouble(tfLatLon[3].getText().trim());
+ minlat = JosmDecimalFormatSymbolsProvider.parseDouble(tfLatLon[0].getText().trim());
+ minlon = JosmDecimalFormatSymbolsProvider.parseDouble(tfLatLon[1].getText().trim());
+ maxlat = JosmDecimalFormatSymbolsProvider.parseDouble(tfLatLon[2].getText().trim());
+ maxlon = JosmDecimalFormatSymbolsProvider.parseDouble(tfLatLon[3].getText().trim());
} catch (NumberFormatException e) {
+ Logging.trace(e);
return null;
}
if (!LatLon.isValidLon(minlon) || !LatLon.isValidLon(maxlon)
- || !LatLon.isValidLat(minlat) || !LatLon.isValidLat(maxlat))
+ || !LatLon.isValidLat(minlat) || !LatLon.isValidLat(maxlat))
return null;
if (minlon > maxlon)
return null;
@@ -144,9 +147,10 @@ public class BoundingBoxSelectionPanel extends JPanel {
public void validate() {
double value = 0;
try {
- value = Double.parseDouble(getComponent().getText());
+ value = JosmDecimalFormatSymbolsProvider.parseDouble(getComponent().getText());
} catch (NumberFormatException ex) {
feedbackInvalid(tr("The string ''{0}'' is not a valid double value.", getComponent().getText()));
+ Logging.trace(ex);
return;
}
if (!LatLon.isValidLat(value)) {
@@ -159,8 +163,9 @@ public class BoundingBoxSelectionPanel extends JPanel {
@Override
public boolean isValid() {
try {
- return LatLon.isValidLat(Double.parseDouble(getComponent().getText()));
+ return LatLon.isValidLat(JosmDecimalFormatSymbolsProvider.parseDouble(getComponent().getText()));
} catch (NumberFormatException ex) {
+ Logging.trace(ex);
return false;
}
}
@@ -180,9 +185,10 @@ public class BoundingBoxSelectionPanel extends JPanel {
public void validate() {
double value = 0;
try {
- value = Double.parseDouble(getComponent().getText());
+ value = JosmDecimalFormatSymbolsProvider.parseDouble(getComponent().getText());
} catch (NumberFormatException ex) {
feedbackInvalid(tr("The string ''{0}'' is not a valid double value.", getComponent().getText()));
+ Logging.trace(ex);
return;
}
if (!LatLon.isValidLon(value)) {
@@ -195,8 +201,9 @@ public class BoundingBoxSelectionPanel extends JPanel {
@Override
public boolean isValid() {
try {
- return LatLon.isValidLon(Double.parseDouble(getComponent().getText()));
+ return LatLon.isValidLon(JosmDecimalFormatSymbolsProvider.parseDouble(getComponent().getText()));
} catch (NumberFormatException ex) {
+ Logging.trace(ex);
return false;
}
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/PopupMenuButton.java b/src/org/openstreetmap/josm/gui/widgets/PopupMenuButton.java
new file mode 100644
index 0000000..11471ae
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/widgets/PopupMenuButton.java
@@ -0,0 +1,152 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.widgets;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import java.awt.geom.Path2D;
+
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JPopupMenu;
+
+/**
+ * Button triggering the appearance of a JPopupMenu when activated.
+ * @since 12955
+ */
+public class PopupMenuButton extends JButton implements ActionListener {
+ private JPopupMenu menu;
+
+ /**
+ * @see JButton#JButton()
+ */
+ public PopupMenuButton() {
+ super();
+ this.initialize();
+ }
+
+ /**
+ * @see JButton#JButton(Action)
+ */
+ public PopupMenuButton(Action a) {
+ super(a);
+ this.initialize();
+ }
+
+ /**
+ * @see JButton#JButton(Icon)
+ */
+ public PopupMenuButton(Icon i) {
+ super(i);
+ this.initialize();
+ }
+
+ /**
+ * @see JButton#JButton(String)
+ */
+ public PopupMenuButton(String t) {
+ super(t);
+ this.initialize();
+ }
+
+ /**
+ * @see JButton#JButton(String, Icon)
+ */
+ public PopupMenuButton(String t, Icon i) {
+ super(t, i);
+ this.initialize();
+ }
+
+ /**
+ * Pass-through to {@link JButton#JButton()} allowing associated popup menu to be set
+ */
+ public PopupMenuButton(JPopupMenu m) {
+ super();
+ this.initialize(m);
+ }
+
+ /**
+ * Pass-through to {@link JButton#JButton(Action)} allowing associated popup menu to be set
+ */
+ public PopupMenuButton(Action a, JPopupMenu m) {
+ super(a);
+ this.initialize(m);
+ }
+
+ /**
+ * Pass-through to {@link JButton#JButton(Icon)} allowing associated popup menu to be set
+ */
+ public PopupMenuButton(Icon i, JPopupMenu m) {
+ super(i);
+ this.initialize(m);
+ }
+
+ /**
+ * Pass-through to {@link JButton#JButton(String)} allowing associated popup menu to be set
+ */
+ public PopupMenuButton(String t, JPopupMenu m) {
+ super(t);
+ this.initialize(m);
+ }
+
+ /**
+ * Pass-through to {@link JButton#JButton(String, Icon)} allowing associated popup menu to be set
+ */
+ public PopupMenuButton(String t, Icon i, JPopupMenu m) {
+ super(t, i);
+ this.initialize(m);
+ }
+
+ private void initialize(JPopupMenu m) {
+ this.menu = m;
+ this.initialize();
+ }
+
+ private void initialize() {
+ this.addActionListener(this);
+ }
+
+ /**
+ * Get the popup menu associated with this button
+ */
+ public JPopupMenu getPopupMenu() {
+ return this.menu;
+ }
+
+ /**
+ * Set the popup menu associated with this button
+ * @param m Menu to show when button is triggered
+ */
+ public void setPopupMenu(JPopupMenu m) {
+ this.menu = m;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ this.menu.show(this, 0, this.getHeight());
+ }
+
+ @Override
+ public void paint(Graphics g) {
+ super.paint(g);
+ Graphics2D g2d = (Graphics2D) g;
+
+ //
+ // paint small arrow in bottom right corner
+ //
+ Dimension size = this.getSize();
+
+ Path2D p = new Path2D.Float();
+ p.moveTo(size.getWidth() - 7, size.getHeight() - 4);
+ p.lineTo(size.getWidth() - 1, size.getHeight() - 4);
+ p.lineTo(size.getWidth() - 4, size.getHeight() - 1);
+ p.closePath();
+
+ g2d.setPaint(Color.BLACK);
+ g2d.fill(p);
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java b/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
index 72a6545..ceecc07 100644
--- a/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
+++ b/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
@@ -132,8 +132,8 @@ public class QuadStateCheckBox extends JCheckBox {
* Button model for the {@code QuadStateCheckBox}.
* It previously only implemented (and still could) the {@code ButtonModel} interface.
* But because of JDK-8182577 (Java 9 regression) it now extends {@code ToggleButtonModel} as a workaround.
- * The previous implementation can be restored after Java 10 migration.
- * See also https://bugs.openjdk.java.net/browse/JDK-8182695
+ * The previous implementation can be restored after Java 9 EOL (March 2018).
+ * See also https://bugs.openjdk.java.net/browse/JDK-8182695 - https://bugs.openjdk.java.net/browse/JDK-8182577
*/
private final class QuadStateDecorator extends ToggleButtonModel {
private final ButtonModel other;
diff --git a/src/org/openstreetmap/josm/io/OsmApi.java b/src/org/openstreetmap/josm/io/OsmApi.java
index e4f1b1f..43ed43b 100644
--- a/src/org/openstreetmap/josm/io/OsmApi.java
+++ b/src/org/openstreetmap/josm/io/OsmApi.java
@@ -8,6 +8,7 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringReader;
import java.io.StringWriter;
+import java.net.Authenticator.RequestorType;
import java.net.ConnectException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
@@ -32,6 +33,7 @@ import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.io.Capabilities.CapabilitiesParser;
+import org.openstreetmap.josm.io.auth.CredentialsManager;
import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.HttpClient;
@@ -703,10 +705,11 @@ public class OsmApi extends OsmConnection {
throw new ChangesetClosedException(errorBody, ChangesetClosedException.Source.UPLOAD_DATA);
else
throw new OsmApiException(retCode, errorHeader, errorBody);
+ case HttpURLConnection.HTTP_UNAUTHORIZED:
case HttpURLConnection.HTTP_FORBIDDEN:
- OsmApiException e = new OsmApiException(retCode, errorHeader, errorBody);
- e.setAccessedUrl(activeConnection.getURL().toString());
- throw e;
+ CredentialsManager.getInstance().purgeCredentialsCache(RequestorType.SERVER);
+ throw new OsmApiException(retCode, errorHeader, errorBody, activeConnection.getURL().toString(),
+ doAuthenticate ? retrieveBasicAuthorizationLogin(client) : null);
default:
throw new OsmApiException(retCode, errorHeader, errorBody);
}
diff --git a/src/org/openstreetmap/josm/io/OsmApiException.java b/src/org/openstreetmap/josm/io/OsmApiException.java
index 4a58f5f..43e801c 100644
--- a/src/org/openstreetmap/josm/io/OsmApiException.java
+++ b/src/org/openstreetmap/josm/io/OsmApiException.java
@@ -14,6 +14,7 @@ public class OsmApiException extends OsmTransferException {
private String errorHeader;
private String errorBody;
private String accessedUrl;
+ private String login;
/**
* Constructs an {@code OsmApiException} with the specified response code, error header and error body
@@ -22,13 +23,28 @@ public class OsmApiException extends OsmTransferException {
* @param errorHeader The error header, as transmitted in the {@code Error} field of the HTTP response header
* @param errorBody The error body, as transmitted in the HTTP response body
* @param accessedUrl The complete URL accessed when this error occured
- * @since 5584
+ * @param login the login used to connect to OSM API (can be null)
+ * @since 12992
*/
- public OsmApiException(int responseCode, String errorHeader, String errorBody, String accessedUrl) {
+ public OsmApiException(int responseCode, String errorHeader, String errorBody, String accessedUrl, String login) {
this.responseCode = responseCode;
this.errorHeader = errorHeader;
this.errorBody = errorBody;
this.accessedUrl = accessedUrl;
+ this.login = login;
+ }
+
+ /**
+ * Constructs an {@code OsmApiException} with the specified response code, error header and error body
+ * @param responseCode The HTTP response code replied by the OSM server.
+ * See {@link java.net.HttpURLConnection HttpURLConnection} for predefined HTTP response code values
+ * @param errorHeader The error header, as transmitted in the {@code Error} field of the HTTP response header
+ * @param errorBody The error body, as transmitted in the HTTP response body
+ * @param accessedUrl The complete URL accessed when this error occured
+ * @since 5584
+ */
+ public OsmApiException(int responseCode, String errorHeader, String errorBody, String accessedUrl) {
+ this(responseCode, errorHeader, errorBody, accessedUrl, null);
}
/**
@@ -198,4 +214,22 @@ public class OsmApiException extends OsmTransferException {
public String getAccessedUrl() {
return accessedUrl;
}
+
+ /**
+ * Sets the login used to connect to OSM API.
+ * @param login the login used to connect to OSM API
+ * @since 12992
+ */
+ public void setLogin(String login) {
+ this.login = login;
+ }
+
+ /**
+ * Replies the login used to connect to OSM API.
+ * @return the login used to connect to OSM API, or {@code null}
+ * @since 12992
+ */
+ public String getLogin() {
+ return login;
+ }
}
diff --git a/src/org/openstreetmap/josm/io/OsmConnection.java b/src/org/openstreetmap/josm/io/OsmConnection.java
index 205dce5..4cefa93 100644
--- a/src/org/openstreetmap/josm/io/OsmConnection.java
+++ b/src/org/openstreetmap/josm/io/OsmConnection.java
@@ -11,7 +11,6 @@ import java.nio.charset.StandardCharsets;
import java.util.Base64;
import java.util.Objects;
-import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.oauth.OAuthAccessTokenHolder;
import org.openstreetmap.josm.data.oauth.OAuthParameters;
import org.openstreetmap.josm.io.auth.CredentialsAgentException;
@@ -31,6 +30,9 @@ import oauth.signpost.exception.OAuthException;
* @author imi
*/
public class OsmConnection {
+
+ private static final String BASIC_AUTH = "Basic ";
+
protected boolean cancel;
protected HttpClient activeConnection;
protected OAuthParameters oauthParameters;
@@ -75,6 +77,30 @@ public class OsmConnection {
}
/**
+ * Retrieves login from basic authentication header, if set.
+ *
+ * @param con the connection
+ * @return login from basic authentication header, or {@code null}
+ * @throws OsmTransferException if something went wrong. Check for nested exceptions
+ * @since 12992
+ */
+ protected String retrieveBasicAuthorizationLogin(HttpClient con) throws OsmTransferException {
+ String auth = con.getRequestHeader("Authorization");
+ if (auth != null && auth.startsWith(BASIC_AUTH)) {
+ try {
+ String[] token = new String(Base64.getDecoder().decode(auth.substring(BASIC_AUTH.length())),
+ StandardCharsets.UTF_8).split(":");
+ if (token.length == 2) {
+ return token[0];
+ }
+ } catch (IllegalArgumentException e) {
+ Logging.error(e);
+ }
+ }
+ return null;
+ }
+
+ /**
* Adds an authentication header for basic authentication
*
* @param con the connection
@@ -98,7 +124,7 @@ public class OsmConnection {
String username = response.getUsername() == null ? "" : response.getUsername();
String password = response.getPassword() == null ? "" : String.valueOf(response.getPassword());
String token = username + ':' + password;
- con.setHeader("Authorization", "Basic "+Base64.getEncoder().encodeToString(token.getBytes(StandardCharsets.UTF_8)));
+ con.setHeader("Authorization", BASIC_AUTH + Base64.getEncoder().encodeToString(token.getBytes(StandardCharsets.UTF_8)));
}
}
}
@@ -113,7 +139,7 @@ public class OsmConnection {
*/
protected void addOAuthAuthorizationHeader(HttpClient connection) throws OsmTransferException {
if (oauthParameters == null) {
- oauthParameters = OAuthParameters.createFromPreferences(Main.pref);
+ oauthParameters = OAuthParameters.createFromApiUrl(OsmApi.getOsmApi().getServerUrl());
}
OAuthConsumer consumer = oauthParameters.buildConsumer();
OAuthAccessTokenHolder holder = OAuthAccessTokenHolder.getInstance();
@@ -145,7 +171,7 @@ public class OsmConnection {
}
fetcher.obtainAccessToken(apiUrl);
OAuthAccessTokenHolder.getInstance().setSaveToPreferences(true);
- OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManager.getInstance());
+ OAuthAccessTokenHolder.getInstance().save(CredentialsManager.getInstance());
} catch (MalformedURLException | InterruptedException | InvocationTargetException e) {
throw new MissingOAuthAccessTokenException(e);
}
diff --git a/src/org/openstreetmap/josm/io/OsmServerReader.java b/src/org/openstreetmap/josm/io/OsmServerReader.java
index 37e8e46..d47ee55 100644
--- a/src/org/openstreetmap/josm/io/OsmServerReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerReader.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.IOException;
import java.io.InputStream;
+import java.net.Authenticator.RequestorType;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
@@ -194,8 +195,10 @@ public abstract class OsmServerReader extends OsmConnection {
throw ote;
}
try {
- if (response.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED)
+ if (response.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED) {
+ CredentialsManager.getInstance().purgeCredentialsCache(RequestorType.SERVER);
throw new OsmApiException(HttpURLConnection.HTTP_UNAUTHORIZED, null, null);
+ }
if (response.getResponseCode() == HttpURLConnection.HTTP_PROXY_AUTH)
throw new OsmTransferCanceledException("Proxy Authentication Required");
diff --git a/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java b/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java
index 3e40993..3e62cdf 100644
--- a/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java
+++ b/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java
@@ -61,10 +61,8 @@ public abstract class AbstractCredentialsAgent implements CredentialsAgent {
final CredentialsAgentResponse response = new CredentialsAgentResponse();
/*
- * Last request was successful and there was no credentials stored
- * in file (or only the username is stored).
- * -> Try to recall credentials that have been entered
- * manually in this session.
+ * Last request was successful and there was no credentials stored in file (or only the username is stored).
+ * -> Try to recall credentials that have been entered manually in this session.
*/
if (!noSuccessWithLastResponse && memoryCredentialsCache.containsKey(requestorType) &&
(credentials == null || credentials.getPassword() == null || credentials.getPassword().length == 0)) {
@@ -88,18 +86,12 @@ public abstract class AbstractCredentialsAgent implements CredentialsAgent {
response.getUsername(),
response.getPassword()
));
- /*
- * User decides not to save credentials to file. Keep it
- * in memory so we don't have to ask over and over again.
- */
} else {
- PasswordAuthentication pa = new PasswordAuthentication(response.getUsername(), response.getPassword());
- memoryCredentialsCache.put(requestorType, pa);
+ // User decides not to save credentials to file. Keep it in memory so we don't have to ask over and over again.
+ memoryCredentialsCache.put(requestorType, new PasswordAuthentication(response.getUsername(), response.getPassword()));
}
- /*
- * We got it from file.
- */
} else {
+ // We got it from file.
response.setUsername(username);
response.setPassword(password.toCharArray());
response.setCanceled(false);
@@ -107,6 +99,11 @@ public abstract class AbstractCredentialsAgent implements CredentialsAgent {
return response;
}
+ @Override
+ public final void purgeCredentialsCache(RequestorType requestorType) {
+ memoryCredentialsCache.remove(requestorType);
+ }
+
/**
* Provide the text for a checkbox that offers to save the
* username and password that has been entered by the user.
diff --git a/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java b/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java
index cd3e1ea..8dd6a3e 100644
--- a/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java
+++ b/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java
@@ -73,6 +73,14 @@ public interface CredentialsAgent {
void storeOAuthAccessToken(OAuthToken accessToken) throws CredentialsAgentException;
/**
+ * Purges the internal credentials cache for the given requestor type.
+ * @param requestorType the type of service.
+ * {@link RequestorType#SERVER} for the OSM API server, {@link RequestorType#PROXY} for a proxy server
+ * @since 12992
+ */
+ void purgeCredentialsCache(RequestorType requestorType);
+
+ /**
* Provide a Panel that is shown below the API password / username fields
* in the JOSM Preferences. (E.g. a warning that password is saved unencrypted.)
* @return Panel
diff --git a/src/org/openstreetmap/josm/io/auth/CredentialsManager.java b/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
index 19edc63..4ed77be 100644
--- a/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
+++ b/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
@@ -42,8 +42,15 @@ public class CredentialsManager implements CredentialsAgent {
private static CredentialsAgentFactory agentFactory;
+ /**
+ * Credentials agent factory.
+ */
@FunctionalInterface
public interface CredentialsAgentFactory {
+ /**
+ * Returns the credentials agent instance.
+ * @return the credentials agent instance
+ */
CredentialsAgent getCredentialsAgent();
}
@@ -147,4 +154,9 @@ public class CredentialsManager implements CredentialsAgent {
public Component getPreferencesDecorationPanel() {
return delegate.getPreferencesDecorationPanel();
}
+
+ @Override
+ public void purgeCredentialsCache(RequestorType requestorType) {
+ delegate.purgeCredentialsCache(requestorType);
+ }
}
diff --git a/src/org/openstreetmap/josm/io/protocols/data/DataConnection.java b/src/org/openstreetmap/josm/io/protocols/data/DataConnection.java
index 2702c6f..b4d650c 100644
--- a/src/org/openstreetmap/josm/io/protocols/data/DataConnection.java
+++ b/src/org/openstreetmap/josm/io/protocols/data/DataConnection.java
@@ -8,6 +8,8 @@ import java.net.URL;
import java.net.URLConnection;
import java.util.Base64;
+import org.openstreetmap.josm.tools.bugreport.BugReport;
+
/**
* Connection for "data:" protocol allowing to read inlined base64 images.
* <p>
@@ -31,6 +33,10 @@ public class DataConnection extends URLConnection {
@Override
public InputStream getInputStream() throws IOException {
- return new ByteArrayInputStream(Base64.getDecoder().decode(url.toString().replaceFirst("^.*;base64,", "")));
+ try {
+ return new ByteArrayInputStream(Base64.getDecoder().decode(url.toString().replaceFirst("^.*;base64,", "")));
+ } catch (IllegalArgumentException e) {
+ throw BugReport.intercept(e).put("url", url);
+ }
}
}
diff --git a/src/org/openstreetmap/josm/plugins/Plugin.java b/src/org/openstreetmap/josm/plugins/Plugin.java
index 9bd44ab..b6d0e53 100644
--- a/src/org/openstreetmap/josm/plugins/Plugin.java
+++ b/src/org/openstreetmap/josm/plugins/Plugin.java
@@ -1,6 +1,8 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.plugins;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -18,6 +20,9 @@ import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.MapFrameListener;
import org.openstreetmap.josm.gui.download.DownloadSelection;
import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.spi.preferences.IBaseDirectories;
+import org.openstreetmap.josm.tools.Logging;
import org.openstreetmap.josm.tools.Utils;
/**
@@ -52,6 +57,50 @@ public abstract class Plugin implements MapFrameListener {
*/
private PluginInformation info;
+ private final IBaseDirectories pluginBaseDirectories = new PluginBaseDirectories();
+
+ private class PluginBaseDirectories implements IBaseDirectories {
+ private File preferencesDir;
+ private File cacheDir;
+ private File userdataDir;
+
+ @Override
+ public File getPreferencesDirectory(boolean createIfMissing) {
+ if (preferencesDir == null) {
+ preferencesDir = Config.getDirs().getPreferencesDirectory(createIfMissing).toPath()
+ .resolve("plugins").resolve(info.name).toFile();
+ }
+ if (createIfMissing && !preferencesDir.exists() && !preferencesDir.mkdirs()) {
+ Logging.error(tr("Failed to create missing plugin preferences directory: {0}", preferencesDir.getAbsoluteFile()));
+ }
+ return preferencesDir;
+ }
+
+ @Override
+ public File getUserDataDirectory(boolean createIfMissing) {
+ if (userdataDir == null) {
+ userdataDir = Config.getDirs().getUserDataDirectory(createIfMissing).toPath()
+ .resolve("plugins").resolve(info.name).toFile();
+ }
+ if (createIfMissing && !userdataDir.exists() && !userdataDir.mkdirs()) {
+ Logging.error(tr("Failed to create missing plugin user data directory: {0}", userdataDir.getAbsoluteFile()));
+ }
+ return userdataDir;
+ }
+
+ @Override
+ public File getCacheDirectory(boolean createIfMissing) {
+ if (cacheDir == null) {
+ cacheDir = Config.getDirs().getCacheDirectory(createIfMissing).toPath()
+ .resolve("plugins").resolve(info.name).toFile();
+ }
+ if (createIfMissing && !cacheDir.exists() && !cacheDir.mkdirs()) {
+ Logging.error(tr("Failed to create missing plugin cache directory: {0}", cacheDir.getAbsoluteFile()));
+ }
+ return cacheDir;
+ }
+ }
+
/**
* Creates the plugin
*
@@ -80,8 +129,21 @@ public abstract class Plugin implements MapFrameListener {
}
/**
+ * Get the directories where this plugin can store various files.
+ * @return the directories where this plugin can store files
+ * @since 13007
+ */
+ public IBaseDirectories getPluginDirs() {
+ return pluginBaseDirectories;
+ }
+
+ /**
* @return The directory for the plugin to store all kind of stuff.
+ * @deprecated (since 13007) to get the same directory as this method, use {@code getPluginDirs().getUserDataDirectory(false)}.
+ * However, for files that can be characterized as cache or preferences, you are encouraged to use the appropriate
+ * {@link IBaseDirectories} method from {@link #getPluginDirs()}.
*/
+ @Deprecated
public String getPluginDir() {
return new File(Main.pref.getPluginsDirectory(), info.name).getPath();
}
diff --git a/src/org/openstreetmap/josm/plugins/PluginHandler.java b/src/org/openstreetmap/josm/plugins/PluginHandler.java
index 55c8131..30b7805 100644
--- a/src/org/openstreetmap/josm/plugins/PluginHandler.java
+++ b/src/org/openstreetmap/josm/plugins/PluginHandler.java
@@ -1419,14 +1419,26 @@ public final class PluginHandler {
*/
private static PluginProxy getPluginCausingException(Throwable ex) {
PluginProxy err = null;
- StackTraceElement[] stack = ex.getStackTrace();
+ List<StackTraceElement> stack = new ArrayList<>();
+ Set<Throwable> seen = new HashSet<>();
+ Throwable current = ex;
+ while (current != null) {
+ seen.add(current);
+ stack.addAll(Arrays.asList(current.getStackTrace()));
+ Throwable cause = current.getCause();
+ if (cause != null && seen.contains(cause)) {
+ break; // circular refernce
+ }
+ current = cause;
+ }
+
// remember the error position, as multiple plugins may be involved, we search the topmost one
- int pos = stack.length;
+ int pos = stack.size();
for (PluginProxy p : pluginList) {
String baseClass = p.getPluginInformation().className;
baseClass = baseClass.substring(0, baseClass.lastIndexOf('.'));
for (int elpos = 0; elpos < pos; ++elpos) {
- if (stack[elpos].getClassName().startsWith(baseClass)) {
+ if (stack.get(elpos).getClassName().startsWith(baseClass)) {
pos = elpos;
err = p;
}
diff --git a/src/org/openstreetmap/josm/spi/preferences/IPreferences.java b/src/org/openstreetmap/josm/spi/preferences/IPreferences.java
index 4f96adb..3a4f3b0 100644
--- a/src/org/openstreetmap/josm/spi/preferences/IPreferences.java
+++ b/src/org/openstreetmap/josm/spi/preferences/IPreferences.java
@@ -4,6 +4,7 @@ package org.openstreetmap.josm.spi.preferences;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* Interface for preference handling.
@@ -233,4 +234,9 @@ public interface IPreferences {
*/
boolean putListOfMaps(String key, List<Map<String, String>> value);
+ /**
+ * Get the set of all keys that are mapped to a value in this preferences.
+ * @return the set of all keys
+ */
+ Set<String> getKeySet();
}
diff --git a/src/org/openstreetmap/josm/spi/preferences/ListSetting.java b/src/org/openstreetmap/josm/spi/preferences/ListSetting.java
index 0d655b8..e355b1d 100644
--- a/src/org/openstreetmap/josm/spi/preferences/ListSetting.java
+++ b/src/org/openstreetmap/josm/spi/preferences/ListSetting.java
@@ -36,7 +36,7 @@ public class ListSetting extends AbstractSetting<List<String>> {
private void consistencyTest() {
if (value != null && value.contains(null))
- throw new IllegalArgumentException("Error: Null as list element in preference setting");
+ throw new IllegalArgumentException("Error: Null as list element in preference setting: " + value);
}
@Override
diff --git a/src/org/openstreetmap/josm/spi/preferences/MemoryPreferences.java b/src/org/openstreetmap/josm/spi/preferences/MemoryPreferences.java
index cee4d37..572e042 100644
--- a/src/org/openstreetmap/josm/spi/preferences/MemoryPreferences.java
+++ b/src/org/openstreetmap/josm/spi/preferences/MemoryPreferences.java
@@ -1,9 +1,11 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.spi.preferences;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
+import java.util.Set;
/**
* Preferences implementation that keeps all settings in memory.
@@ -40,6 +42,11 @@ public class MemoryPreferences extends AbstractPreferences {
}
@Override
+ public Set<String> getKeySet() {
+ return Collections.unmodifiableSet(settings.keySet());
+ }
+
+ @Override
public void addPreferenceChangeListener(PreferenceChangedListener listener) {
// do nothing
}
diff --git a/src/org/openstreetmap/josm/tools/ExceptionUtil.java b/src/org/openstreetmap/josm/tools/ExceptionUtil.java
index 866a10c..ac04691 100644
--- a/src/org/openstreetmap/josm/tools/ExceptionUtil.java
+++ b/src/org/openstreetmap/josm/tools/ExceptionUtil.java
@@ -265,7 +265,7 @@ public final class ExceptionUtil {
+ "Authentication at the OSM server with the username ''{0}'' failed.<br>"
+ "Please check the username and the password in the JOSM preferences."
+ "</html>",
- CredentialsManager.getInstance().getUsername()
+ e.getLogin() != null ? e.getLogin() : CredentialsManager.getInstance().getUsername()
);
}
diff --git a/src/org/openstreetmap/josm/tools/ExifReader.java b/src/org/openstreetmap/josm/tools/ExifReader.java
index 71a932e..864d531 100644
--- a/src/org/openstreetmap/josm/tools/ExifReader.java
+++ b/src/org/openstreetmap/josm/tools/ExifReader.java
@@ -230,7 +230,8 @@ public final class ExifReader {
value = Double.isNaN(deg) ? 0 : deg + (Double.isNaN(min) ? 0 : (min / 60)) + (Double.isNaN(sec) ? 0 : (sec / 3600));
- if (dirGps.getString(gpsTagRef).charAt(0) == cRef) {
+ String s = dirGps.getString(gpsTagRef);
+ if (s != null && s.charAt(0) == cRef) {
value = -value;
}
} else {
diff --git a/src/org/openstreetmap/josm/tools/I18n.java b/src/org/openstreetmap/josm/tools/I18n.java
index da85a5d..167bb38 100644
--- a/src/org/openstreetmap/josm/tools/I18n.java
+++ b/src/org/openstreetmap/josm/tools/I18n.java
@@ -89,6 +89,50 @@ public final class I18n {
private static volatile Map<String, String> strings;
private static volatile Map<String, String[]> pstrings;
private static Map<String, PluralMode> languages = new HashMap<>();
+ static {
+ //languages.put("ar", PluralMode.MODE_AR);
+ languages.put("ast", PluralMode.MODE_NOTONE);
+ languages.put("bg", PluralMode.MODE_NOTONE);
+ languages.put("be", PluralMode.MODE_RU);
+ languages.put("ca", PluralMode.MODE_NOTONE);
+ languages.put("ca at valencia", PluralMode.MODE_NOTONE);
+ languages.put("cs", PluralMode.MODE_CS);
+ languages.put("da", PluralMode.MODE_NOTONE);
+ languages.put("de", PluralMode.MODE_NOTONE);
+ languages.put("el", PluralMode.MODE_NOTONE);
+ languages.put("en_AU", PluralMode.MODE_NOTONE);
+ languages.put("en_GB", PluralMode.MODE_NOTONE);
+ languages.put("es", PluralMode.MODE_NOTONE);
+ languages.put("et", PluralMode.MODE_NOTONE);
+ //languages.put("eu", PluralMode.MODE_NOTONE);
+ languages.put("fi", PluralMode.MODE_NOTONE);
+ languages.put("fr", PluralMode.MODE_GREATERONE);
+ languages.put("gl", PluralMode.MODE_NOTONE);
+ //languages.put("he", PluralMode.MODE_NOTONE);
+ languages.put("hu", PluralMode.MODE_NOTONE);
+ languages.put("id", PluralMode.MODE_NONE);
+ //languages.put("is", PluralMode.MODE_NOTONE);
+ languages.put("it", PluralMode.MODE_NOTONE);
+ languages.put("ja", PluralMode.MODE_NONE);
+ // fully supported only with Java 8 and later (needs CLDR)
+ languages.put("km", PluralMode.MODE_NONE);
+ languages.put("lt", PluralMode.MODE_LT);
+ languages.put("nb", PluralMode.MODE_NOTONE);
+ languages.put("nl", PluralMode.MODE_NOTONE);
+ languages.put("pl", PluralMode.MODE_PL);
+ languages.put("pt", PluralMode.MODE_NOTONE);
+ languages.put("pt_BR", PluralMode.MODE_GREATERONE);
+ //languages.put("ro", PluralMode.MODE_RO);
+ languages.put("ru", PluralMode.MODE_RU);
+ languages.put("sk", PluralMode.MODE_SK);
+ //languages.put("sl", PluralMode.MODE_SL);
+ languages.put("sv", PluralMode.MODE_NOTONE);
+ //languages.put("tr", PluralMode.MODE_NONE);
+ languages.put("uk", PluralMode.MODE_RU);
+ languages.put("vi", PluralMode.MODE_NONE);
+ languages.put("zh_CN", PluralMode.MODE_NONE);
+ languages.put("zh_TW", PluralMode.MODE_NONE);
+ }
/**
* Translates some text for the current locale.
@@ -300,58 +344,20 @@ public final class I18n {
return languages.containsKey(code);
}
+ static void setupJavaLocaleProviders() {
+ // Look up SPI providers first (for JosmDecimalFormatSymbolsProvider).
+ // Enable CLDR locale provider on Java 8 to get additional languages, such as Khmer.
+ // http://docs.oracle.com/javase/8/docs/technotes/guides/intl/enhancements.8.html#cldr
+ // FIXME: This must be updated after we switch to Java 9.
+ // See https://docs.oracle.com/javase/9/docs/api/java/util/spi/LocaleServiceProvider.html
+ System.setProperty("java.locale.providers", "SPI,JRE,CLDR"); // Don't call Utils.updateSystemProperty to avoid spurious log at startup
+ }
+
/**
* I18n initialization.
*/
public static void init() {
- // Enable CLDR locale provider on Java 8 to get additional languages, such as Khmer.
- // http://docs.oracle.com/javase/8/docs/technotes/guides/intl/enhancements.8.html#cldr
- // FIXME: This can be removed after we switch to a minimal version of Java that enables CLDR by default
- // or includes all languages we need in the JRE. See http://openjdk.java.net/jeps/252 for Java 9
- System.setProperty("java.locale.providers", "JRE,CLDR"); // Don't call Utils.updateSystemProperty to avoid spurious log at startup
-
- //languages.put("ar", PluralMode.MODE_AR);
- languages.put("ast", PluralMode.MODE_NOTONE);
- languages.put("bg", PluralMode.MODE_NOTONE);
- languages.put("be", PluralMode.MODE_RU);
- languages.put("ca", PluralMode.MODE_NOTONE);
- languages.put("ca at valencia", PluralMode.MODE_NOTONE);
- languages.put("cs", PluralMode.MODE_CS);
- languages.put("da", PluralMode.MODE_NOTONE);
- languages.put("de", PluralMode.MODE_NOTONE);
- languages.put("el", PluralMode.MODE_NOTONE);
- languages.put("en_AU", PluralMode.MODE_NOTONE);
- languages.put("en_GB", PluralMode.MODE_NOTONE);
- languages.put("es", PluralMode.MODE_NOTONE);
- languages.put("et", PluralMode.MODE_NOTONE);
- //languages.put("eu", PluralMode.MODE_NOTONE);
- languages.put("fi", PluralMode.MODE_NOTONE);
- languages.put("fr", PluralMode.MODE_GREATERONE);
- languages.put("gl", PluralMode.MODE_NOTONE);
- //languages.put("he", PluralMode.MODE_NOTONE);
- languages.put("hu", PluralMode.MODE_NOTONE);
- languages.put("id", PluralMode.MODE_NONE);
- //languages.put("is", PluralMode.MODE_NOTONE);
- languages.put("it", PluralMode.MODE_NOTONE);
- languages.put("ja", PluralMode.MODE_NONE);
- // fully supported only with Java 8 and later (needs CLDR)
- languages.put("km", PluralMode.MODE_NONE);
- languages.put("lt", PluralMode.MODE_LT);
- languages.put("nb", PluralMode.MODE_NOTONE);
- languages.put("nl", PluralMode.MODE_NOTONE);
- languages.put("pl", PluralMode.MODE_PL);
- languages.put("pt", PluralMode.MODE_NOTONE);
- languages.put("pt_BR", PluralMode.MODE_GREATERONE);
- //languages.put("ro", PluralMode.MODE_RO);
- languages.put("ru", PluralMode.MODE_RU);
- languages.put("sk", PluralMode.MODE_SK);
- //languages.put("sl", PluralMode.MODE_SL);
- languages.put("sv", PluralMode.MODE_NOTONE);
- //languages.put("tr", PluralMode.MODE_NONE);
- languages.put("uk", PluralMode.MODE_RU);
- languages.put("vi", PluralMode.MODE_NONE);
- languages.put("zh_CN", PluralMode.MODE_NONE);
- languages.put("zh_TW", PluralMode.MODE_NONE);
+ setupJavaLocaleProviders();
/* try initial language settings, may be changed later again */
if (!load(LanguageInfo.getJOSMLocaleCode())) {
diff --git a/src/org/openstreetmap/josm/tools/ImageProvider.java b/src/org/openstreetmap/josm/tools/ImageProvider.java
index 6cc4243..eacdefb 100644
--- a/src/org/openstreetmap/josm/tools/ImageProvider.java
+++ b/src/org/openstreetmap/josm/tools/ImageProvider.java
@@ -976,15 +976,15 @@ public class ImageProvider {
String base64 = m.group(2);
String data = m.group(3);
byte[] bytes;
- if (";base64".equals(base64)) {
- bytes = Base64.getDecoder().decode(data);
- } else {
- try {
+ try {
+ if (";base64".equals(base64)) {
+ bytes = Base64.getDecoder().decode(data);
+ } else {
bytes = Utils.decodeUrl(data).getBytes(StandardCharsets.UTF_8);
- } catch (IllegalArgumentException ex) {
- Logging.log(Logging.LEVEL_WARN, "Unable to decode URL data part: "+ex.getMessage() + " (" + data + ')', ex);
- return null;
}
+ } catch (IllegalArgumentException ex) {
+ Logging.log(Logging.LEVEL_WARN, "Unable to decode URL data part: "+ex.getMessage() + " (" + data + ')', ex);
+ return null;
}
String mediatype = m.group(1);
if ("image/svg+xml".equals(mediatype)) {
@@ -1393,6 +1393,54 @@ public class ImageProvider {
}
/**
+ * Returns a scaled instance of the provided {@code BufferedImage}.
+ * This method will use a multi-step scaling technique that provides higher quality than the usual
+ * one-step technique (only useful in downscaling cases, where {@code targetWidth} or {@code targetHeight} is
+ * smaller than the original dimensions, and generally only when the {@code BILINEAR} hint is specified).
+ *
+ * From https://community.oracle.com/docs/DOC-983611: "The Perils of Image.getScaledInstance()"
+ *
+ * @param img the original image to be scaled
+ * @param targetWidth the desired width of the scaled instance, in pixels
+ * @param targetHeight the desired height of the scaled instance, in pixels
+ * @param hint one of the rendering hints that corresponds to
+ * {@code RenderingHints.KEY_INTERPOLATION} (e.g.
+ * {@code RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR},
+ * {@code RenderingHints.VALUE_INTERPOLATION_BILINEAR},
+ * {@code RenderingHints.VALUE_INTERPOLATION_BICUBIC})
+ * @return a scaled version of the original {@code BufferedImage}
+ * @since 13038
+ */
+ public static BufferedImage createScaledImage(BufferedImage img, int targetWidth, int targetHeight, Object hint) {
+ int type = (img.getTransparency() == Transparency.OPAQUE) ? BufferedImage.TYPE_INT_RGB : BufferedImage.TYPE_INT_ARGB;
+ // start with original size, then scale down in multiple passes with drawImage() until the target size is reached
+ BufferedImage ret = img;
+ int w = img.getWidth(null);
+ int h = img.getHeight(null);
+ do {
+ if (w > targetWidth) {
+ w /= 2;
+ if (w < targetWidth) {
+ w = targetWidth;
+ }
+ }
+ if (h > targetHeight) {
+ h /= 2;
+ if (h < targetHeight) {
+ h = targetHeight;
+ }
+ }
+ BufferedImage tmp = new BufferedImage(w, h, type);
+ Graphics2D g2 = tmp.createGraphics();
+ g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION, hint);
+ g2.drawImage(ret, 0, 0, w, h, null);
+ g2.dispose();
+ ret = tmp;
+ } while (w != targetWidth || h != targetHeight);
+ return ret;
+ }
+
+ /**
* Replies the icon for an OSM primitive type
* @param type the type
* @return the icon
@@ -1909,4 +1957,22 @@ public class ImageProvider {
IMAGE_FETCHER.shutdown();
}
}
+
+ /**
+ * Converts an {@link Image} to a {@link BufferedImage} instance.
+ * @param image image to convert
+ * @return a {@code BufferedImage} instance for the given {@code Image}.
+ * @since 13038
+ */
+ public static BufferedImage toBufferedImage(Image image) {
+ if (image instanceof BufferedImage) {
+ return (BufferedImage) image;
+ } else {
+ BufferedImage buffImage = new BufferedImage(image.getWidth(null), image.getHeight(null), BufferedImage.TYPE_INT_ARGB);
+ Graphics2D g2 = buffImage.createGraphics();
+ g2.drawImage(image, 0, 0, null);
+ g2.dispose();
+ return buffImage;
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/tools/JosmDecimalFormatSymbolsProvider.java b/src/org/openstreetmap/josm/tools/JosmDecimalFormatSymbolsProvider.java
new file mode 100644
index 0000000..c7b2337
--- /dev/null
+++ b/src/org/openstreetmap/josm/tools/JosmDecimalFormatSymbolsProvider.java
@@ -0,0 +1,53 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
+import java.text.spi.DecimalFormatSymbolsProvider;
+import java.util.Locale;
+
+/**
+ * JOSM implementation of the {@link java.text.DecimalFormatSymbols DecimalFormatSymbols} class,
+ * consistent with ISO 80000-1.
+ * This class will only be used with Java 9 and later runtimes, as Java 8 implementation relies
+ * on Java Extension Mechanism only, while Java 9 supports application classpath.
+ * See {@link java.util.spi.LocaleServiceProvider LocaleServiceProvider} javadoc for more details.
+ * @since 12931
+ */
+public class JosmDecimalFormatSymbolsProvider extends DecimalFormatSymbolsProvider {
+
+ @Override
+ public DecimalFormatSymbols getInstance(Locale locale) {
+ DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
+ // Override digit group separator to be consistent across languages with ISO 80000-1, chapter 7.3.1
+ symbols.setGroupingSeparator('\u202F'); // U+202F: NARROW NO-BREAK SPACE
+ return symbols;
+ }
+
+ @Override
+ public Locale[] getAvailableLocales() {
+ return I18n.getAvailableTranslations();
+ }
+
+ /**
+ * Returns a new {@code double} initialized to the value represented by the specified {@code String},
+ * allowing both dot and comma decimal separators.
+ *
+ * @param s the string to be parsed.
+ * @return the {@code double} value represented by the string argument.
+ * @throws NullPointerException if the string is null
+ * @throws NumberFormatException if the string does not contain a parsable {@code double}.
+ * @see Double#parseDouble(String)
+ * @since 13050
+ */
+ public static double parseDouble(String s) throws NumberFormatException {
+ String text = s;
+ NumberFormat format = DecimalFormat.getInstance();
+ if (format instanceof DecimalFormat) {
+ char decimalSeparator = ((DecimalFormat) format).getDecimalFormatSymbols().getDecimalSeparator();
+ text = text.replace('.', decimalSeparator).replace(',', decimalSeparator);
+ }
+ return Double.parseDouble(text);
+ }
+}
diff --git a/src/org/openstreetmap/josm/tools/Logging.java b/src/org/openstreetmap/josm/tools/Logging.java
index 00a53f0..1018d74 100644
--- a/src/org/openstreetmap/josm/tools/Logging.java
+++ b/src/org/openstreetmap/josm/tools/Logging.java
@@ -51,6 +51,10 @@ public final class Logging {
private static final RememberWarningHandler WARNINGS = new RememberWarningHandler();
static {
+ // We need to be sure java.locale.providers system property is initialized by JOSM, not by JRE
+ // The call to ConsoleHandler constructor makes the JRE access this property by side effect
+ I18n.setupJavaLocaleProviders();
+
LOGGER.setLevel(Level.ALL);
LOGGER.setUseParentHandlers(false);
diff --git a/src/org/openstreetmap/josm/tools/Utils.java b/src/org/openstreetmap/josm/tools/Utils.java
index 44732d4..cf0c7f0 100644
--- a/src/org/openstreetmap/josm/tools/Utils.java
+++ b/src/org/openstreetmap/josm/tools/Utils.java
@@ -44,6 +44,7 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
+import java.util.Optional;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor;
import java.util.concurrent.ForkJoinPool;
@@ -1730,4 +1731,21 @@ public final class Utils {
consumer.accept((T) o);
}
}
+
+ /**
+ * Helper method to replace the "<code>instanceof</code>-check and cast" pattern.
+ *
+ * @param <T> the type for the instanceof check and cast
+ * @param o the object to check and cast
+ * @param klass the class T
+ * @return {@link Optional} containing the result of the cast, if it is possible, an empty
+ * Optional otherwise
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> Optional<T> instanceOfAndCast(Object o, Class<T> klass) {
+ if (klass.isInstance(o))
+ return Optional.of((T) o);
+ return Optional.empty();
+ }
+
}
diff --git a/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java b/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java
index dc9836c..f0b47ac 100644
--- a/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java
+++ b/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java
@@ -1,15 +1,26 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools.template_engine;
+/**
+ * {@link TemplateEntry} that concatenates several templates.
+ */
public final class CompoundTemplateEntry implements TemplateEntry {
- public static TemplateEntry fromArray(TemplateEntry... entry) {
- if (entry.length == 0)
+ /**
+ * Factory method to concatenate several {@code TemplateEntry}s.
+ *
+ * If the number of entries is 0 or 1, the result may not be a {@code CompoundTemplateEntry},
+ * but optimized to a static text or the single entry itself.
+ * @param entries the {@code TemplateEntry}s to concatenate
+ * @return a {@link TemplateEntry} that concatenates all the entries
+ */
+ public static TemplateEntry fromArray(TemplateEntry... entries) {
+ if (entries.length == 0)
return new StaticText("");
- else if (entry.length == 1)
- return entry[0];
+ else if (entries.length == 1)
+ return entries[0];
else
- return new CompoundTemplateEntry(entry);
+ return new CompoundTemplateEntry(entries);
}
private CompoundTemplateEntry(TemplateEntry... entries) {
diff --git a/src/org/openstreetmap/josm/tools/template_engine/Condition.java b/src/org/openstreetmap/josm/tools/template_engine/Condition.java
index 3db978a..98efa34 100644
--- a/src/org/openstreetmap/josm/tools/template_engine/Condition.java
+++ b/src/org/openstreetmap/josm/tools/template_engine/Condition.java
@@ -2,12 +2,30 @@
package org.openstreetmap.josm.tools.template_engine;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
+/**
+ * {@link TemplateEntry} that applies other templates based on conditions.
+ * <p>
+ * It goes through a number of template entries and executes the first one that is valid.
+ */
public class Condition implements TemplateEntry {
- private final List<TemplateEntry> entries = new ArrayList<>();
+ private final List<TemplateEntry> entries;
+ public Condition(Collection<TemplateEntry> entries) {
+ this.entries = new ArrayList<>(entries);
+ }
+
+ public Condition() {
+ this.entries = new ArrayList<>();
+ }
+
+ /**
+ * @deprecated (since 13003) use constructor {@link #Condition(java.util.Collection)} to set the entries
+ */
+ @Deprecated
public List<TemplateEntry> getEntries() {
return entries;
}
diff --git a/src/org/openstreetmap/josm/tools/template_engine/ParseError.java b/src/org/openstreetmap/josm/tools/template_engine/ParseError.java
index 466b15c..8ed902b 100644
--- a/src/org/openstreetmap/josm/tools/template_engine/ParseError.java
+++ b/src/org/openstreetmap/josm/tools/template_engine/ParseError.java
@@ -7,6 +7,11 @@ import org.openstreetmap.josm.data.osm.search.SearchParseError;
import org.openstreetmap.josm.tools.template_engine.Tokenizer.Token;
import org.openstreetmap.josm.tools.template_engine.Tokenizer.TokenType;
+/**
+ * Exception thrown in case of an error during template parsing.
+ *
+ * Usually caused by invalid user input.
+ */
public class ParseError extends Exception {
private final transient Token unexpectedToken;
diff --git a/src/org/openstreetmap/josm/tools/template_engine/SearchExpressionCondition.java b/src/org/openstreetmap/josm/tools/template_engine/SearchExpressionCondition.java
index e4d28ba..51b834e 100644
--- a/src/org/openstreetmap/josm/tools/template_engine/SearchExpressionCondition.java
+++ b/src/org/openstreetmap/josm/tools/template_engine/SearchExpressionCondition.java
@@ -3,11 +3,20 @@ package org.openstreetmap.josm.tools.template_engine;
import org.openstreetmap.josm.data.osm.search.SearchCompiler.Match;
+/**
+ * Conditional {@link TemplateEntry} that executes another template in case a search expression applies
+ * to the given data provider.
+ */
public class SearchExpressionCondition implements TemplateEntry {
private final Match condition;
private final TemplateEntry text;
+ /**
+ * Creates a new {@link SearchExpressionCondition}.
+ * @param condition the match condition that is checked before applying the child template
+ * @param text the child template to execute in case the condition is fulfilled
+ */
public SearchExpressionCondition(Match condition, TemplateEntry text) {
this.condition = condition;
this.text = text;
diff --git a/src/org/openstreetmap/josm/tools/template_engine/StaticText.java b/src/org/openstreetmap/josm/tools/template_engine/StaticText.java
index 62510a2..b42ca09 100644
--- a/src/org/openstreetmap/josm/tools/template_engine/StaticText.java
+++ b/src/org/openstreetmap/josm/tools/template_engine/StaticText.java
@@ -1,10 +1,19 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools.template_engine;
+/**
+ * {@link TemplateEntry} representing a static string.
+ * <p>
+ * When compiling the template result, the given string will simply be inserted at the current position.
+ */
public class StaticText implements TemplateEntry {
private final String staticText;
+ /**
+ * Create a new {@code StaticText}.
+ * @param staticText the text to insert verbatim
+ */
public StaticText(String staticText) {
this.staticText = staticText;
}
diff --git a/src/org/openstreetmap/josm/tools/template_engine/TemplateEngineDataProvider.java b/src/org/openstreetmap/josm/tools/template_engine/TemplateEngineDataProvider.java
index 2c3c3cd..b220dd1 100644
--- a/src/org/openstreetmap/josm/tools/template_engine/TemplateEngineDataProvider.java
+++ b/src/org/openstreetmap/josm/tools/template_engine/TemplateEngineDataProvider.java
@@ -5,10 +5,31 @@ import java.util.Collection;
import org.openstreetmap.josm.data.osm.search.SearchCompiler.Match;
+/**
+ * Interface for objects that can be used with a template to generate a string.
+ * <p>
+ * Provides the necessary information for the template to be applied.
+ */
public interface TemplateEngineDataProvider {
+ /**
+ * Get the collection of all keys that can be mapped to values.
+ * @return all keys that can be mapped to values
+ */
Collection<String> getTemplateKeys();
- Object getTemplateValue(String name, boolean special);
+ /**
+ * Map a key to a value given the properties of the object.
+ * @param key the key to map
+ * @param special if the key is a "special:*" keyword that is used
+ * to get certain information or automated behavior
+ * @return a value that the key is mapped to or "special" information in case {@code special} is true
+ */
+ Object getTemplateValue(String key, boolean special);
+ /**
+ * Check if a condition holds for the object represented by this {@link TemplateEngineDataProvider}.
+ * @param condition the condition to check (which is a search expression)
+ * @return true if the condition holds
+ */
boolean evaluateCondition(Match condition);
}
diff --git a/src/org/openstreetmap/josm/tools/template_engine/TemplateEntry.java b/src/org/openstreetmap/josm/tools/template_engine/TemplateEntry.java
index f2a4a6d..066f534 100644
--- a/src/org/openstreetmap/josm/tools/template_engine/TemplateEntry.java
+++ b/src/org/openstreetmap/josm/tools/template_engine/TemplateEntry.java
@@ -1,8 +1,27 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools.template_engine;
+/**
+ * Interface for one node in the abstract syntax tree that is the result of parsing a template
+ * string with {@link TemplateParser}.
+ *
+ * The node can either be branching (condition, context switch) or a leaf node (variable, static text).
+ * The root node, representing the entire template is also a {@code TemplateEntry}.
+ */
public interface TemplateEntry {
+ /**
+ * Execute this template by generating text for a given data provider.
+ * @param result the {@link StringBuilder} to append the text to
+ * @param dataProvider the data provider from which information should be compiled to a string
+ */
void appendText(StringBuilder result, TemplateEngineDataProvider dataProvider);
+ /**
+ * Check if this template is applicable to the given data provider.
+ *
+ * @param dataProvider the data provider to check
+ * @return true if all conditions are fulfilled to apply the template (for instance all
+ * required key=value mappings are present), false otherwise
+ */
boolean isValid(TemplateEngineDataProvider dataProvider);
}
diff --git a/src/org/openstreetmap/josm/tools/template_engine/TemplateParser.java b/src/org/openstreetmap/josm/tools/template_engine/TemplateParser.java
index 22cc365..11ad34d 100644
--- a/src/org/openstreetmap/josm/tools/template_engine/TemplateParser.java
+++ b/src/org/openstreetmap/josm/tools/template_engine/TemplateParser.java
@@ -25,7 +25,7 @@ public class TemplateParser {
/**
* Constructs a new {@code TemplateParser}.
- * @param template template to parse
+ * @param template template string to parse
*/
public TemplateParser(String template) {
this.tokenizer = new Tokenizer(template);
@@ -87,7 +87,7 @@ public class TemplateParser {
private TemplateEntry parseCondition() throws ParseError {
check(TokenType.CONDITION_START);
- Condition result = new Condition();
+ Collection<TemplateEntry> conditionEntries = new ArrayList<>();
while (true) {
TemplateEntry condition;
@@ -97,10 +97,10 @@ public class TemplateParser {
check(TokenType.APOSTROPHE);
String searchText = searchExpression.getText().trim();
if (searchText.isEmpty()) {
- result.getEntries().add(condition);
+ conditionEntries.add(condition);
} else {
try {
- result.getEntries().add(new SearchExpressionCondition(
+ conditionEntries.add(new SearchExpressionCondition(
SearchCompiler.compile(searchText), condition));
} catch (SearchParseError e) {
throw new ParseError(searchExpression.getPosition(), e);
@@ -111,7 +111,7 @@ public class TemplateParser {
Token token = tokenizer.lookAhead();
if (token.getType() == TokenType.END) {
tokenizer.nextToken();
- return result;
+ return new Condition(conditionEntries);
} else {
check(TokenType.PIPE);
}
diff --git a/src/org/openstreetmap/josm/tools/template_engine/Tokenizer.java b/src/org/openstreetmap/josm/tools/template_engine/Tokenizer.java
index 1ca9445..87e26dd 100644
--- a/src/org/openstreetmap/josm/tools/template_engine/Tokenizer.java
+++ b/src/org/openstreetmap/josm/tools/template_engine/Tokenizer.java
@@ -5,6 +5,12 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
+/**
+ * This class converts a template string (stream of characters) into a stream of tokens.
+ *
+ * The result of the tokenization (also called lexical analysis) serves as input for the
+ * parser {@link TemplateParser}.
+ */
public class Tokenizer {
public static class Token {
@@ -51,6 +57,10 @@ public class Tokenizer {
private Token currentToken;
private final StringBuilder text = new StringBuilder();
+ /**
+ * Creates a new {@link Tokenizer}
+ * @param template the template as a user input string
+ */
public Tokenizer(String template) {
this.template = template;
getChar();
diff --git a/src/org/openstreetmap/josm/tools/template_engine/Variable.java b/src/org/openstreetmap/josm/tools/template_engine/Variable.java
index e820f6c..d27f645 100644
--- a/src/org/openstreetmap/josm/tools/template_engine/Variable.java
+++ b/src/org/openstreetmap/josm/tools/template_engine/Variable.java
@@ -4,15 +4,28 @@ package org.openstreetmap.josm.tools.template_engine;
import java.util.Collection;
import java.util.Locale;
+/**
+ * {@link TemplateEntry} that inserts the value of a variable.
+ * <p>
+ * Variables starting with "special:" form a separate namespace and
+ * provide actions other than simple key-value lookup.
+ * <p>
+ * A variable with no mapping for a given data provider will be considered not "valid"
+ * (see {@link TemplateEntry#isValid(TemplateEngineDataProvider)}).
+ */
public class Variable implements TemplateEntry {
private static final String SPECIAL_VARIABLE_PREFIX = "special:";
private static final String SPECIAL_VALUE_EVERYTHING = "everything";
-
private final String variableName;
private final boolean special;
+ /**
+ * Constructs a new {@code Variable}.
+ * @param variableName the variable name (i.e. the key in the data provider key-value mapping);
+ * will be considered "special" if the variable name starts with {@link #SPECIAL_VARIABLE_PREFIX}
+ */
public Variable(String variableName) {
if (variableName.toLowerCase(Locale.ENGLISH).startsWith(SPECIAL_VARIABLE_PREFIX)) {
this.variableName = variableName.substring(SPECIAL_VARIABLE_PREFIX.length());
@@ -58,6 +71,11 @@ public class Variable implements TemplateEntry {
return '{' + (special ? SPECIAL_VARIABLE_PREFIX : "") + variableName + '}';
}
+ /**
+ * Check if this variable is special.
+ *
+ * @return true if this variable is special
+ */
public boolean isSpecial() {
return special;
}
diff --git a/styles/standard/elemstyles.mapcss b/styles/standard/elemstyles.mapcss
index b654062..d1c68e2 100644
--- a/styles/standard/elemstyles.mapcss
+++ b/styles/standard/elemstyles.mapcss
@@ -1146,6 +1146,10 @@ node[power=pole] {
icon-image: "presets/power/pole.svg";
set icon_z17;
}
+node[power=pole][switch] {
+ icon-image: "presets/power/pole_switch.svg";
+ set icon_z17;
+}
node[power=pole][transformer=distribution] {
icon-image: "presets/power/pole_transformer.svg";
set icon_z17;
@@ -3153,6 +3157,7 @@ node[tourism=information][information=board] {
area[historic=castle],
area[historic=monument],
area[historic=memorial],
+area[historic=tomb],
area[historic=archaeological_site],
area[historic=ruins],
area[historic=battlefield],
@@ -3202,6 +3207,17 @@ node[historic=boundary_stone] {
icon-image: "presets/landmark/boundary_stone.svg";
set icon_z17;
}
+area[cemetery=grave] {
+ fill-color: grave#663300;
+}
+node[cemetery=grave] {
+ icon-image: "presets/misc/grave.svg";
+ set icon_z17;
+}
+node[historic=tomb] {
+ icon-image: "presets/misc/tomb.svg";
+ set icon_z17;
+}
/****************/
/* landuse tags */
@@ -3245,6 +3261,9 @@ area[landuse=greenhouse_horticulture],
area[landuse=plant_nursery] {
fill-color: green#b1e0c2;
}
+area[landuse=salt_pond] {
+ fill-color: salt_pond#eeeeee;
+}
area[landuse=aquaculture] {
fill-color: aquaculture#189dff;
}
@@ -3710,6 +3729,10 @@ node[public_transport=stop_position][train=yes] {
icon-image: "presets/transport/train.svg";
set icon_z17;
}
+node[public_transport=stop_position][light_rail=yes] {
+ icon-image: "presets/transport/railway/light_rail.svg";
+ set icon_z17;
+}
node[public_transport=stop_position][tram=yes] {
icon-image: "presets/transport/railway/tram.svg";
set icon_z17;
@@ -4560,6 +4583,7 @@ node[place=city],
node[place=town],
node[place=suburb],
node[place=village],
+node[place=quarter],
node[place=neighbourhood],
node[place=hamlet],
node[place=isolated_dwelling],
@@ -4599,6 +4623,10 @@ node[place=village] {
icon-image: "presets/place/village.svg";
z-index: 2.5;
}
+node[place=quarter] {
+ icon-image: "presets/place/quarter.svg";
+ z-index: 2.5;
+}
node[place=neighbourhood] {
icon-image: "presets/place/neighbourhood.svg";
z-index: 2.4;
diff --git a/test/data/renderer/area-fill-color/reference.png b/test/data/renderer/area-fill-color/reference.png
index 6675b2d..fb395e3 100644
Binary files a/test/data/renderer/area-fill-color/reference.png and b/test/data/renderer/area-fill-color/reference.png differ
diff --git a/test/data/renderer/area-fill-image/reference.png b/test/data/renderer/area-fill-image/reference.png
index 0e58201..75c154d 100644
Binary files a/test/data/renderer/area-fill-image/reference.png and b/test/data/renderer/area-fill-image/reference.png differ
diff --git a/test/data/renderer/area-icon/reference.png b/test/data/renderer/area-icon/reference.png
index 557010e..e2307a5 100644
Binary files a/test/data/renderer/area-icon/reference.png and b/test/data/renderer/area-icon/reference.png differ
diff --git a/test/data/renderer/area-text/reference.png b/test/data/renderer/area-text/reference.png
index e3c9c18..aa97fbf 100644
Binary files a/test/data/renderer/area-text/reference.png and b/test/data/renderer/area-text/reference.png differ
diff --git a/test/data/renderer/eval/data.osm b/test/data/renderer/eval/data.osm
new file mode 100644
index 0000000..dfafe2c
--- /dev/null
+++ b/test/data/renderer/eval/data.osm
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' upload='false' generator='JOSM'>
+ <bounds minlat='23.2628349' minlon='6.7909447' maxlat='23.6008378' maxlon='7.4540337'/>
+ <node id='-40673' action='modify' lat='23.40126813706' lon='6.86812402846'>
+ <tag k='test' v='3' />
+ </node>
+ <node id='-40674' action='modify' lat='23.46061342982' lon='6.86740537624'>
+ <tag k='12' v='12' />
+ <tag k='15' v='15' />
+ <tag k='test' v='2' />
+ </node>
+ <node id='-40675' action='modify' lat='23.5199320577' lon='6.86668672401'>
+ <tag k='test' v='1' />
+ </node>
+ <node id='-40676' action='modify' lat='23.34189623112' lon='6.86884268069'>
+ <tag k='test' v='4' />
+ </node>
+</osm>
diff --git a/test/data/renderer/eval/reference.png b/test/data/renderer/eval/reference.png
new file mode 100644
index 0000000..0b9b3a8
Binary files /dev/null and b/test/data/renderer/eval/reference.png differ
diff --git a/test/data/renderer/eval/style.mapcss b/test/data/renderer/eval/style.mapcss
new file mode 100644
index 0000000..2878302
--- /dev/null
+++ b/test/data/renderer/eval/style.mapcss
@@ -0,0 +1,38 @@
+* {
+ font-size: 20;
+}
+
+node[test] {
+ symbol-shape:square;
+ symbol-size: 20;
+ value: "";
+ result: "";
+}
+
+node[test=1] {
+ value: 2 + 3 * 5 + 1 / 4;
+ result: 17.25;
+}
+
+node[test=2] {
+ tmp: 3;
+ value: cond(tag("12") >= 14, 1, 2) + (10*cond(tag("15") >= 14, 1, 2)) + (100*max(prop("tmp"), 2));
+ result: 312;
+}
+
+node[test=3] {
+ lst: 12, 3, 6;
+ tmp: list(get(prop("lst"), 1), get(prop("lst"), 0), get(prop("lst"), 2), length(prop("lst")));
+ value: concat("", prop("tmp"));
+ result: "[3.0, 12.0, 6.0, 3]";
+}
+
+node[test=4] {
+ value: regexp_test("aa\\|", "aa|");
+ result: "true";
+}
+
+node[test] {
+ text: concat("Test ", tag("test"), ": ", prop(result), " == ", prop(value));
+}
+
diff --git a/test/data/renderer/node-shapes-combined/data.osm b/test/data/renderer/node-shapes-combined/data.osm
new file mode 100644
index 0000000..3466ab3
--- /dev/null
+++ b/test/data/renderer/node-shapes-combined/data.osm
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' upload='false' generator='JOSM'>
+ <bounds minlat='41.7521709' minlon='-93.6101905' maxlat='41.7537291' maxlon='-93.6057925'/>
+ <node id='-39433' action='modify' lat='41.75296246005' lon='-93.6091762875'>
+ <tag k='test' v='pentagon1' />
+ </node>
+ <node id='-39434' action='modify' lat='41.75295560551' lon='-93.606759304'>
+ <tag k='test' v='pentagon3' />
+ </node>
+ <node id='-39435' action='modify' lat='41.75300054082' lon='-93.60786289815'>
+ <tag k='test' v='pentagon2' />
+ </node>
+</osm>
diff --git a/test/data/renderer/node-shapes-combined/reference.png b/test/data/renderer/node-shapes-combined/reference.png
new file mode 100644
index 0000000..86ea9e5
Binary files /dev/null and b/test/data/renderer/node-shapes-combined/reference.png differ
diff --git a/test/data/renderer/node-shapes-combined/style.mapcss b/test/data/renderer/node-shapes-combined/style.mapcss
new file mode 100644
index 0000000..7365fbf
--- /dev/null
+++ b/test/data/renderer/node-shapes-combined/style.mapcss
@@ -0,0 +1,59 @@
+
+/**
+ * 3 Tests: relative symbol-stroke-width, alignment and stacking of stroke & fill for shapes
+ */
+node[test=pentagon1]
+{
+ symbol-shape: pentagon;
+ symbol-size: 50;
+ symbol-stroke-color: gold;
+ symbol-stroke-opacity: 0.9;
+ symbol-stroke-width: 10;
+}
+node[test=pentagon1]::stroke-casing
+{
+ symbol-shape: pentagon;
+ symbol-size: 50;
+ symbol-stroke-color: #ddd;
+ symbol-stroke-opacity: 0.6;
+ symbol-stroke-width: +8;
+ z-index: -10;
+}
+node[test=pentagon1]::fill
+{
+ symbol-shape: pentagon;
+ symbol-size: 50;
+ symbol-fill-color: darkblue;
+ symbol-fill-opacity: 1.0;
+ z-index: -15;
+}
+node[test=pentagon2]
+{
+ symbol-shape: pentagon;
+ symbol-size: 50;
+ symbol-stroke-color: blue;
+ symbol-stroke-opacity: 0.9;
+ symbol-stroke-width: 10;
+}
+node[test=pentagon2]::fill-above
+{
+ symbol-shape: pentagon;
+ symbol-size: 50;
+ symbol-fill-color: white;
+ symbol-fill-opacity: 0.3;
+ z-index: 2;
+}
+node[test=pentagon3]
+{
+ symbol-shape: pentagon;
+ symbol-size: 50;
+ symbol-fill-color: darkgreen;
+}
+node[test=pentagon3]::stroke-above
+{
+ symbol-shape: pentagon;
+ symbol-size: 50;
+ symbol-stroke-color: yellow;
+ symbol-stroke-width: 1.0;
+ z-index: 1;
+}
diff --git a/test/data/renderer/node-shapes-default/data.osm b/test/data/renderer/node-shapes-default/data.osm
new file mode 100644
index 0000000..badbce8
--- /dev/null
+++ b/test/data/renderer/node-shapes-default/data.osm
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' upload='false' generator='JOSM'>
+ <bounds minlat='41.7545168' minlon='-93.61016' maxlat='41.7551668' maxlon='-93.6085557'/>
+ <node id='-39427' action='modify' lat='41.75486163968' lon='-93.60957807591'>
+ <tag k='test' v='circle' />
+ </node>
+</osm>
diff --git a/test/data/renderer/node-shapes-default/reference.png b/test/data/renderer/node-shapes-default/reference.png
new file mode 100644
index 0000000..bd95712
Binary files /dev/null and b/test/data/renderer/node-shapes-default/reference.png differ
diff --git a/test/data/renderer/node-shapes-default/style.mapcss b/test/data/renderer/node-shapes-default/style.mapcss
new file mode 100644
index 0000000..9e6902a
--- /dev/null
+++ b/test/data/renderer/node-shapes-default/style.mapcss
@@ -0,0 +1,9 @@
+/**
+ * Test default values.
+ * This should display a circle although neither size nor color are specified
+ */
+node[test=circle]
+{
+ symbol-shape: circle;
+}
+
diff --git a/test/data/renderer/node-shapes/reference.png b/test/data/renderer/node-shapes/reference.png
index 124260d..36c6869 100644
Binary files a/test/data/renderer/node-shapes/reference.png and b/test/data/renderer/node-shapes/reference.png differ
diff --git a/test/data/renderer/node-shapes2/data.osm b/test/data/renderer/node-shapes2/data.osm
new file mode 100644
index 0000000..47c6140
--- /dev/null
+++ b/test/data/renderer/node-shapes2/data.osm
@@ -0,0 +1,80 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' upload='false' generator='JOSM'>
+ <bounds minlat='41.7560187' minlon='-93.6103883' maxlat='41.7575769' maxlon='-93.604712'/>
+ <node id='-39314' action='modify' lat='41.75638241559' lon='-93.60964855028'>
+ <tag k='test:stroke' v='circle' />
+ </node>
+ <node id='-39315' action='modify' lat='41.7563914204' lon='-93.6091112534'>
+ <tag k='test:stroke' v='square' />
+ </node>
+ <node id='-39316' action='modify' lat='41.75640042521' lon='-93.60857395653'>
+ <tag k='test:stroke' v='triangle' />
+ </node>
+ <node id='-39317' action='modify' lat='41.75640943002' lon='-93.60803665965'>
+ <tag k='test:stroke' v='pentagon' />
+ </node>
+ <node id='-39318' action='modify' lat='41.75641843483' lon='-93.60749936277'>
+ <tag k='test:stroke' v='hexagon' />
+ </node>
+ <node id='-39319' action='modify' lat='41.75642743963' lon='-93.6069620659'>
+ <tag k='test:stroke' v='heptagon' />
+ </node>
+ <node id='-39320' action='modify' lat='41.75643644444' lon='-93.60642476902'>
+ <tag k='test:stroke' v='octagon' />
+ </node>
+ <node id='-39321' action='modify' lat='41.75644544924' lon='-93.60588747214'>
+ <tag k='test:stroke' v='nonagon' />
+ </node>
+ <node id='-39322' action='modify' lat='41.75645445404' lon='-93.60535017527'>
+ <tag k='test:stroke' v='decagon' />
+ </node>
+ <node id='-39323' action='modify' lat='41.75701355701' lon='-93.60971846159'>
+ <tag k='test:fill' v='circle' />
+ </node>
+ <node id='-39324' action='modify' lat='41.75701165895' lon='-93.60916394128'>
+ <tag k='test:fill' v='square' />
+ </node>
+ <node id='-39325' action='modify' lat='41.75700976088' lon='-93.60860942097'>
+ <tag k='test:fill' v='triangle' />
+ </node>
+ <node id='-39326' action='modify' lat='41.75700786282' lon='-93.60805490066'>
+ <tag k='test:fill' v='pentagon' />
+ </node>
+ <node id='-39327' action='modify' lat='41.75700596475' lon='-93.60750038034'>
+ <tag k='test:fill' v='hexagon' />
+ </node>
+ <node id='-39328' action='modify' lat='41.75700406668' lon='-93.60694586003'>
+ <tag k='test:fill' v='heptagon' />
+ </node>
+ <node id='-39329' action='modify' lat='41.75700216862' lon='-93.60639133972'>
+ <tag k='test:fill' v='octagon' />
+ </node>
+ <node id='-39330' action='modify' lat='41.75700027055' lon='-93.6058368194'>
+ <tag k='test:fill' v='nonagon' />
+ </node>
+ <node id='-39331' action='modify' lat='41.75699837248' lon='-93.60528229909'>
+ <tag k='test:fill' v='decagon' />
+ </node>
+ <way id='-39312' action='modify'>
+ <nd ref='-39314' />
+ <nd ref='-39315' />
+ <nd ref='-39316' />
+ <nd ref='-39317' />
+ <nd ref='-39318' />
+ <nd ref='-39319' />
+ <nd ref='-39320' />
+ <nd ref='-39321' />
+ <nd ref='-39322' />
+ </way>
+ <way id='-39313' action='modify'>
+ <nd ref='-39323' />
+ <nd ref='-39324' />
+ <nd ref='-39325' />
+ <nd ref='-39326' />
+ <nd ref='-39327' />
+ <nd ref='-39328' />
+ <nd ref='-39329' />
+ <nd ref='-39330' />
+ <nd ref='-39331' />
+ </way>
+</osm>
diff --git a/test/data/renderer/node-shapes2/reference.png b/test/data/renderer/node-shapes2/reference.png
new file mode 100644
index 0000000..197b8ef
Binary files /dev/null and b/test/data/renderer/node-shapes2/reference.png differ
diff --git a/test/data/renderer/node-shapes2/style.mapcss b/test/data/renderer/node-shapes2/style.mapcss
new file mode 100644
index 0000000..fac0435
--- /dev/null
+++ b/test/data/renderer/node-shapes2/style.mapcss
@@ -0,0 +1,35 @@
+meta {
+ title: "MapCSS tests: node symbols";
+}
+
+node[ test:fill ]
+{
+ symbol-size: 50;
+ symbol-fill-color: purple;
+}
+node[ test:fill = circle ] { symbol-shape : circle ; } /* whitespace at all possible places */
+node[test:fill=square]{symbol-shape:square;} /* no whitespace at all */
+node[ test:fill = triangle ] { symbol-shape: triangle; }
+node[ test:fill = pentagon ] { symbol-shape: pentagon }
+node[ test:fill = hexagon ] { symbol-shape: hexagon; }
+node[ test:fill = heptagon ] { symbol-shape: heptagon; }
+node[ test:fill = octagon ] { symbol-shape: octagon; }
+node[ test:fill = nonagon ] {symbol-shape: nonagon; }
+node[ test:fill = decagon ] { symbol-shape: decagon; }
+
+node[ test:stroke ]
+{
+ symbol-size: 50;
+ symbol-stroke-color: purple;
+}
+node[ test:stroke = circle ] { symbol-shape: circle; }
+node[ test:stroke = square ] { symbol-shape: square; }
+node[ test:stroke = triangle ] { symbol-shape: triangle; }
+node[ test:stroke = triangle ] { symbol-shape: triangle; }
+node[ test:stroke = pentagon ] { symbol-shape: pentagon; }
+node[ test:stroke = hexagon ] { symbol-shape: hexagon; }
+node[ test:stroke = heptagon ] { symbol-shape: heptagon; }
+node[ test:stroke = octagon ] { symbol-shape: octagon; }
+node[ test:stroke = nonagon ] { symbol-shape: nonagon; }
+node[ test:stroke = decagon ] { symbol-shape: decagon; }
+
diff --git a/test/data/renderer/node-text/reference.png b/test/data/renderer/node-text/reference.png
index 8c7cc3a..14857e4 100644
Binary files a/test/data/renderer/node-text/reference.png and b/test/data/renderer/node-text/reference.png differ
diff --git a/test/data/renderer/node-text2/data.osm b/test/data/renderer/node-text2/data.osm
new file mode 100644
index 0000000..611d70f
--- /dev/null
+++ b/test/data/renderer/node-text2/data.osm
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' upload='false' generator='JOSM'>
+ <bounds minlat='41.7526653' minlon='-93.6021445' maxlat='41.7535976' maxlon='-93.6005355'/>
+ <node id='-39599' action='modify' lat='41.75314999445' lon='-93.60127346601'>
+ <tag k='name' v='Hgmpf' />
+ <tag k='test' v='text-placement' />
+ </node>
+</osm>
diff --git a/test/data/renderer/node-text2/reference.png b/test/data/renderer/node-text2/reference.png
new file mode 100644
index 0000000..0e900df
Binary files /dev/null and b/test/data/renderer/node-text2/reference.png differ
diff --git a/test/data/renderer/node-text2/style.mapcss b/test/data/renderer/node-text2/style.mapcss
new file mode 100644
index 0000000..cb17205
--- /dev/null
+++ b/test/data/renderer/node-text2/style.mapcss
@@ -0,0 +1,55 @@
+
+/**
+ * Text placement test
+ */
+node[test=text-placement]::* {
+ font-size: 10;
+ text: auto;
+ symbol-shape: square;
+ symbol-size: 50;
+ symbol-fill-opacity: 0.0;
+}
+node[test=text-placement]::above_center {
+ text-anchor-vertical: above;
+ text-anchor-horizontal: center;
+ text-color: gold;
+}
+node[test=text-placement]::top_left {
+ text-anchor-vertical: top;
+ text-anchor-horizontal: left;
+ text-color: yellow;
+}
+node[test=text-placement]::top_right {
+ text-anchor-vertical: top;
+ text-anchor-horizontal: right;
+ text-color: green;
+}
+node[test=text-placement]::center_center {
+ text-anchor-vertical: center;
+ text-anchor-horizontal: center;
+ text-color: white;
+}
+node[test=text-placement]::center_right {
+ text-anchor-vertical: center;
+ text-anchor-horizontal: right;
+ text-color: magenta;
+}
+node[test=text-placement]::bottom_left {
+ text-anchor-vertical: bottom;
+ text-anchor-horizontal: left;
+ text-color: blue;
+}
+node[test=text-placement]::bottom_right {
+ text-anchor-vertical: bottom;
+ text-anchor-horizontal: right;
+ text-color: lime;
+}
+node[test=text-placement]::below_center {
+ text-anchor-vertical: below;
+ text-anchor-horizontal: center;
+ text-color: red;
+}
+node[test=text-placement] {
+ symbol-fill-color: blue;
+ symbol-fill-opacity: 0.4;
+}
diff --git a/test/data/renderer/order/reference.png b/test/data/renderer/order/reference.png
index 94cacf0..0356682 100644
Binary files a/test/data/renderer/order/reference.png and b/test/data/renderer/order/reference.png differ
diff --git a/test/data/renderer/relation-linkselector/data.osm b/test/data/renderer/relation-linkselector/data.osm
new file mode 100644
index 0000000..0ad26da
--- /dev/null
+++ b/test/data/renderer/relation-linkselector/data.osm
@@ -0,0 +1,73 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' upload='false' generator='JOSM'>
+ <bounds minlat='41.7560187' minlon='-93.6103883' maxlat='41.7575693' maxlon='-93.6072576'/>
+ <node id='-39943' action='modify' lat='41.75635918892' lon='-93.60905658745' />
+ <node id='-39944' action='modify' lat='41.75634450998' lon='-93.60827933401' />
+ <node id='-39945' action='modify' lat='41.75660873045' lon='-93.60777756279' />
+ <node id='-39946' action='modify' lat='41.75677444751' lon='-93.60775757557' />
+ <node id='-39947' action='modify' lat='41.75677019799' lon='-93.60818094749' />
+ <node id='-39948' action='modify' lat='41.75710047122' lon='-93.60873191196' />
+ <node id='-39949' action='modify' lat='41.75704175611' lon='-93.60927303778' />
+ <node id='-39950' action='modify' lat='41.75695368333' lon='-93.60960755192' />
+ <node id='-39951' action='modify' lat='41.75671148257' lon='-93.60939110159' />
+ <node id='-39952' action='modify' lat='41.75686561043' lon='-93.6086040095' />
+ <node id='-39953' action='modify' lat='41.75730597371' lon='-93.60890900768' />
+ <node id='-39954' action='modify' lat='41.75732065244' lon='-93.60947964946' />
+ <node id='-39955' action='modify' lat='41.75709313184' lon='-93.60997158202' />
+ <node id='-39956' action='modify' lat='41.75683386746' lon='-93.61006910765' />
+ <node id='-39957' action='modify' lat='41.7569169863' lon='-93.60787594931' />
+ <node id='-39958' action='modify' lat='41.75704175611' lon='-93.60797433582' />
+ <node id='-39959' action='modify' lat='41.75723258004' lon='-93.60840723647' />
+ <node id='-39960' action='modify' lat='41.75651331763' lon='-93.60989287281' />
+ <node id='-39961' action='modify' lat='41.75637001464' lon='-93.6095653687' />
+ <way id='-39936' action='modify'>
+ <nd ref='-39943' />
+ <nd ref='-39944' />
+ <nd ref='-39945' />
+ <nd ref='-39946' />
+ </way>
+ <way id='-39937' action='modify'>
+ <nd ref='-39947' />
+ <nd ref='-39948' />
+ <nd ref='-39949' />
+ </way>
+ <way id='-39938' action='modify'>
+ <nd ref='-39949' />
+ <nd ref='-39950' />
+ <nd ref='-39951' />
+ <nd ref='-39952' />
+ <nd ref='-39947' />
+ </way>
+ <way id='-39939' action='modify'>
+ <nd ref='-39953' />
+ <nd ref='-39954' />
+ <nd ref='-39955' />
+ <nd ref='-39956' />
+ <tag k='test' v='role1_outer' />
+ </way>
+ <way id='-39940' action='modify'>
+ <nd ref='-39946' />
+ <nd ref='-39957' />
+ <nd ref='-39958' />
+ <nd ref='-39959' />
+ <nd ref='-39953' />
+ </way>
+ <way id='-39942' action='modify'>
+ <nd ref='-39956' />
+ <nd ref='-39960' />
+ <nd ref='-39961' />
+ <nd ref='-39943' />
+ <tag k='test' v='role1_outer' />
+ </way>
+ <relation id='-39941' action='modify'>
+ <member type='way' ref='-39942' role='outer' />
+ <member type='way' ref='-39939' role='' />
+ <member type='way' ref='-39940' role='' />
+ <member type='way' ref='-39936' role='outer' />
+ <member type='way' ref='-39937' role='inner' />
+ <member type='way' ref='-39938' role='inner' />
+ <tag k='landuse' v='meadow' />
+ <tag k='test' v='role1' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+</osm>
diff --git a/test/data/renderer/relation-linkselector/reference.png b/test/data/renderer/relation-linkselector/reference.png
new file mode 100644
index 0000000..0e3466e
Binary files /dev/null and b/test/data/renderer/relation-linkselector/reference.png differ
diff --git a/test/data/renderer/relation-linkselector/style.mapcss b/test/data/renderer/relation-linkselector/style.mapcss
new file mode 100644
index 0000000..96e96af
--- /dev/null
+++ b/test/data/renderer/relation-linkselector/style.mapcss
@@ -0,0 +1,9 @@
+canvas {
+ default-points: false;
+ default-lines: true;
+}
+
+relation[test=role1] >[outer] way[test=role1_outer] { width: 4; color: navy; }
+
+relation[test=role1] >[role=inner][index=5] way { width: 4; color: lime; }
+
diff --git a/test/data/renderer/relation-parentselector/data.osm b/test/data/renderer/relation-parentselector/data.osm
new file mode 100644
index 0000000..c3112dd
--- /dev/null
+++ b/test/data/renderer/relation-parentselector/data.osm
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' upload='false' generator='JOSM'>
+ <bounds minlat='41.7540034' minlon='-93.6103371' maxlat='41.7555465' maxlon='-93.6057618' origin='JOSM' />
+ <node id='-41148' action='modify' lat='41.75449259482' lon='-93.60684960581' />
+ <node id='-41150' action='modify' lat='41.75444121701' lon='-93.60735137702' />
+ <node id='-41152' action='modify' lat='41.75491829511' lon='-93.60713492669' />
+ <node id='-41154' action='modify' lat='41.75430910244' lon='-93.60628880269' />
+ <node id='-41156' action='modify' lat='41.75422836563' lon='-93.60784330958' />
+ <node id='-41158' action='modify' lat='41.75530729464' lon='-93.60710541074' />
+ <node id='-41160' action='modify' lat='41.75449626466' lon='-93.60896491582' />
+ <node id='-41162' action='modify' lat='41.75444488685' lon='-93.60946668703' />
+ <node id='-41164' action='modify' lat='41.75492196493' lon='-93.60925023671' />
+ <node id='-41166' action='modify' lat='41.75431277229' lon='-93.6084041127' />
+ <node id='-41168' action='modify' lat='41.75423203549' lon='-93.60995861959' />
+ <node id='-41170' action='modify' lat='41.75531096443' lon='-93.60922072075' />
+ <way id='-41172' action='modify'>
+ <nd ref='-41152' />
+ <nd ref='-41150' />
+ <nd ref='-41148' />
+ <nd ref='-41152' />
+ </way>
+ <way id='-41174' action='modify'>
+ <nd ref='-41158' />
+ <nd ref='-41156' />
+ <nd ref='-41154' />
+ <nd ref='-41158' />
+ <tag k='barrier' v='fence' />
+ </way>
+ <way id='-41176' action='modify'>
+ <nd ref='-41164' />
+ <nd ref='-41162' />
+ <nd ref='-41160' />
+ <nd ref='-41164' />
+ </way>
+ <way id='-41178' action='modify'>
+ <nd ref='-41170' />
+ <nd ref='-41168' />
+ <nd ref='-41166' />
+ <nd ref='-41170' />
+ </way>
+ <relation id='-41180' action='modify'>
+ <member type='way' ref='-41174' role='outer' />
+ <member type='way' ref='-41172' role='inner' />
+ <tag k='landuse' v='quarry' />
+ <tag k='test' v='parent' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-41182' action='modify'>
+ <member type='way' ref='-41178' role='outer' />
+ <member type='way' ref='-41176' role='inner' />
+ <tag k='landuse' v='quarry' />
+ <tag k='test' v='parent' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+</osm>
diff --git a/test/data/renderer/relation-parentselector/reference.png b/test/data/renderer/relation-parentselector/reference.png
new file mode 100644
index 0000000..b943895
Binary files /dev/null and b/test/data/renderer/relation-parentselector/reference.png differ
diff --git a/test/data/renderer/relation-parentselector/style.mapcss b/test/data/renderer/relation-parentselector/style.mapcss
new file mode 100644
index 0000000..d9e4ca8
--- /dev/null
+++ b/test/data/renderer/relation-parentselector/style.mapcss
@@ -0,0 +1,11 @@
+canvas {
+ default-points: false;
+ default-lines: true;
+}
+
+area[landuse=quarry][test=parent] { fill-color : #aaa; }
+
+way[barrier=fence] { width: 2; color: #F0F050; }
+
+way[barrier=fence] < area[landuse=quarry][test=parent] { fill-color : #f70; }
+
diff --git a/test/data/renderer/way-color/reference.png b/test/data/renderer/way-color/reference.png
index 0224522..4f66d86 100644
Binary files a/test/data/renderer/way-color/reference.png and b/test/data/renderer/way-color/reference.png differ
diff --git a/test/data/renderer/way-dashes-clamp/reference.png b/test/data/renderer/way-dashes-clamp/reference.png
index 56851e9..5394abd 100644
Binary files a/test/data/renderer/way-dashes-clamp/reference.png and b/test/data/renderer/way-dashes-clamp/reference.png differ
diff --git a/test/data/renderer/way-dashes/reference.png b/test/data/renderer/way-dashes/reference.png
index b4f336f..5f84ad5 100644
Binary files a/test/data/renderer/way-dashes/reference.png and b/test/data/renderer/way-dashes/reference.png differ
diff --git a/test/data/renderer/way-dashes2/data.osm b/test/data/renderer/way-dashes2/data.osm
new file mode 100644
index 0000000..c830744
--- /dev/null
+++ b/test/data/renderer/way-dashes2/data.osm
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' upload='false' generator='JOSM'>
+ <bounds minlat='41.7559853' minlon='-93.6024805' maxlat='41.7575434' maxlon='-93.5980518'/>
+ <node id='-39470' action='modify' lat='41.75636723733' lon='-93.60203683129' />
+ <node id='-39471' action='modify' lat='41.75650110785' lon='-93.6003818548' />
+ <node id='-39472' action='modify' lat='41.75622182388' lon='-93.60012838418' />
+ <node id='-39473' action='modify' lat='41.75673969417' lon='-93.59863786848' />
+ <node id='-39474' action='modify' lat='41.75663695627' lon='-93.60204416544' />
+ <node id='-39475' action='modify' lat='41.75677082622' lon='-93.60038918895' />
+ <node id='-39476' action='modify' lat='41.75649154343' lon='-93.60013571833' />
+ <node id='-39477' action='modify' lat='41.75700941154' lon='-93.59864520264' />
+ <node id='-39478' action='modify' lat='41.75697509339' lon='-93.60200403126' />
+ <node id='-39479' action='modify' lat='41.75710896264' lon='-93.60034905477' />
+ <node id='-39480' action='modify' lat='41.75682968132' lon='-93.60009558416' />
+ <node id='-39481' action='modify' lat='41.75734754669' lon='-93.59860506846' />
+ <way id='-39467' action='modify'>
+ <nd ref='-39470' />
+ <nd ref='-39471' />
+ <nd ref='-39472' />
+ <nd ref='-39473' />
+ <tag k='test' v='dash3' />
+ </way>
+ <way id='-39468' action='modify'>
+ <nd ref='-39474' />
+ <nd ref='-39475' />
+ <nd ref='-39476' />
+ <nd ref='-39477' />
+ <tag k='test' v='dash2' />
+ </way>
+ <way id='-39469' action='modify'>
+ <nd ref='-39478' />
+ <nd ref='-39479' />
+ <nd ref='-39480' />
+ <nd ref='-39481' />
+ <tag k='test' v='dash1' />
+ </way>
+</osm>
diff --git a/test/data/renderer/way-dashes2/reference.png b/test/data/renderer/way-dashes2/reference.png
new file mode 100644
index 0000000..5e301f9
Binary files /dev/null and b/test/data/renderer/way-dashes2/reference.png differ
diff --git a/test/data/renderer/way-dashes2/style.mapcss b/test/data/renderer/way-dashes2/style.mapcss
new file mode 100644
index 0000000..bd2aa25
--- /dev/null
+++ b/test/data/renderer/way-dashes2/style.mapcss
@@ -0,0 +1,34 @@
+
+/**
+ * Dashes Test
+ * 1. Basic test - pattern should not be broken at way nodes
+ * 2. Transparent and with background color. The foreground and background dashes must not overlap.
+ * 3. Dashes offset - cuts off the first dash segment
+ */
+
+canvas {
+ default-points: false;
+ default-lines: false;
+}
+
+way[test=dash1] {
+ width: 10;
+ color: blue;
+ dashes: 30,4,17,14;
+}
+way[test=dash2] {
+ width: 10;
+ color: blue;
+ opacity: 0.3;
+ dashes: 30,4,17,14;
+ dashes-background-color: gold;
+ dashes-background-opacity: 0.3;
+}
+way[test=dash3] {
+ width: 10;
+ color: blue;
+ dashes: 30,4,17,14;
+ dashes-background-color: gold;
+ dashes-offset:30;
+}
+
diff --git a/test/data/renderer/way-repeat-image-clamp/reference.png b/test/data/renderer/way-repeat-image-clamp/reference.png
index dbbafa5..b146049 100644
Binary files a/test/data/renderer/way-repeat-image-clamp/reference.png and b/test/data/renderer/way-repeat-image-clamp/reference.png differ
diff --git a/test/data/renderer/way-repeat-image/reference.png b/test/data/renderer/way-repeat-image/reference.png
index 259ed8d..05367c6 100644
Binary files a/test/data/renderer/way-repeat-image/reference.png and b/test/data/renderer/way-repeat-image/reference.png differ
diff --git a/test/data/renderer/way-text/reference.png b/test/data/renderer/way-text/reference.png
index f1fc797..8c7fc86 100644
Binary files a/test/data/renderer/way-text/reference.png and b/test/data/renderer/way-text/reference.png differ
diff --git a/test/data/renderer/way-width/reference.png b/test/data/renderer/way-width/reference.png
index 4ff9451..f231011 100644
Binary files a/test/data/renderer/way-width/reference.png and b/test/data/renderer/way-width/reference.png differ
diff --git a/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java b/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java
index aca58f7..d3f1e62 100644
--- a/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java
+++ b/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java
@@ -4,10 +4,9 @@ package org.openstreetmap.josm.gui.mappaint;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import java.awt.Graphics2D;
+import java.awt.Color;
import java.awt.GraphicsEnvironment;
import java.awt.Point;
-import java.awt.RenderingHints;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileInputStream;
@@ -17,6 +16,7 @@ import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -30,15 +30,13 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.TestUtils;
import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.ProjectionBounds;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
-import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
-import org.openstreetmap.josm.data.preferences.sources.SourceType;
-import org.openstreetmap.josm.gui.NavigatableComponent;
-import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
import org.openstreetmap.josm.io.IllegalDataException;
import org.openstreetmap.josm.io.OsmReader;
import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -69,6 +67,9 @@ public class MapCSSRendererTest {
private TestConfig testConfig;
+ // development flag - set to true in order to update all reference images
+ private static final boolean UPDATE_ALL = false;
+
/**
* The different configurations of this test.
*
@@ -81,7 +82,8 @@ public class MapCSSRendererTest {
new TestConfig("node-shapes", AREA_DEFAULT),
/** Text for nodes */
- new TestConfig("node-text", AREA_DEFAULT).usesFont("DejaVu Sans"),
+ new TestConfig("node-text", AREA_DEFAULT).usesFont("DejaVu Sans")
+ .setThresholdPixels(100).setThresholdTotalColorDiff(100),
/** Tests that StyledMapRenderer#drawWay respects width */
new TestConfig("way-width", AREA_DEFAULT),
@@ -102,7 +104,7 @@ public class MapCSSRendererTest {
new TestConfig("area-fill-image", AREA_DEFAULT),
/** Tests area label drawing/placement */
- new TestConfig("area-text", AREA_DEFAULT),
+ new TestConfig("area-text", AREA_DEFAULT).setThresholdPixels(50).setThresholdTotalColorDiff(50),
/** Tests area icon drawing/placement */
new TestConfig("area-icon", AREA_DEFAULT),
@@ -116,7 +118,26 @@ public class MapCSSRendererTest {
new TestConfig("way-repeat-image-clamp", AREA_DEFAULT),
/** Tests text along a way */
- new TestConfig("way-text", AREA_DEFAULT)
+ new TestConfig("way-text", AREA_DEFAULT).setThresholdPixels(20).setThresholdTotalColorDiff(40),
+
+ /** Another test for node shapes */
+ new TestConfig("node-shapes2").setImageWidth(600),
+ /** Tests default values for node shapes */
+ new TestConfig("node-shapes-default"),
+ /** Tests node shapes with both fill and stroke combined */
+ new TestConfig("node-shapes-combined"),
+ /** Another test for dashed ways */
+ new TestConfig("way-dashes2"),
+ /** Tests node text placement */
+ new TestConfig("node-text2").setThresholdPixels(30).setThresholdTotalColorDiff(50),
+ /** Tests relation link selector */
+ new TestConfig("relation-linkselector"),
+ /** Tests parent selector on relation */
+ new TestConfig("relation-parentselector"),
+
+ /** Tests evaluation of expressions */
+ new TestConfig("eval").setImageWidth(600).setThresholdPixels(100).setThresholdTotalColorDiff(100)
+
).map(e -> new Object[] {e, e.testDirectory})
.collect(Collectors.toList());
}
@@ -157,68 +178,34 @@ public class MapCSSRendererTest {
// load the data
DataSet dataSet = testConfig.getOsmDataSet();
+ dataSet.allPrimitives().stream().forEach(this::loadPrimitiveStyle);
+ dataSet.setSelected(dataSet.allPrimitives().stream().filter(n -> n.isKeyTrue("selected")).collect(Collectors.toList()));
- // load the style
- MapCSSStyleSource.STYLE_SOURCE_LOCK.writeLock().lock();
- try {
- MapPaintStyles.getStyles().clear();
+ ProjectionBounds pb = new ProjectionBounds();
+ pb.extend(Main.getProjection().latlon2eastNorth(testConfig.getTestArea().getMin()));
+ pb.extend(Main.getProjection().latlon2eastNorth(testConfig.getTestArea().getMax()));
+ double scale = (pb.maxEast - pb.minEast) / testConfig.imageWidth;
- MapCSSStyleSource source = new MapCSSStyleSource(testConfig.getStyleSourceEntry());
- source.loadStyleSource();
- if (!source.getErrors().isEmpty()) {
- fail("Failed to load style file. Errors: " + source.getErrors());
- }
- MapPaintStyles.getStyles().setStyleSources(Arrays.asList(source));
- MapPaintStyles.fireMapPaintSylesUpdated();
- MapPaintStyles.getStyles().clearCached();
+ RenderingHelper.StyleData sd = new RenderingHelper.StyleData();
+ sd.styleUrl = testConfig.getStyleSourceUrl();
+ RenderingHelper rh = new RenderingHelper(dataSet, testConfig.getTestArea(), scale, Collections.singleton(sd));
+ rh.setFillBackground(false);
+ BufferedImage image = rh.render();
- } finally {
- MapCSSStyleSource.STYLE_SOURCE_LOCK.writeLock().unlock();
+ if (UPDATE_ALL) {
+ ImageIO.write(image, "png", new File(testConfig.getTestDirectory() + "/reference.png"));
+ return;
}
- // create the renderer
- BufferedImage image = new BufferedImage(IMAGE_SIZE, IMAGE_SIZE, BufferedImage.TYPE_INT_ARGB);
- NavigatableComponent nc = new NavigatableComponent() {
- {
- setBounds(0, 0, IMAGE_SIZE, IMAGE_SIZE);
- updateLocationState();
- }
-
- @Override
- protected boolean isVisibleOnScreen() {
- return true;
- }
-
- @Override
- public Point getLocationOnScreen() {
- return new Point(0, 0);
- }
- };
- nc.zoomTo(testConfig.testArea);
- dataSet.allPrimitives().stream().forEach(this::loadPrimitiveStyle);
- dataSet.setSelected(dataSet.allPrimitives().stream().filter(n -> n.isKeyTrue("selected")).collect(Collectors.toList()));
-
- Graphics2D g = image.createGraphics();
- // Force all render hints to be defaults - do not use platform values
- g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
- g.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
- g.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
- g.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE);
- g.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
- g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
- g.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE);
- g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
- new StyledMapRenderer(g, nc, false).render(dataSet, false, testConfig.testArea);
-
BufferedImage reference = testConfig.getReference();
// now compute differences:
- assertEquals(IMAGE_SIZE, reference.getWidth());
- assertEquals(IMAGE_SIZE, reference.getHeight());
+ assertEquals(image.getWidth(), reference.getWidth());
+ assertEquals(image.getHeight(), reference.getHeight());
StringBuilder differences = new StringBuilder();
ArrayList<Point> differencePoints = new ArrayList<>();
+ int colorDiffSum = 0;
for (int y = 0; y < reference.getHeight(); y++) {
for (int x = 0; x < reference.getWidth(); x++) {
@@ -226,6 +213,7 @@ public class MapCSSRendererTest {
int result = image.getRGB(x, y);
if (!colorsAreSame(expected, result)) {
differencePoints.add(new Point(x, y));
+ int colorDiff = colorDiff(new Color(expected, true), new Color(result, true));
if (differences.length() < 500) {
differences.append("\nDifference at ")
.append(x)
@@ -234,25 +222,34 @@ public class MapCSSRendererTest {
.append(": Expected ")
.append(Integer.toHexString(expected))
.append(" but got ")
- .append(Integer.toHexString(result));
+ .append(Integer.toHexString(result))
+ .append(" (color diff is ")
+ .append(colorDiff)
+ .append(")");
}
+ colorDiffSum += colorDiff;
}
}
}
- if (differencePoints.size() > 0) {
+ if (differencePoints.size() > testConfig.thresholdPixels || colorDiffSum > testConfig.thresholdTotalColorDiff) {
// You can use this to debug:
ImageIO.write(image, "png", new File(testConfig.getTestDirectory() + "/test-output.png"));
// Add a nice image that highlights the differences:
- BufferedImage diffImage = new BufferedImage(IMAGE_SIZE, IMAGE_SIZE, BufferedImage.TYPE_INT_ARGB);
+ BufferedImage diffImage = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_INT_ARGB);
for (Point p : differencePoints) {
diffImage.setRGB(p.x, p.y, 0xffff0000);
}
ImageIO.write(diffImage, "png", new File(testConfig.getTestDirectory() + "/test-differences.png"));
- fail(MessageFormat.format("Images for test {0} differ at {1} points: {2}",
- testConfig.testDirectory, differencePoints.size(), differences.toString()));
+ if (differencePoints.size() > testConfig.thresholdPixels) {
+ fail(MessageFormat.format("Images for test {0} differ at {1} points, threshold is {2}: {3}",
+ testConfig.testDirectory, differencePoints.size(), testConfig.thresholdPixels, differences.toString()));
+ } else {
+ fail(MessageFormat.format("Images for test {0} differ too much in color, value is {1}, permitted threshold is {2}: {3}",
+ testConfig.testDirectory, colorDiffSum, testConfig.thresholdTotalColorDiff, differences.toString()));
+ }
}
}
@@ -263,6 +260,11 @@ public class MapCSSRendererTest {
}
}
+ private int colorDiff(Color c1, Color c2) {
+ return Math.abs(c1.getAlpha() - c2.getAlpha()) + Math.abs(c1.getRed() - c2.getRed())
+ + Math.abs(c1.getGreen() - c2.getGreen()) + Math.abs(c1.getBlue() - c2.getBlue());
+ }
+
/**
* Check if two colors differ
* @param expected The expected color
@@ -280,14 +282,51 @@ public class MapCSSRendererTest {
private static class TestConfig {
private final String testDirectory;
- private final Bounds testArea;
+ private Bounds testArea;
private final ArrayList<String> fonts = new ArrayList<>();
+ private DataSet ds;
+ private int imageWidth = IMAGE_SIZE;
+ private int thresholdPixels;
+ private int thresholdTotalColorDiff;
TestConfig(String testDirectory, Bounds testArea) {
this.testDirectory = testDirectory;
this.testArea = testArea;
}
+ TestConfig(String testDirectory) {
+ this.testDirectory = testDirectory;
+ }
+
+ public TestConfig setImageWidth(int imageWidth) {
+ this.imageWidth = imageWidth;
+ return this;
+ }
+
+ /**
+ * Set the number of pixels that can differ.
+ *
+ * Needed due to somewhat platform dependent font rendering.
+ * @param thresholdPixels the number of pixels that can differ
+ * @return this object, for convenience
+ */
+ public TestConfig setThresholdPixels(int thresholdPixels) {
+ this.thresholdPixels = thresholdPixels;
+ return this;
+ }
+
+ /**
+ * Set the threshold for total color difference.
+ * Every difference in any color component (and alpha) will be added up and must not exceed this threshold.
+ * Needed due to somewhat platform dependent font rendering.
+ * @param thresholdTotalColorDiff he threshold for total color difference
+ * @return this object, for convenience
+ */
+ public TestConfig setThresholdTotalColorDiff(int thresholdTotalColorDiff) {
+ this.thresholdTotalColorDiff = thresholdTotalColorDiff;
+ return this;
+ }
+
public TestConfig usesFont(String string) {
this.fonts.add(string);
return this;
@@ -301,14 +340,22 @@ public class MapCSSRendererTest {
return TestUtils.getTestDataRoot() + TEST_DATA_BASE + testDirectory;
}
- public SourceEntry getStyleSourceEntry() {
- return new SourceEntry(SourceType.MAP_PAINT_STYLE, getTestDirectory() + "/style.mapcss",
- "test style", "a test style", true // active
- );
+ public String getStyleSourceUrl() {
+ return getTestDirectory() + "/style.mapcss";
}
public DataSet getOsmDataSet() throws FileNotFoundException, IllegalDataException {
- return OsmReader.parseDataSet(new FileInputStream(getTestDirectory() + "/data.osm"), null);
+ if (ds == null) {
+ ds = OsmReader.parseDataSet(new FileInputStream(getTestDirectory() + "/data.osm"), null);
+ }
+ return ds;
+ }
+
+ public Bounds getTestArea() throws FileNotFoundException, IllegalDataException {
+ if (testArea == null) {
+ testArea = getOsmDataSet().getDataSourceBounds().get(0);
+ }
+ return testArea;
}
@Override
diff --git a/test/unit/org/openstreetmap/josm/JOSMFixture.java b/test/unit/org/openstreetmap/josm/JOSMFixture.java
index 48244ba..2f4a564 100644
--- a/test/unit/org/openstreetmap/josm/JOSMFixture.java
+++ b/test/unit/org/openstreetmap/josm/JOSMFixture.java
@@ -15,6 +15,7 @@ import java.util.TimeZone;
import org.openstreetmap.josm.actions.DeleteAction;
import org.openstreetmap.josm.command.DeleteCommand;
+import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
import org.openstreetmap.josm.data.projection.Projections;
import org.openstreetmap.josm.gui.MainApplication;
import org.openstreetmap.josm.gui.MainApplicationTest;
@@ -97,7 +98,7 @@ public class JOSMFixture {
System.setProperty("josm.home", josmHome);
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
Config.setPreferencesInstance(Main.pref);
- Config.setBaseDirectoriesProvider(Main.pref);
+ Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
Main.pref.resetToInitialState();
Main.pref.enableSaveOnPut(false);
I18n.init();
diff --git a/test/unit/org/openstreetmap/josm/data/APIDataSetTest.java b/test/unit/org/openstreetmap/josm/data/APIDataSetTest.java
index e913f49..e07a80f 100644
--- a/test/unit/org/openstreetmap/josm/data/APIDataSetTest.java
+++ b/test/unit/org/openstreetmap/josm/data/APIDataSetTest.java
@@ -178,17 +178,17 @@ public class APIDataSetTest {
APIDataSet apiDataSet = new APIDataSet();
- // add r1 first to test functionality of APIDataSet#adjustRelationUploadOrder()
- apiDataSet.getPrimitivesToDelete().add(r1);
- apiDataSet.getPrimitivesToDelete().add(r2);
- apiDataSet.getPrimitivesToDelete().add(r3);
apiDataSet.getPrimitivesToDelete().add(r4);
+ apiDataSet.getPrimitivesToDelete().add(r3);
+ apiDataSet.getPrimitivesToDelete().add(r2);
+ // add r1 last to test functionality of APIDataSet#adjustRelationUploadOrder()
+ apiDataSet.getPrimitivesToDelete().add(r1);
apiDataSet.adjustRelationUploadOrder();
List<OsmPrimitive> toDelete = apiDataSet.getPrimitivesToDelete();
assertEquals(4, toDelete.size());
- assertTrue(toDelete.indexOf(r2) < toDelete.indexOf(r1));
- assertTrue(toDelete.indexOf(r3) < toDelete.indexOf(r1));
+ assertTrue(toDelete.indexOf(r1) < toDelete.indexOf(r2));
+ assertTrue(toDelete.indexOf(r1) < toDelete.indexOf(r3));
}
@Test // for ticket #9656
diff --git a/test/unit/org/openstreetmap/josm/data/PreferencesTest.java b/test/unit/org/openstreetmap/josm/data/PreferencesTest.java
index 5be0075..1c2164f 100644
--- a/test/unit/org/openstreetmap/josm/data/PreferencesTest.java
+++ b/test/unit/org/openstreetmap/josm/data/PreferencesTest.java
@@ -2,14 +2,10 @@
package org.openstreetmap.josm.data;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Color;
import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -27,35 +23,6 @@ public class PreferencesTest {
public JOSMTestRules test = new JOSMTestRules().platform().preferences().fakeAPI();
/**
- * Test color name.
- */
- @Test
- public void testColorName() {
- assertEquals("color.layer {5DE308C0-916F-4B5A-B3DB-D45E17F30172}.gpx",
- Main.pref.getColorName("color.layer {5DE308C0-916F-4B5A-B3DB-D45E17F30172}.gpx"));
- }
-
- /**
- * Test color alpha.
- */
- @Test
- public void testColorAlpha() {
- assertEquals(0x12, new ColorProperty("foo", new Color(0x12345678, true)).get().getAlpha());
- assertTrue(Main.pref.putColor("bar", new Color(0x12345678, true)));
- assertEquals(0x12, new ColorProperty("bar", Color.RED).get().getAlpha());
- }
-
- /**
- * Test color name and alpha.
- */
- @Test
- public void testColorNameAlpha() {
- assertEquals(0x12, new ColorProperty("foo", new Color(0x12345678, true)).get().getAlpha());
- assertEquals(new Color(0x34, 0x56, 0x78, 0x12), Main.pref.getDefaultColor("foo"));
- assertEquals(0x12, Main.pref.getDefaultColor("foo").getAlpha());
- }
-
- /**
* Test {@link Preferences#toXML}.
*/
@Test
diff --git a/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java b/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java
index a615241..868207c 100644
--- a/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java
+++ b/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java
@@ -47,8 +47,10 @@ public class OAuthParametersTest {
/**
* Unit test of method {@link OAuthParameters#createFromPreferences}.
+ * @deprecated to remove end of 2017
*/
@Test
+ @Deprecated
public void testCreateFromPreferences() {
assertNotNull(OAuthParameters.createFromPreferences(Main.pref));
}
diff --git a/test/unit/org/openstreetmap/josm/data/preferences/ColorPropertyTest.java b/test/unit/org/openstreetmap/josm/data/preferences/NamedColorPropertyTest.java
similarity index 58%
rename from test/unit/org/openstreetmap/josm/data/preferences/ColorPropertyTest.java
rename to test/unit/org/openstreetmap/josm/data/preferences/NamedColorPropertyTest.java
index 6aa0e81..9035705 100644
--- a/test/unit/org/openstreetmap/josm/data/preferences/ColorPropertyTest.java
+++ b/test/unit/org/openstreetmap/josm/data/preferences/NamedColorPropertyTest.java
@@ -2,12 +2,15 @@
package org.openstreetmap.josm.data.preferences;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.awt.Color;
+import java.util.Arrays;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -17,21 +20,21 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
* Test {@link ColorProperty}
* @author Michael Zangl
*/
-public class ColorPropertyTest {
+public class NamedColorPropertyTest {
/**
* This is a preference test.
*/
@Rule
@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
public JOSMTestRules test = new JOSMTestRules().preferences();
- private ColorProperty base;
+ private NamedColorProperty base;
/**
* Set up test case
*/
@Before
public void createTestProperty() {
- base = new ColorProperty("test", Color.RED);
+ base = new NamedColorProperty("test", Color.RED);
}
/**
@@ -40,9 +43,6 @@ public class ColorPropertyTest {
@Test
public void testGet() {
assertEquals(Color.RED, base.get());
-
- Config.getPref().put("color.test", "#00ff00");
- assertEquals(new Color(0xff00ff00), base.get());
}
/**
@@ -52,20 +52,38 @@ public class ColorPropertyTest {
public void testPut() {
assertEquals(Color.RED, base.get());
- base.put(new Color(0xff00ff00));
- assertEquals(new Color(0xff00ff00), base.get());
- assertEquals("#00ff00", Config.getPref().get("color.test").toLowerCase());
+ base.put(new Color(0xff00af00));
+ assertEquals(new Color(0xff00af00), base.get());
+ assertEquals("#00af00", Config.getPref().getList("clr.general.test").get(0).toLowerCase());
base.put(null);
assertEquals(Color.RED, base.get());
}
/**
+ * Test color alpha.
+ */
+ @Test
+ public void testColorAlpha() {
+ assertEquals(0x12, new NamedColorProperty("foo", new Color(0x12345678, true)).get().getAlpha());
+ assertTrue(Main.pref.putList("clr.general.bar", Arrays.asList("#34567812", "general", "", "bar")));
+ assertEquals(0x12, new NamedColorProperty("bar", Color.RED).get().getAlpha());
+ }
+
+ /**
+ * Test color name and alpha.
+ */
+ @Test
+ public void testColorNameAlpha() {
+ assertEquals(0x12, new NamedColorProperty("foo", new Color(0x12345678, true)).get().getAlpha());
+ }
+
+ /**
* Test {@link ColorProperty#getChildColor(String)}
*/
@Test
public void testGetChildColor() {
- AbstractToStringProperty<Color> child = base.getChildColor("test2");
+ AbstractProperty<Color> child = base.getChildColor("test2");
assertEquals(Color.RED, child.get());
diff --git a/test/unit/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandlerTest.java b/test/unit/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandlerTest.java
index 86d01ee..15f7015 100644
--- a/test/unit/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandlerTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandlerTest.java
@@ -13,6 +13,7 @@ import org.openstreetmap.josm.actions.CopyAction;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.gui.MainApplication;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -63,7 +64,7 @@ public class OsmTransferHandlerTest {
@Test
public void testPasteTags() {
Node n = new Node(LatLon.ZERO);
- new DataSet(n);
+ MainApplication.getLayerManager().addLayer(new OsmDataLayer(new DataSet(n), "testPasteTags", null));
ClipboardUtils.copyString("test=ok");
transferHandler.pasteTags(Collections.singleton(n));
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java
index 202a95b..a37c05c 100644
--- a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java
@@ -22,6 +22,7 @@ import org.openstreetmap.josm.gui.dialogs.relation.actions.DeleteCurrentRelation
import org.openstreetmap.josm.gui.dialogs.relation.actions.DuplicateRelationAction;
import org.openstreetmap.josm.gui.dialogs.relation.actions.OKAction;
import org.openstreetmap.josm.gui.dialogs.relation.actions.RefreshAction;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.SelectAction;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.tagging.TagEditorModel;
import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
@@ -142,6 +143,7 @@ public class GenericRelationEditorTest {
assertNotNull(GenericRelationEditor.buildToolBar(
new RefreshAction(memberTable, memberTableModel, tagModel, layer, re),
new ApplyAction(memberTable, memberTableModel, tagModel, layer, re),
+ new SelectAction(layer, re),
new DuplicateRelationAction(memberTableModel, tagModel, layer),
new DeleteCurrentRelationAction(layer, re)));
}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java
index d60ffb2..ccda3d5 100644
--- a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java
@@ -59,6 +59,7 @@ public class RelationEditorActionsTest {
new CopyMembersAction(memberTableModel, layer, editor).actionPerformed(null);
new PasteMembersAction(memberTable, layer, editor).actionPerformed(null);
+ new SelectAction(layer, editor).actionPerformed(null);
new DeleteCurrentRelationAction(layer, editor).actionPerformed(null);
new DownloadIncompleteMembersAction(memberTable, memberTableModel, "downloadincomplete", layer, editor).actionPerformed(null);
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/AutosaveTaskTest.java b/test/unit/org/openstreetmap/josm/gui/layer/AutosaveTaskTest.java
index 10b6e13..6fd33b2 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/AutosaveTaskTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/AutosaveTaskTest.java
@@ -12,6 +12,7 @@ import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.ZoneId;
import java.time.ZonedDateTime;
@@ -76,6 +77,10 @@ public class AutosaveTaskTest {
assertTrue(files.contains(layer1));
assertTrue(files.contains(layer2));
assertFalse(files.contains(dir));
+ // cleanup
+ layer1.delete();
+ layer2.delete();
+ dir.delete();
}
/**
@@ -108,6 +113,10 @@ public class AutosaveTaskTest {
}
}
}
+ // cleanup
+ for (Path entry : Files.newDirectoryStream(task.getAutosaveDir(), "*.{osm,pid}")) {
+ Files.delete(entry);
+ }
}
/**
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java
index a9368d3..354174c 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java
@@ -15,7 +15,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.preferences.AbstractProperty;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -51,14 +51,14 @@ public class LayerTest {
AbstractProperty<Color> color = new LayerManagerTest.TestLayer() {
@Override
- protected ColorProperty getBaseColorProperty() {
- return new ColorProperty("x", Color.BLACK);
+ protected NamedColorProperty getBaseColorProperty() {
+ return new NamedColorProperty("x", Color.BLACK);
}
}.getColorProperty();
assertEquals(Color.BLACK, color.get());
assertEquals(Color.BLACK, color.getDefaultValue());
- assertEquals("color.layer.test.layer", color.getKey());
+ assertEquals("clr.layer.Test Layer.x", color.getKey());
}
/**
@@ -100,7 +100,7 @@ public class LayerTest {
testLayer = new LayerManagerTest.TestLayer() {
@Override
public AbstractProperty<Color> getColorProperty() {
- return new ColorProperty("test", Color.RED);
+ return new NamedColorProperty("test", Color.RED);
}
};
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/WebMarkerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/WebMarkerTest.java
index d642236..11c2eaa 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/WebMarkerTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/WebMarkerTest.java
@@ -34,7 +34,7 @@ public class WebMarkerTest {
public void testWebMarker() throws MalformedURLException {
WebMarker marker = new WebMarker(
LatLon.ZERO,
- new URL("http://something.com"),
+ new URL("http://example.com"),
new MarkerLayer(new GpxData(), null, null, null),
1d, 2d);
marker.actionPerformed(null);
diff --git a/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy b/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy
index c804928..2ad7245 100644
--- a/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy
+++ b/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy
@@ -5,7 +5,6 @@ import java.awt.Color
import org.junit.Before
import org.junit.Test
import org.openstreetmap.josm.JOSMFixture
-import org.openstreetmap.josm.Main
import org.openstreetmap.josm.data.coor.LatLon
import org.openstreetmap.josm.data.osm.DataSet
import org.openstreetmap.josm.data.osm.Node
@@ -307,7 +306,6 @@ class MapCSSParserTest {
getParser("{color: testcolour1#88DD22}").declaration().instructions.get(0).execute(e)
def expected = new Color(0x88DD22)
assert e.getCascade(Environment.DEFAULT_LAYER).get("color") == expected
- assert Main.pref.getDefaultColor("mappaint.mapcss.testcolour1") == expected
}
@Test
@@ -316,7 +314,6 @@ class MapCSSParserTest {
getParser("{color: testcolour2#12345678}").declaration().instructions.get(0).execute(e)
def expected = new Color(0x12, 0x34, 0x56, 0x78)
assert e.getCascade(Environment.DEFAULT_LAYER).get("color") == expected
- assert Main.pref.getDefaultColor("mappaint.mapcss.testcolour2") == expected
}
@Test
diff --git a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
index 0cd4621..238ed20 100644
--- a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
+++ b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
@@ -19,6 +19,7 @@ import org.openstreetmap.josm.command.DeleteCommand;
import org.openstreetmap.josm.data.UserIdentityManager;
import org.openstreetmap.josm.data.osm.User;
import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
+import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
import org.openstreetmap.josm.data.projection.Projections;
import org.openstreetmap.josm.gui.MainApplication;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
@@ -30,6 +31,7 @@ import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.io.OsmApiInitializationException;
import org.openstreetmap.josm.io.OsmConnection;
import org.openstreetmap.josm.io.OsmTransferCanceledException;
+import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.tools.I18n;
import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.Logging;
@@ -39,7 +41,6 @@ import org.openstreetmap.josm.tools.Territories;
import org.openstreetmap.josm.tools.date.DateUtils;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import org.openstreetmap.josm.spi.preferences.Config;
/**
* This class runs a test in an environment that resembles the one used by the JOSM main application.
@@ -277,7 +278,7 @@ public class JOSMTestRules implements TestRule {
cleanUpFromJosmFixture();
Config.setPreferencesInstance(Main.pref);
- Config.setBaseDirectoriesProvider(Main.pref);
+ Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
// All tests use the same timezone.
TimeZone.setDefault(DateUtils.UTC);
// Set log level to info
diff --git a/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java b/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java
index 8c32844..821dd27 100644
--- a/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java
@@ -58,10 +58,10 @@ public class TemplateParserTest {
@Test
public void testConditionWhitespace() throws ParseError {
TemplateParser parser = new TemplateParser("?{ '{name} {desc}' | '{name}' | '{desc}' }");
- Condition condition = new Condition();
- condition.getEntries().add(CompoundTemplateEntry.fromArray(new Variable("name"), new StaticText(" "), new Variable("desc")));
- condition.getEntries().add(new Variable("name"));
- condition.getEntries().add(new Variable("desc"));
+ Condition condition = new Condition(Arrays.asList(
+ CompoundTemplateEntry.fromArray(new Variable("name"), new StaticText(" "), new Variable("desc")),
+ new Variable("name"),
+ new Variable("desc")));
ReflectionAssert.assertReflectionEquals(condition, parser.parse());
}
@@ -72,10 +72,10 @@ public class TemplateParserTest {
@Test
public void testConditionNoWhitespace() throws ParseError {
TemplateParser parser = new TemplateParser("?{'{name} {desc}'|'{name}'|'{desc}'}");
- Condition condition = new Condition();
- condition.getEntries().add(CompoundTemplateEntry.fromArray(new Variable("name"), new StaticText(" "), new Variable("desc")));
- condition.getEntries().add(new Variable("name"));
- condition.getEntries().add(new Variable("desc"));
+ Condition condition = new Condition(Arrays.asList(
+ CompoundTemplateEntry.fromArray(new Variable("name"), new StaticText(" "), new Variable("desc")),
+ new Variable("name"),
+ new Variable("desc")));
ReflectionAssert.assertReflectionEquals(condition, parser.parse());
}
@@ -91,10 +91,10 @@ public class TemplateParserTest {
@Test
public void testConditionSearchExpression() throws ParseError, SearchParseError {
TemplateParser parser = new TemplateParser("?{ admin_level = 2 'NUTS 1' | admin_level = 4 'NUTS 2' | '{admin_level}'}");
- Condition condition = new Condition();
- condition.getEntries().add(new SearchExpressionCondition(compile("admin_level = 2"), new StaticText("NUTS 1")));
- condition.getEntries().add(new SearchExpressionCondition(compile("admin_level = 4"), new StaticText("NUTS 2")));
- condition.getEntries().add(new Variable("admin_level"));
+ Condition condition = new Condition(Arrays.asList(
+ new SearchExpressionCondition(compile("admin_level = 2"), new StaticText("NUTS 1")),
+ new SearchExpressionCondition(compile("admin_level = 4"), new StaticText("NUTS 2")),
+ new Variable("admin_level")));
ReflectionAssert.assertReflectionEquals(condition, parser.parse());
}
--
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