[josm] 01/04: Imported Upstream version 0.0.svn8279+dfsg1
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Mon Apr 27 20:16:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 6b169d140e4527eeac4c95631bacd08094cf1343
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Apr 27 20:25:16 2015 +0200
Imported Upstream version 0.0.svn8279+dfsg1
---
.classpath | 4 +-
REVISION | 10 +-
build.xml | 26 +-
data/defaultpresets.xml | 32 +-
data/projection/epsg | 20 +
data/validator/combinations.mapcss | 2 +-
data/validator/deprecated.mapcss | 60 +-
data/validator/opening_hours.js | 1910 ++++++--
i18n/build.xml | 7 +-
i18n/convpreset.pl | 3 +
i18n/i18n.pl | 11 +-
i18n/launchpad.pl | 8 +-
i18n/po/af.po | 453 +-
i18n/po/am.po | 453 +-
i18n/po/ar.po | 455 +-
i18n/po/ast.po | 507 +-
i18n/po/az.po | 453 +-
i18n/po/be.po | 472 +-
i18n/po/bg.po | 464 +-
i18n/po/bn.po | 461 +-
i18n/po/br.po | 453 +-
i18n/po/bs.po | 453 +-
i18n/po/ca.po | 515 +-
i18n/po/ca at valencia.po | 525 ++-
i18n/po/cs.po | 525 ++-
i18n/po/cy.po | 453 +-
i18n/po/da.po | 978 ++--
i18n/po/de.po | 713 +--
i18n/po/de_DE.po | 453 +-
i18n/po/el.po | 470 +-
i18n/po/en_AU.po | 461 +-
i18n/po/en_CA.po | 453 +-
i18n/po/en_GB.po | 504 +-
i18n/po/eo.po | 453 +-
i18n/po/es.po | 526 ++-
i18n/po/et.po | 457 +-
i18n/po/eu.po | 464 +-
i18n/po/fa.po | 453 +-
i18n/po/fi.po | 554 +--
i18n/po/fil.po | 453 +-
i18n/po/fo.po | 453 +-
i18n/po/fr.po | 825 ++--
i18n/po/gl.po | 465 +-
i18n/po/he.po | 455 +-
i18n/po/hi.po | 453 +-
i18n/po/hr.po | 462 +-
i18n/po/ht.po | 453 +-
i18n/po/hu.po | 557 +--
i18n/po/hy.po | 453 +-
i18n/po/ia.po | 453 +-
i18n/po/id.po | 506 +-
i18n/po/is.po | 455 +-
i18n/po/it.po | 512 +-
i18n/po/ja.po | 609 +--
i18n/po/ka.po | 453 +-
i18n/po/km.po | 499 +-
i18n/po/ko.po | 455 +-
i18n/po/ky.po | 453 +-
i18n/po/lo.po | 453 +-
i18n/po/lt.po | 4937 +++++++++++---------
i18n/po/lv.po | 453 +-
i18n/po/mk.po | 453 +-
i18n/po/ms.po | 453 +-
i18n/po/nb.po | 457 +-
i18n/po/nds.po | 453 +-
i18n/po/nl.po | 568 +--
i18n/po/nn.po | 453 +-
i18n/po/oc.po | 455 +-
i18n/po/pa.po | 453 +-
i18n/po/pl.po | 600 +--
i18n/po/pt.po | 508 +-
i18n/po/pt_BR.po | 534 ++-
i18n/po/rm.po | 453 +-
i18n/po/ro.po | 455 +-
i18n/po/ru.po | 533 ++-
i18n/po/sk.po | 525 ++-
i18n/po/sl.po | 455 +-
i18n/po/sq.po | 453 +-
i18n/po/sr.po | 453 +-
i18n/po/sv.po | 486 +-
i18n/po/ta.po | 453 +-
i18n/po/te.po | 453 +-
i18n/po/th.po | 453 +-
i18n/po/tr.po | 461 +-
i18n/po/ug.po | 453 +-
i18n/po/uk.po | 557 ++-
i18n/po/ur.po | 453 +-
i18n/po/vi.po | 454 +-
i18n/po/zh_CN.po | 479 +-
i18n/po/zh_TW.po | 598 +--
netbeans/nbproject/project.properties | 4 +-
src/org/openstreetmap/josm/Main.java | 2 +
.../josm/actions/AutoScaleAction.java | 86 +-
.../josm/actions/CombineWayAction.java | 34 +-
src/org/openstreetmap/josm/actions/CopyAction.java | 14 +-
.../josm/actions/DistributeAction.java | 191 +-
.../josm/actions/DownloadNotesInViewAction.java | 46 +
.../josm/actions/DownloadPrimitiveAction.java | 2 +-
.../openstreetmap/josm/actions/OpenFileAction.java | 25 +-
.../josm/actions/OpenLocationAction.java | 64 +-
.../openstreetmap/josm/actions/SaveActionBase.java | 4 +-
.../josm/actions/SearchNotesDownloadAction.java | 14 +
.../openstreetmap/josm/actions/SplitWayAction.java | 47 +-
.../downloadtasks/AbstractDownloadTask.java | 5 +
.../actions/downloadtasks/DownloadNotesTask.java | 27 +-
.../downloadtasks/DownloadNotesUrlBoundsTask.java | 27 +
.../downloadtasks/DownloadNotesUrlIdTask.java | 39 +
.../downloadtasks/DownloadOsmChangeTask.java | 17 +-
.../actions/downloadtasks/DownloadOsmIdTask.java | 46 +
.../josm/actions/mapmode/AddNoteAction.java | 22 +-
.../josm/actions/search/SearchAction.java | 66 +-
.../josm/actions/search/SearchCompiler.java | 96 +-
.../josm/actions/upload/FixDataHook.java | 23 +-
.../josm/corrector/ReverseWayTagCorrector.java | 7 +-
.../josm/data/cache/BufferedImageCacheEntry.java | 91 +
.../openstreetmap/josm/data/cache/CacheEntry.java | 29 +
.../josm/data/cache/CacheEntryAttributes.java | 66 +
.../josm/data/cache/ICachedLoaderJob.java | 47 +
.../josm/data/cache/ICachedLoaderListener.java | 26 +
.../josm/data/cache/JCSCacheManager.java | 194 +
.../josm/data/cache/JCSCachedTileLoaderJob.java | 422 ++
.../josm/data/imagery/TMSCachedTileLoader.java | 91 +
.../josm/data/imagery/TMSCachedTileLoaderJob.java | 247 +
src/org/openstreetmap/josm/data/osm/NoteData.java | 57 +-
src/org/openstreetmap/josm/data/osm/OsmUtils.java | 4 +-
.../josm/data/osm/SimplePrimitiveId.java | 2 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 4 +-
.../osm/visitor/paint/relations/Multipolygon.java | 41 +-
.../josm/data/projection/Ellipsoid.java | 5 +
.../josm/data/projection/Projections.java | 1 +
.../josm/data/validation/tests/CrossingWays.java | 2 +-
.../data/validation/tests/MapCSSTagChecker.java | 168 +-
.../data/validation/tests/MultipolygonTest.java | 57 +-
.../josm/data/validation/tests/NameMismatch.java | 11 +-
.../data/validation/tests/OpeningHourTest.java | 2 +-
.../openstreetmap/josm/gui/MainApplication.java | 43 +-
src/org/openstreetmap/josm/gui/MainMenu.java | 4 +
src/org/openstreetmap/josm/gui/MapFrame.java | 6 +-
.../openstreetmap/josm/gui/NoteInputDialog.java | 5 +-
.../josm/gui/bbox/SlippyMapBBoxChooser.java | 14 +-
.../josm/gui/dialogs/ChangesetDialog.java | 37 +-
.../josm/gui/dialogs/NotesDialog.java | 26 +-
.../dialogs/properties/PropertiesCellRenderer.java | 33 +-
.../gui/dialogs/properties/PropertiesDialog.java | 7 +-
.../josm/gui/dialogs/properties/TagEditHelper.java | 30 +-
.../gui/dialogs/relation/sort/RelationSorter.java | 19 +
.../josm/gui/download/DownloadDialog.java | 27 +-
.../josm/gui/history/DiffTableModel.java | 20 +-
.../josm/gui/history/HistoryBrowserModel.java | 31 +-
.../josm/gui/history/NodeListViewer.java | 38 +-
.../josm/gui/history/TwoColumnDiff.java | 19 +-
.../josm/gui/history/VersionInfoPanel.java | 46 +-
.../josm/gui/io/BasicUploadSettingsPanel.java | 7 +-
.../io/DownloadPrimitivesWithReferrersTask.java | 5 +-
.../openstreetmap/josm/gui/io/UploadDialog.java | 8 +-
.../openstreetmap/josm/gui/layer/NoteLayer.java | 25 +-
src/org/openstreetmap/josm/gui/layer/TMSLayer.java | 201 +-
.../josm/gui/layer/geoimage/GeoImageLayer.java | 4 +-
.../josm/gui/mappaint/BoxTextElemStyle.java | 39 +-
.../josm/gui/mappaint/Environment.java | 19 +-
.../josm/gui/mappaint/NodeElemStyle.java | 33 +-
.../openstreetmap/josm/gui/mappaint/StyleKeys.java | 1 +
.../josm/gui/mappaint/mapcss/Condition.java | 27 +-
.../gui/mappaint/mapcss/ExpressionFactory.java | 68 +
.../josm/gui/mappaint/mapcss/MapCSSParser.jj | 240 +-
.../josm/gui/mappaint/mapcss/Selector.java | 50 +-
.../preferences/display/LanguagePreference.java | 10 +-
.../gui/preferences/imagery/TMSSettingsPanel.java | 41 +-
.../server/AuthenticationPreferencesPanel.java | 16 +-
...ssagesNotifierPanel.java => FeaturesPanel.java} | 19 +-
.../josm/gui/tagging/TaggingPreset.java | 2 +
.../gui/tagging/ac/AutoCompletingComboBox.java | 10 +
.../gui/tagging/ac/AutoCompletingTextField.java | 12 +-
.../openstreetmap/josm/gui/util/RotationAngle.java | 121 +
.../josm/io/BoundingBoxDownloader.java | 68 +-
src/org/openstreetmap/josm/io/NoteReader.java | 36 +-
src/org/openstreetmap/josm/io/NoteWriter.java | 6 +-
src/org/openstreetmap/josm/io/OsmServerReader.java | 4 +-
.../josm/io/remotecontrol/RequestProcessor.java | 3 +-
.../io/remotecontrol/handler/ImageryHandler.java | 30 +-
.../io/remotecontrol/handler/ImportHandler.java | 66 +-
.../remotecontrol/handler/LoadAndZoomHandler.java | 8 +-
.../io/remotecontrol/handler/LoadDataHandler.java | 77 +-
.../remotecontrol/handler/LoadObjectHandler.java | 6 +-
.../io/remotecontrol/handler/RequestHandler.java | 85 +-
src/org/openstreetmap/josm/tools/ExifReader.java | 11 +-
src/org/openstreetmap/josm/tools/I18n.java | 12 +-
src/org/openstreetmap/josm/tools/LanguageInfo.java | 65 +-
styles/standard/elemstyles.mapcss | 19 +-
taginfoextract.groovy | 182 +-
test/unit/org/openstreetmap/josm/TestUtils.java | 22 -
.../openstreetmap/josm/actions/CopyActionTest.java | 35 +
.../josm/actions/SplitWayActionTest.java | 96 +
.../josm/actions/search/SearchCompilerTest.java | 34 +
.../josm/corrector/ReverseWayTagCorrectorTest.java | 2 +
.../openstreetmap/josm/data/osm/OsmUtilsTest.java | 40 +
.../josm/data/osm/SimplePrimitiveIdTest.groovy | 6 +
.../validation/tests/MapCSSTagCheckerTest.java | 60 +-
.../data/validation/tests/NameMismatchTest.java | 61 +
.../gui/mappaint/mapcss/KeyConditionTest.groovy | 4 +-
.../mappaint/mapcss/KeyValueConditionTest.groovy | 4 +-
.../josm/gui/util/RotationAngleTest.java | 26 +
.../remotecontrol/handler/ImportHandlerTest.java | 19 +
.../remotecontrol/handler/RequestHandlerTest.java | 85 +
204 files changed, 29340 insertions(+), 20625 deletions(-)
diff --git a/.classpath b/.classpath
index 43e9d84..cb621a3 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="org/apache/commons/compress/compressors/lzma/|org/apache/commons/compress/compressors/xz/|org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzip/|org/apache/commons/compress/compressors/lzw/|org/apache/commons/compress/compressors/pack200/|org/apache/commons/compress/compressors/snappy/|org/apache/commons/compress/compressors/z/" kind="src" path="src"/>
+ <classpathentry excluding="org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzip/|org/apache/commons/compress/compressors/lzma/|org/apache/commons/compress/compressors/lzw/|org/apache/commons/compress/compressors/pack200/|org/apache/commons/compress/compressors/snappy/|org/apache/commons/compress/compressors/xz/|org/apache/commons/compress/compressors/z/|org/apache/commons/jcs/au [...]
<classpathentry kind="src" path="test/unit"/>
<classpathentry kind="src" path="test/functional"/>
<classpathentry kind="src" path="test/performance"/>
@@ -13,7 +13,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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_76"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80"/>
<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
<classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.jar"/>
<classpathentry kind="lib" path="test/lib/unitils-core/commons-lang-2.3.jar"/>
diff --git a/REVISION b/REVISION
index f6c199d..9011700 100644
--- a/REVISION
+++ b/REVISION
@@ -1,18 +1,18 @@
<?xml version="1.0"?>
<info>
<entry
+ kind="dir"
path="trunk"
- revision="8159"
- kind="dir">
+ revision="8279">
<url>http://josm.openstreetmap.de/svn/trunk</url>
<repository>
<root>http://josm.openstreetmap.de/svn</root>
<uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
</repository>
<commit
- revision="8159">
-<author>stoecker</author>
-<date>2015-03-29T12:37:50.444628Z</date>
+ revision="8279">
+<author>Klumbumbus</author>
+<date>2015-04-26T20:42:34.594552Z</date>
</commit>
</entry>
</info>
diff --git a/build.xml b/build.xml
index 7435674..c3152c3 100644
--- a/build.xml
+++ b/build.xml
@@ -215,11 +215,28 @@ Build-Date: ${build.tstamp}
</target>
<target name="compile" depends="init,javacc,jaxb">
<!-- COTS -->
- <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on"
- excludes="org/apache/commons/compress/compressors/lzma/**,org/apache/commons/compress/compressors/xz/**,org/apache/commons/compress/compressors/CompressorStreamFactory.java,org/apache/commons/compress/compressors/deflate/**,org/apache/commons/compress/compressors/gzip/**,org/apache/commons/compress/compressors/lzw/**,org/apache/commons/compress/compressors/pack200/**,org/apache/commons/compress/compressors/snappy/**,org/apache/commons/compress/compressors/z/**"
- destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="iso-8859-1">
+ <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1"
+ destdir="build" target="1.7" source="1.7" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
<!-- get rid of "internal proprietary API" warning -->
<compilerarg value="-XDignore.symbol.file"/>
+ <exclude name="org/apache/commons/compress/compressors/lzma/**"/>
+ <exclude name="org/apache/commons/compress/compressors/xz/**"/>
+ <exclude name="org/apache/commons/compress/compressors/CompressorStreamFactory.java"/>
+ <exclude name="org/apache/commons/compress/compressors/deflate/**"/>
+ <exclude name="org/apache/commons/compress/compressors/gzip/**"/>
+ <exclude name="org/apache/commons/compress/compressors/lzw/**"/>
+ <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/jcs/admin/**"/>
+ <exclude name="org/apache/commons/jcs/auxiliary/disk/jdbc/**"/>
+ <exclude name="org/apache/commons/jcs/auxiliary/remote/**"/>
+ <exclude name="org/apache/commons/jcs/utils/servlet/**"/>
+ <exclude name="org/apache/commons/logging/impl/AvalonLogger.java"/>
+ <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"/>
+ <exclude name="org/apache/commons/logging/impl/Log4JLogger.java"/>
+ <exclude name="org/apache/commons/logging/impl/LogKitLogger.java"/>
+ <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"/>
</javac>
<!-- JMapViewer/JOSM -->
<javac srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
@@ -426,6 +443,7 @@ Build-Date: ${build.tstamp}
-keep class * extends org.openstreetmap.josm.io.FileExporter
-keep class org.w3._2001.xmlschema.Adapter1
-keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never
+ -keep class org.apache.commons.logging.impl.*
-keepclassmembers enum * {
public static **[] values();
@@ -543,7 +561,7 @@ Build-Date: ${build.tstamp}
<ignore classname="org.objectweb.*"/>
<ignore classname="org.python.*"/>
<ignore classname="org.slf4j.*"/>
- <!-- plugins used by another ones -->
+ <!-- plugins used by another ones -->
<ignore classname="org.openstreetmap.josm.plugins.geotools.*"/>
<ignore classname="org.openstreetmap.josm.plugins.jna.*"/>
<ignore classname="org.openstreetmap.josm.plugins.jts.*"/>
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index a1a1a10..9b279fc 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -228,8 +228,14 @@
<text key="description" text="Description"/>
</chunk>
<chunk id="leaf">
- <combo key="leaf_type" text="Type" values="broadleaved,needleleaved,mixed,leafless" />
- <combo key="leaf_cycle" text="Cycle" values="deciduous,evergreen,semi_deciduous,semi_evergreen,mixed" />
+ <combo key="leaf_type" text="Type" values="broadleaved,needleleaved,mixed,leafless" values_searchable="true" />
+ <combo key="leaf_cycle" text="Cycle" values_searchable="true" >
+ <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
+ <list_entry value="evergreen" short_description="Plants that are never entirely without green foliage." />
+ <list_entry value="semi_deciduous" short_description="Plants that lose their foliage for a very short period, when old leaves fall off and new foliage growth is starting." />
+ <list_entry value="semi_evergreen" short_description="Plants that lose most, but not all, of their foliage for a fraction of the year." />
+ <list_entry value="mixed" short_description="Habitat with evergreen and deciduous vegetation." />
+ </combo>
</chunk>
<chunk id="religious">
<text key="name" text="Name" />
@@ -1393,6 +1399,7 @@
<text key="genus" text="Genus" />
<text key="species" text="Species" />
<text key="taxon" text="Taxon" />
+ <reference ref="leaf" />
</optional>
</item> <!-- Hedge -->
<item name="Fence" icon="presets/fence.png" type="way,closedway" preset_name_label="true">
@@ -2032,6 +2039,7 @@
<space />
<key key="leisure" value="marina" />
<text key="name" text="Name" />
+ <combo key="sanitary_dump_station" text="Dump Station" values="yes,public,customers,no" />
</item> <!-- Marina -->
<item name="Pier" icon="presets/pier.png" type="node,way,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier"
@@ -2528,6 +2536,7 @@
<space />
<key key="shop" value="car" />
<reference ref="name_brand_operator_oh_wheelchair" />
+ <combo key="second_hand" text="Second hand" values="only,yes,no" />
<reference ref="link_contact_address_payment" />
</item> <!-- Car Dealer -->
<item name="Repair" icon="presets/car_repair.png" type="node,closedway" preset_name_label="true">
@@ -2571,7 +2580,6 @@
<space />
<key key="amenity" value="car_rental" />
<reference ref="name_brand_operator_oh_wheelchair" />
- <combo key="second_hand" text="Second hand" values="only,yes,no" />
<reference ref="link_contact_address_payment" />
</item> <!-- Rental -->
<item name="Sharing" icon="presets/car_sharing.png" type="node,closedway" preset_name_label="true">
@@ -2762,6 +2770,7 @@
<roles>
<role key="stop" text="Stop Position" requisite="optional" type="node" member_expression="public_transport=stop_position" />
<role key="platform" text="Platform" requisite="optional" type="node,way,closedway,relation" member_expression="public_transport=platform" />
+ <role key="" text="Subway Entrance" requisite="optional" type="node" member_expression="railway=subway_entrance" />
<role key="" text="Station or amenities" requisite="optional" type="node,way,closedway" member_expression="amenity|public_transport=station" />
</roles>
</item> <!-- Stop Area -->
@@ -3220,13 +3229,14 @@
<combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
<reference ref="wheelchair" />
<space />
- <reference ref="internet_smoking" />
- <space />
<text key="capacity" text="Number of places" />
<reference ref="fee_interval" />
+ <combo key="sanitary_dump_station" text="Dump Station" values="yes,public,customers,no" />
<check key="power_supply" text="Power supply" />
<check key="tents" text="Tents allowed" />
<space />
+ <reference ref="internet_smoking" />
+ <space />
<reference ref="link_contact_address_payment" />
</item> <!-- Caravan Site/RV Park -->
<item name="Camping Site" icon="styles/standard/accommodation/camping.png" type="node,closedway" preset_name_label="true">
@@ -3243,6 +3253,7 @@
<reference ref="name_operator" />
<combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
<reference ref="wheelchair" />
+ <combo key="sanitary_dump_station" text="Dump Station" values="yes,public,customers,no" />
<space />
<reference ref="internet_smoking" />
<space />
@@ -4493,6 +4504,17 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=waste_disposal" />
<key key="amenity" value="waste_disposal" />
</item> <!-- Waste Disposal/Dumpster -->
+ <item name="Sanitary Dump Station" icon="styles/standard/service/recycling/sanitary_dump_station.svg" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=sanitary_dump_station" />
+ <space />
+ <key key="amenity" value="sanitary_dump_station" />
+ <check key="sanitary_dump_station:suction" text="Suction pumpout" />
+ <check key="sanitary_dump_station:gravity" text="Gravity dump station" />
+ <combo key="access" text="Access" values="yes,public,customers,no" />
+ <reference ref="fee" />
+ <text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Operation times" values="24/7" />
+ </item> <!-- Sanitary Dump Station -->
<separator/>
<item name="Bench" icon="presets/bench.png" type="node,way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench"
diff --git a/data/projection/epsg b/data/projection/epsg
index 148eb00..dae53c0 100644
--- a/data/projection/epsg
+++ b/data/projection/epsg
@@ -1,3 +1,23 @@
+# NAD27(76) / MTM zone 8
+<2017> +proj=tmerc +lat_0=0 +lon_0=-73.5 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-75.5,40,-74,60 <>
+# NAD27(76) / MTM zone 9
+<2018> +proj=tmerc +lat_0=0 +lon_0=-76.5 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-78.5,40,-74.5,60 <>
+# NAD27(76) / MTM zone 10
+<2019> +proj=tmerc +lat_0=0 +lon_0=-79.5 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-81.5,40,-77.5,60 <>
+# NAD27(76) / MTM zone 11
+<2020> +proj=tmerc +lat_0=0 +lon_0=-82.5 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-84,40,-80.5,60 <>
+# NAD27(76) / MTM zone 12
+<2021> +proj=tmerc +lat_0=0 +lon_0=-81 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-83,40,-79,60 <>
+# NAD27(76) / MTM zone 13
+<2022> +proj=tmerc +lat_0=0 +lon_0=-84 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-86,40,-82,60 <>
+# NAD27(76) / MTM zone 14
+<2023> +proj=tmerc +lat_0=0 +lon_0=-87 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-89,40,-85,60 <>
+# NAD27(76) / MTM zone 15
+<2024> +proj=tmerc +lat_0=0 +lon_0=-90 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-92,40,-88,60 <>
+# NAD27(76) / MTM zone 16
+<2025> +proj=tmerc +lat_0=0 +lon_0=-93 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-95,40,-91,60 <>
+# NAD27(76) / MTM zone 17
+<2026> +proj=tmerc +lat_0=0 +lon_0=-96 +k=0.9999 +x_0=304800 +y_0=0 +ellps=clrk66 +bounds=-96,40,-94,60 <>
# Lambert 93 (France)
<2154> +proj=lcc +lat_0=46.5 +lat_1=44 +lat_2=49 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +nadgrids=null +bounds=-5.5,41,10.2,51 <>
# PUWG 2000 Zone 5 (Poland)
diff --git a/data/validator/combinations.mapcss b/data/validator/combinations.mapcss
index 5f3f280..58809d7 100644
--- a/data/validator/combinations.mapcss
+++ b/data/validator/combinations.mapcss
@@ -197,7 +197,7 @@ way[waterway][bridge=yes] {
/* see #9811 */
*[place][place!=farm][/^addr:/],
*[boundary][/^addr:/],
-*[highway][/^addr:/] {
+*[highway][/^addr:/][highway!=services][highway!=rest_area] {
throwWarning: tr("{0} together with addr:*", "{0.key}");
}
diff --git a/data/validator/deprecated.mapcss b/data/validator/deprecated.mapcss
index b350c3c..6dfab2b 100644
--- a/data/validator/deprecated.mapcss
+++ b/data/validator/deprecated.mapcss
@@ -47,7 +47,7 @@
/* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
fixAdd: "highway=road";
- fixAdd: "incline=unpaved";
+ fixAdd: "surface=unpaved";
}
*[landuse=wood] {
@@ -410,4 +410,62 @@ way[oneway=1] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "oneway=yes";
fixAdd: "oneway=yes";
+}
+
+/* see #11329 */
+way[oneway=-1] {
+ throwWarning: tr("{0} is not recommended. Use the Reverse Ways function from the Tools menu.", "{0.tag}");
+}
+
+*[drinkable] {
+ throwWarning: tr("{0} is deprecated", "{0.key}");
+ suggestAlternative: "drinking_water";
+}
+
+/* see #10329 */
+*[color][!colour] {
+ throwWarning: tr("{0} is deprecated", "{0.key}");
+ suggestAlternative: "colour";
+ fixChangeKey: "color => colour";
+}
+*[color][colour][tag(color)=tag(colour)] {
+ throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+ set samecolor;
+ fixRemove: "color";
+}
+*[color][colour]!.samecolor {
+ throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+}
+*[/:color/]{
+ throwWarning: tr("{0} is deprecated", "{0.key}");
+ suggestAlternative: ":colour";
+}
+*[/color:/] {
+ throwWarning: tr("{0} is deprecated", "{0.key}");
+ suggestAlternative: "colour:";
+}
+
+/* see #11234 */
+*[/=|\+|\/|&|<|>|;|'|"|%|#|@|\\|,|\./] {
+ throwWarning: tr("key with uncommon character");
+}
+
+/* see #11330 */
+*[/^.$/],
+node[/^..$/],
+way[/^..$/],
+relation[/^..$/][!to] {
+ throwWarning: tr("uncommon short key");
+}
+
+/* see #11344 */
+*[tower=air_to_ground] {
+ throwWarning: tr("{0} is deprecated", "{0.tag}");
+ suggestAlternative: "tower=transition";
+ fixAdd: "tower=transition";
+}
+*[pole=air_to_ground] {
+ throwWarning: tr("{0} is deprecated", "{0.tag}");
+ suggestAlternative: "pole=transition";
+ fixAdd: "pole=transition";
}
\ No newline at end of file
diff --git a/data/validator/opening_hours.js b/data/validator/opening_hours.js
index a43e839..1f37775 100644
--- a/data/validator/opening_hours.js
+++ b/data/validator/opening_hours.js
@@ -7,33 +7,41 @@
/* jshint loopfunc: true */
(function (root, factory) {
- // constants (holidays, error correction) {{{
- // holidays {{{
+ /* constants (holidays, error correction) {{{ */
+ /* holidays {{{ */
+ /*
+ * The country code keys and the PH, SH keys are surrounded by '':
+ * :%s/^\s\+\zs"\([^"]\+\)"\(: {\)/'\1'\2/
+ * Fixed the indention with Vim Marco:
+ * /'PH'<cr>f{jVk%k,a:
+ * Fixed spacing in parenthesis:
+ * :%s/\[\zs\([^ ]\)/ \1/e | %s/\([^ ]\)\]/\1 \]/e | %s/,\([^ ]\)/, \1/e
+ */
var holidays = {
'fr': { // {{{
'PH': { // http://fr.wikipedia.org/wiki/F%C3%AAtes_et_jours_f%C3%A9ri%C3%A9s_en_France
- "Jour de l'an" : [ 1, 1 ],
- "Vendredi saint" : [ 'easter', -2, [ 'Moselle', 'Bas-Rhin', 'Haut-Rhin', 'Guadeloupe', 'Martinique', 'Polynésie française' ] ],
- "Lundi de Pâques" : [ 'easter', 1 ],
- "Saint-Pierre-Chanel" : [ 4, 28, [ 'Wallis-et-Futuna' ] ],
- "Fête du Travail" : [ 5, 1 ],
- "Fête de la Victoire" : [ 5, 8 ],
- "Abolition de l'esclavage" : [ 5, 22, [ 'Martinique' ] ],
- "Abolition de l'esclavage" : [ 5, 27, [ 'Guadeloupe' ] ],
- "Jeudi de l'Ascension" : [ 'easter', 39 ],
- "Lundi de Pentecôte" : [ 'easter', 50 ],
- "Abolition de l'esclavage" : [ 6, 10, [ 'Guyane' ] ],
- "Fête de l'autonomie" : [ 6, 29, [ 'Polynésie française' ] ],
- "Fête nationale" : [ 7, 14 ],
- "Fête Victor Schoelcher" : [ 7, 21, [ 'Guadeloupe', 'Martinique' ] ],
- "Fête du Territoire" : [ 7, 29, [ 'Wallis-et-Futuna' ] ],
- "Assomption" : [ 8, 15 ],
- "Fête de la citoyenneté" : [ 9, 24, [ 'Nouvelle-Calédonie' ] ],
- "Toussaint" : [ 11, 1 ],
- "Armistice" : [ 11, 11 ],
- "Abolition de l'esclavage" : [ 12, 20, [ 'Réunion' ] ],
- "Noël" : [ 12, 25 ],
- "Saint-Étienne " : [ 12, 26, [ 'Moselle', 'Bas-Rhin', 'Haut-Rhin' ] ]
+ "Jour de l'an" : [ 1, 1 ],
+ "Vendredi saint" : [ 'easter', -2, [ 'Moselle', 'Bas-Rhin', 'Haut-Rhin', 'Guadeloupe', 'Martinique', 'Polynésie française' ] ],
+ "Lundi de Pâques" : [ 'easter', 1 ],
+ "Saint-Pierre-Chanel" : [ 4, 28, [ 'Wallis-et-Futuna' ] ],
+ "Fête du Travail" : [ 5, 1 ],
+ "Fête de la Victoire" : [ 5, 8 ],
+ "Abolition de l'esclavage (Martinique)" : [ 5, 22, [ 'Martinique' ] ],
+ "Abolition de l'esclavage (Guadeloupe)" : [ 5, 27, [ 'Guadeloupe' ] ],
+ "Jeudi de l'Ascension" : [ 'easter', 39 ],
+ "Lundi de Pentecôte" : [ 'easter', 50 ],
+ "Abolition de l'esclavage (Guyane)" : [ 6, 10, [ 'Guyane' ] ],
+ "Fête de l'autonomie" : [ 6, 29, [ 'Polynésie française' ] ],
+ "Fête nationale" : [ 7, 14 ],
+ "Fête Victor Schoelcher" : [ 7, 21, [ 'Guadeloupe', 'Martinique' ] ],
+ "Fête du Territoire" : [ 7, 29, [ 'Wallis-et-Futuna' ] ],
+ "Assomption" : [ 8, 15 ],
+ "Fête de la citoyenneté" : [ 9, 24, [ 'Nouvelle-Calédonie' ] ],
+ "Toussaint" : [ 11, 1 ],
+ "Armistice" : [ 11, 11 ],
+ "Abolition de l'esclavage (Réunion)" : [ 12, 20, [ 'Réunion' ] ],
+ "Noël" : [ 12, 25 ],
+ "Saint-Étienne " : [ 12, 26, [ 'Moselle', 'Bas-Rhin', 'Haut-Rhin' ] ]
}
}, // }}}
'de': { // {{{
@@ -1308,6 +1316,434 @@
},
},
}, // }}}
+ 'ru': { // {{{
+ 'PH': { // https://ru.wikipedia.org/wiki/%D0%9F%D1%80%D0%B0%D0%B7%D0%B4%D0%BD%D0%B8%D0%BA%D0%B8_%D0%A0%D0%BE%D1%81%D1%81%D0%B8%D0%B8
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ },
+ 'Tatarstan': { // https://ru.wikipedia.org/wiki/%D0%9F%D1%80%D0%B0%D0%B7%D0%B4%D0%BD%D0%B8%D0%BA%D0%B8_%D0%A2%D0%B0%D1%82%D0%B0%D1%80%D1%81%D1%82%D0%B0%D0%BD%D0%B0
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "Ураза-байрам": [ 7, 28 ],
+ "День Республики Татарстан": [ 8, 30 ],
+ "Курбан-байрам": [ 10, 4 ],
+ "День Конституции Республики Татарстан": [ 11, 6 ],
+ },
+ },
+ 'Bashkortostan': { // https://ru.wikipedia.org/wiki/%D0%9F%D1%80%D0%B0%D0%B7%D0%B4%D0%BD%D0%B8%D0%BA%D0%B8_%D0%91%D0%B0%D1%88%D0%BA%D0%BE%D1%80%D1%82%D0%BE%D1%81%D1%82%D0%B0%D0%BD%D0%B0
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "Ураза-байрам": [ 7, 28 ],
+ "Курбан-байрам": [ 10, 4 ],
+ "День Республики Башкирии": [ 10, 11 ],
+ "День Конституции Башкортостана": [ 12, 24 ],
+ },
+ },
+ 'Chuvashia': {
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "День Чувашской республики": [ 6, 24 ],
+ },
+ },
+ 'Sakha Republic': { // https://ru.wikipedia.org/wiki/%D0%AF%D0%BA%D1%83%D1%82%D0%B8%D1%8F#.D0.9F.D1.80.D0.B0.D0.B7.D0.B4.D0.BD.D0.B8.D0.BA.D0.B8_.D0.AF.D0.BA.D1.83.D1.82.D0.B8.D0.B8
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "День Республики Саха": [ 4, 27 ],
+ "Ысыах": [ 6, 23 ],
+ "День государственности Республики Саха": [ 9, 27 ],
+ },
+ },
+ 'Republic of Kalmykia': { // https://ru.wikipedia.org/wiki/%D0%9F%D1%80%D0%B0%D0%B7%D0%B4%D0%BD%D0%B8%D0%BA%D0%B8_%D0%B8_%D0%BF%D0%B0%D0%BC%D1%8F%D1%82%D0%BD%D1%8B%D0%B5_%D0%B4%D0%B0%D1%82%D1%8B_%D0%9A%D0%B0%D0%BB%D0%BC%D1%8B%D0%BA%D0%B8%D0%B8
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "Цаган Сар": [ 1, 14 ],
+ "День принятия Степного Уложения (Конституции) Республики Калмыкия": [ 4, 5 ],
+ "День рождения Будды Шакьямун": [ 6, 6 ],
+ "Зул": [ 12, 15 ],
+ "День памяти жертв депортации калмыцкого народа": [ 12, 28 ],
+ },
+ },
+ 'Buryatia': { // https://ru.wikipedia.org/wiki/%D0%9F%D1%80%D0%B0%D0%B7%D0%B4%D0%BD%D0%B8%D0%BA%D0%B8_%D0%91%D1%83%D1%80%D1%8F%D1%82%D0%B8%D0%B8
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ //
+ "Сагаалган": [ 1, 14 ],
+ },
+ },
+ 'Republic of Karelia': { // https://ru.wikipedia.org/wiki/%D0%9F%D1%80%D0%B0%D0%B7%D0%B4%D0%BD%D0%B8%D0%BA%D0%B8_%D0%A0%D0%B5%D1%81%D0%BF%D1%83%D0%B1%D0%BB%D0%B8%D0%BA%D0%B8_%D0%9A%D0%B0%D1%80%D0%B5%D0%BB%D0%B8%D1%8F
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "День Республики Карелия": [ 6, 8 ],
+ "День освобождения Карелии от фашистских захватчиков": [ 9, 30 ],
+ },
+ },
+ 'Удмуртская республика': {
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "День Государственности Удмуртской Республики": [ 5, 31 ],
+ },
+ },
+ 'Adygea': {
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "Ураза-байрам": [ 7, 28 ],
+ "Курбан-байрам": [ 10, 4 ],
+ "День образования Республики Адыгея": [ 10, 5 ],
+ },
+ },
+ 'Republic of Dagestan': { // https://ru.wikipedia.org/wiki/%D0%9F%D1%80%D0%B0%D0%B7%D0%B4%D0%BD%D0%B8%D0%BA%D0%B8_%D0%94%D0%B0%D0%B3%D0%B5%D1%81%D1%82%D0%B0%D0%BD%D0%B0
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "День Конституции Республики Дагестан": [ 7, 26 ],
+ "Ураза-байрам": [ 7, 28 ],
+ "День единства народов Дагестана": [ 9, 15 ],
+ "Курбан-байрам": [ 10, 4 ],
+ },
+ },
+ 'Ingushetia': { // https://ru.wikipedia.org/wiki/%D0%9F%D1%80%D0%B0%D0%B7%D0%B4%D0%BD%D0%B8%D0%BA%D0%B8_%D0%98%D0%BD%D0%B3%D1%83%D1%88%D0%B5%D1%82%D0%B8%D0%B8
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "День образования Республики Ингушетия": [ 6, 4 ],
+ "Ураза-байрам": [ 7, 28 ],
+ "Курбан-байрам": [ 10, 4 ],
+ },
+ },
+ 'Карачаево-Черкесская республика': {
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "День возрождения карачаевского народа": [ 5, 3 ],
+ "Ураза-байрам": [ 7, 28 ],
+ "Курбан-байрам": [ 10, 4 ],
+ },
+ },
+ 'Chechen Republic': { // https://ru.wikipedia.org/wiki/%D0%9F%D1%80%D0%B0%D0%B7%D0%B4%D0%BD%D0%B8%D0%BA%D0%B8_%D0%A7%D0%B5%D1%87%D0%BD%D0%B8
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "День мира в Чеченской Республике": [ 4, 16 ],
+ "Ураза-байрам": [ 7, 28 ],
+ "Курбан-байрам": [ 10, 4 ],
+ },
+ },
+ 'Кабардино-Балкарская республика': {
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "День возрождения балкарского народа": [ 3, 28 ],
+ "Черкесский день траура": [ 5, 21 ],
+ "Ураза-байрам": [ 7, 28 ],
+ "День государственности Кабардино-Балкарской Республики": [ 9, 1 ],
+ "Курбан-байрам": [ 10, 4 ],
+ },
+ },
+ 'Altai Republic': {
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "Чага-Байрам": [ 1, 14 ],
+ },
+ },
+ 'Tuva': {
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "Народный праздник Шагаа": [ 1, 14 ],
+ "День Республики Тыва": [ 8, 15 ],
+ },
+ },
+ 'Saratov Oblast': {
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "Радоница": [ 4, 29 ],
+ },
+ },
+ 'Bryansk Oblast': {
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "Радоница": [ 4, 29 ],
+ "День освобождения города Брянска": [ 9, 17 ],
+ },
+ },
+ 'Komi Republic': {
+ 'PH': {
+ "1. Новогодние каникулы": [ 1, 1 ],
+ "2. Новогодние каникулы": [ 1, 2 ],
+ "3. Новогодние каникулы": [ 1, 3 ],
+ "4. Новогодние каникулы": [ 1, 4 ],
+ "5. Новогодние каникулы": [ 1, 5 ],
+ "6. Новогодние каникулы": [ 1, 6 ],
+ "Рождество Христово": [ 1, 7 ],
+ "8. Новогодние каникулы": [ 1, 8 ],
+ "День защитника Отечества": [ 2, 23 ],
+ "Международный женский день": [ 3, 8 ],
+ "День Победы": [ 5, 9 ],
+ "Праздник Весны и Труда": [ 5, 1 ],
+ "День народного единства": [ 11, 4 ],
+ "День России": [ 6, 12 ],
+ // local
+ "День Республики Коми": [ 8, 22 ],
+ },
+ },
+ }, // }}}
'ua': { // {{{
'PH': { // http://uk.wikipedia.org/wiki/%D0%A1%D0%B2%D1%8F%D1%82%D0%B0_%D1%82%D0%B0_%D0%BF%D0%B0%D0%BC%27%D1%8F%D1%82%D0%BD%D1%96_%D0%B4%D0%BD%D1%96_%D0%B2_%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%96
"Новий рік" : [ 1, 1 ],
@@ -1321,6 +1757,866 @@
"День Незалежності України" : [ 8, 24 ],
}
}, // }}}
+ 'us': { // {{{
+ 'PH': { // https://en.wikipedia.org/wiki/Public_holidays_in_the_United_States
+ "New Year's Day" : [ 1, 1 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ]
+ },
+ 'Alabama': {
+ 'PH': { // http://www.archives.alabama.gov/intro/holidays.html
+ "New Year's Day" : [ 1, 1 ],
+ "Robert E. Lee/Martin Luther King Birthday" : [ "firstJanuaryMonday", 14 ],
+ "George Washington/Thomas Jefferson Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Confederate Memorial Day" : [ "firstAprilMonday", 21 ],
+ "Jefferson Davis' Birthday" : [ "firstJuneMonday", 0 ]
+ }
+ },
+ 'Alaska': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Seward's Day" : [ "lastMarchMonday", 0 ],
+ "Alaska Day" : [ 10, 18 ]
+ }
+ },
+ 'Arizona': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Dr. Martin Luther King Jr./Civil Rights Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ]
+ }
+ },
+ 'Arkansas': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Dr. Martin Luther King Jr. and Robert E. Lee's Birthdays" : [ "firstJanuaryMonday", 14 ],
+ "George Washington's Birthday and Daisy Gatson Bates Day" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Eve" : [ 12, 24 ],
+ "Christmas Day" : [ 12, 25 ]
+ }
+ },
+ 'California': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "César Chávez Day" : [ 3, 31 ]
+ }
+ },
+ 'Colorado': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ]
+ }
+ },
+ 'Connecticut': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Lincoln's Birthday" : [ 2, 12 ],
+ "Good Friday" : [ "easter", -2 ]
+ }
+ },
+ 'Delaware': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Day After Thanksgiving" : [ "firstNovemberThursday", 22 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Good Friday" : [ "easter", -2 ]
+ }
+ },
+ 'District of Columbia': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Emancipation Day" : [ 4, 16 ]
+ }
+ },
+ 'Florida': {
+ 'PH': { // http://www.leg.state.fl.us/Statutes/index.cfm?App_mode=Display_Statute&Search_String=&URL=0100-0199/0110/Sections/0110.117.html
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Friday after Thanksgiving" : [ "firstNovemberThursday", 22 ],
+ "Christmas Day" : [ 12, 25 ]
+ }
+ },
+ 'Georgia': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Robert E. Lee's Birthday" : [ "firstNovemberThursday", 22 ],
+ "Washington's Birthday" : [ 12, 24 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Confederate Memorial Day" : [ "lastAprilMonday", 0 ]
+ }
+ },
+ 'Guam': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Guam Discovery Day" : [ 3, 5 ],
+ "Good Friday" : [ "easter", -2 ],
+ "Liberation Day" : [ 7, 21 ],
+ "All Souls' Day" : [ 11, 2 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Lady of Camarin Day" : [ 12, 8 ],
+ "Christmas Day" : [ 12, 25 ],
+ }
+ },
+ 'Hawaii': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Prince Jonah Kuhio Kalanianaole Day" : [ 3, 26 ],
+ "Kamehameha Day" : [ 6, 11 ],
+ "Statehood Day" : [ "firstAugustFriday", 14 ],
+ "Election Day" : [ "firstNovemberMonday", 1 ]
+ }
+ },
+ 'Idaho': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr.-Idaho Human Rights Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ]
+ }
+ },
+ 'Illinois': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Lincoln's Birthday" : [ 2, 12 ],
+ "Casimir Pulaski Day" : [ "firstMarchMonday", 0 ],
+ "Election Day" : [ "firstNovemberMonday", 1 ]
+ }
+ },
+ 'Indiana': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Lincoln's Birthday" : [ "firstNovemberThursday", 22 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Good Friday" : [ "easter", -2 ],
+ "Primary Election Day" : [ "firstMayMonday", 1 ],
+ "Election Day" : [ "firstNovemberMonday", 1 ]
+ }
+ },
+ 'Iowa': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Lincoln's Birthday" : [ 2, 12 ]
+ }
+ },
+ 'Kansas': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ]
+ }
+ },
+ 'Kentucky': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Eve" : [ 12, 24 ],
+ "Christmas Day" : [ 12, 25 ],
+ "New Year's Eve" : [ 12, 31 ],
+ "Good Friday" : [ "easter", -2 ]
+ }
+ },
+ 'Louisiana': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Mardi Gras" : [ "easter", -47 ],
+ "Good Friday" : [ "easter", -2 ],
+ "Election Day" : [ "firstNovemberMonday", 1 ]
+ }
+ },
+ 'Maine': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Patriots' Day" : [ "firstAprilMonday", 14 ]
+ }
+ },
+ 'Maryland': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Native American Heritage Day" : [ "firstNovemberThursday", 22 ],
+ "Christmas Day" : [ 12, 25 ]
+ }
+ },
+ 'Massachusetts': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Patriots' Day" : [ "firstAprilMonday", 14 ]
+ }
+ },
+ 'Michigan': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Eve" : [ 12, 24 ],
+ "Christmas Day" : [ 12, 25 ],
+ "New Year's Eve" : [ 12, 31 ]
+ }
+ },
+ 'Minnesota': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ]
+ }
+ },
+ 'Mississippi': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King's and Robert E. Lee's Birthdays" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Confederate Memorial Day" : [ "lastAprilMonday", 0 ]
+ }
+ },
+ 'Missouri': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Truman Day" : [ 5, 8 ]
+ }
+ },
+ 'Montana': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Election Day" : [ "firstNovemberMonday", 1 ],
+ "Christmas Eve" : [ 12, 24 ],
+ "New Year's Eve" : [ 12, 31 ]
+ }
+ },
+ 'Nebraska': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Arbor Day" : [ "lastAprilFriday", 0 ]
+ }
+ },
+ 'Nevada': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Nevada Day" : [ "lastOctoberFriday", 0 ],
+ "Family Day" : [ "firstNovemberThursday", 22 ]
+ }
+ },
+ 'New Hampshire': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Civil Rights Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Day after Thanksgiving" : [ "firstNovemberThursday", 22 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Election Day" : [ "firstNovemberMonday", 1 ]
+ }
+ },
+ 'New Jersey': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Lincoln's Birthday" : [ 2, 12 ],
+ "Good Friday" : [ "easter", -2 ],
+ "Election Day" : [ "firstNovemberMonday", 1 ]
+ }
+ },
+ 'New Mexico': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Day after Thanksgiving" : [ "firstNovemberThursday", 22 ],
+ "Christmas Day" : [ 12, 25 ]
+ }
+ },
+ 'New York': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Lincoln's Birthday" : [ 2, 12 ],
+ "Election Day" : [ "firstNovemberMonday", 1 ]
+ }
+ },
+ 'North Carolina': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Day after Thanksgiving" : [ "firstNovemberThursday", 22 ],
+ "Christmas Eve" : [ 12, 24 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Day after Christmas" : [ 12, 26 ],
+ "Good Friday" : [ "easter", -2 ]
+ }
+ },
+ 'North Dakota': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ]
+ }
+ },
+ 'Ohio': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ]
+ }
+ },
+ 'Oklahoma': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Day after Thanksgiving" : [ "firstNovemberThursday", 22 ],
+ "Christmas Day" : [ 12, 25 ]
+ }
+ },
+ 'Oregon': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ]
+ }
+ },
+ 'Pennsylvania': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Flag Day" : [ 6, 14 ]
+ }
+ },
+ 'Puerto Rico': {
+ 'PH': {
+ "Día de Año Nuevo" : [ 1, 1 ],
+ "Día de Reyes" : [ 1, 6 ],
+ "Natalicio de Eugenio María de Hostos" : [ "firstJanuaryMonday", 7 ],
+ "Natalicio de Martin Luther King, Jr." : [ "firstJanuaryMonday", 14 ],
+ "Día de los Presidentes" : [ "firstFebruaryMonday", 14 ],
+ "Día de la Abolición de Esclavitud" : [ 3, 22 ],
+ "Viernes Santo" : [ "easter", -2 ],
+ "Natalicio de José de Diego" : [ "firstAprilMonday", 14 ],
+ "Recordación de los Muertos de la Guerra" : [ "lastMayMonday", 0 ],
+ "Día de la Independencia" : [ 7, 4 ],
+ "Constitución de Puerto Rico" : [ 7, 25 ],
+ "Natalicio de Dr. José Celso Barbosa" : [ 7, 27 ],
+ "Día del Trabajo" : [ "firstSeptemberMonday", 0 ],
+ "Día de la Raza Descubrimiento de América" : [ "firstOctoberMonday", 7 ],
+ "Día del Veterano" : [ 11, 11 ],
+ "Día del Descubrimiento de Puerto Rico" : [ 11, 19 ],
+ "Día de Acción de Gracias" : [ "firstNovemberThursday", 21 ],
+ "Noche Buena" : [ 12, 24 ],
+ "Día de Navidad" : [ 12, 25 ]
+ }
+ },
+ 'Rhode Island': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Victory Day" : [ "firstAugustMonday", 7 ]
+ }
+ },
+ 'South Carolina': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Confederate Memorial Day" : [ 5, 10 ]
+ }
+ },
+ 'South Dakota': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Native American Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ]
+ }
+ },
+ 'Tennessee': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Eve" : [ 12, 24 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Good Friday" : [ "easter", -2 ]
+ }
+ },
+ 'Texas': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Friday after Thanksgiving" : [ "firstNovemberThursday", 22 ],
+ "Christmas Eve" : [ 12, 24 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Day after Christmas" : [ 12, 26 ]
+ }
+ },
+ 'United States Virgin Islands': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Virgin Islands-Puerto Rico Friendship Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Three Kings Day" : [ 1, 6 ],
+ "Transfer Day" : [ 3, 31 ],
+ "Holy Thursday" : [ "easter", -3 ],
+ "Good Friday" : [ "easter", -2 ],
+ "Easter Monday" : [ "easter", 1 ],
+ "Emancipation Day" : [ 7, 3 ],
+ "Hurricane Supplication Day" : [ "firstJulyMonday", 21 ],
+ "Hurricane Thanksgiving" : [ 10, 25 ],
+ "Liberty Day" : [ 11, 1 ],
+ "Christmas Second Day" : [ 12, 26 ],
+ "New Year's Eve" : [ 12, 31 ]
+ }
+ },
+ 'Utah': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Pioneer Day" : [ 7, 24 ]
+ }
+ },
+ 'Vermont': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Town Meeting Day" : [ "firstMarchTuesday", 0 ],
+ "Battle of Bennington" : [ "firstAugustMonday", 14 ]
+ }
+ },
+ 'Virginia': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Lee-Jackson Day" : [ "firstJanuaryMonday", 11 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ]
+ }
+ },
+ 'Washington': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ]
+ }
+ },
+ 'West Virginia': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "West Virginia Day" : [ 6, 20 ],
+ "Lincoln's Day" : [ "firstNovemberThursday", 22 ]
+ }
+ },
+ 'Wisconsin': {
+ 'PH': { // http://docs.legis.wisconsin.gov/statutes/statutes/995/20
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ],
+ "Primary Election Day" : [ "firstAugustTuesday", 7 ],
+ "Election Day" : [ "firstNovemberMonday", 1 ]
+ }
+ },
+ 'Wyoming': {
+ 'PH': {
+ "New Year's Day" : [ 1, 1 ],
+ "Martin Luther King, Jr. Day" : [ "firstJanuaryMonday", 14 ],
+ "Washington's Birthday" : [ "firstFebruaryMonday", 14 ],
+ "Memorial Day" : [ "lastMayMonday", 0 ],
+ "Independence Day" : [ 7, 4 ],
+ "Labor Day" : [ "firstSeptemberMonday", 0 ],
+ "Columbus Day" : [ "firstOctoberMonday", 7 ],
+ "Veterans Day" : [ 11, 11 ],
+ "Thanksgiving" : [ "firstNovemberThursday", 21 ],
+ "Christmas Day" : [ 12, 25 ]
+ }
+ }
+ }, // }}}
'si': { // {{{
'PH': { // http://www.vlada.si/o_sloveniji/politicni_sistem/prazniki/
'novo leto' : [ 1, 1 ],
@@ -1336,7 +2632,24 @@
'dan reformacije' : [ 10, 31 ],
'dan spomina na mrtve' : [ 11, 1 ],
'božič' : [ 12, 25 ],
- 'dan samostojnosti in enotnosti' : [ 12, 26 ],
+ 'dan samostojnosti in enotnosti' : [ 12, 26 ]
+ }
+ }, // }}}
+ 'it': { // {{{
+ 'PH': { // http://www.governo.it/Presidenza/ufficio_cerimoniale/cerimoniale/giornate.html
+ 'Capodanno' : [ 1, 1 ],
+ 'Epifania' : [ 1, 6 ],
+ 'Liberazione dal nazifascismo (1945)' : [ 4, 25 ],
+ 'Pasqua' : [ 'easter', 0 ],
+ 'Lunedì di Pasqua' : [ 'easter', 1 ],
+ 'Festa del lavoro' : [ 5, 1 ],
+ 'Festa della Repubblica' : [ 6, 2 ],
+ 'Assunzione di Maria' : [ 8, 15 ],
+ 'Ognissanti' : [ 11, 1 ],
+ 'Festa dell’unità nazionale' : [ 'firstSeptemberSunday', 0 ],
+ 'Immacolata Concezione' : [ 12, 8 ],
+ 'Natale di Gesù' : [ 12, 25 ],
+ 'Santo Stefano' : [ 12, 26 ],
},
}, // }}}
};
@@ -1404,6 +2717,7 @@
}, 'You can use notation "<ok>" for "<ko>" in the case that you want to express open end times. Example: "12:00+".': {
'til late': '+',
'till late': '+',
+ 'bis open end': '+',
'-late': '+',
'-open end': '+',
'-openend': '+',
@@ -1496,6 +2810,8 @@
'uhr': '',
'geöffnet': '',
'zwischen': '',
+ 'ist': '',
+ 'durchgehend': '',
}, 'Bitte verzichte auf "<ko>". Sie möchten eventuell eine Öffnungszeit ohne vorgegebenes Ende (Open End) angeben. Beispiel: "12:00+"': {
'ab': '',
'von': '',
@@ -1506,15 +2822,19 @@
'bis': '-',
'täglich': 'Mo-Su',
'schulferien': 'SH',
+ 'sonn und feiertag': 'PH,Su',
+ 'sonn und feiertags': 'PH,Su',
+ 'sonn- und feiertags': 'PH,Su',
'sonn-/feiertag': 'PH,Su',
'sonn-/feiertags': 'PH,Su',
'an sonn- und feiertagen': 'PH,Su',
'nur sonn-/feiertags': 'PH,Su',
- }, 'Bitte benutze die Schreibweise "<ok>" für "<ko>". Es ist war typografisch korrekt aber laut der Spezifikation für opening_hours nicht erlaubt. Siehe auch: http://wiki.openstreetmap.org/wiki/DE:Key:opening_hours:specification.': {
+ 'sonn- und feiertage': 'PH,Su',
+ }, 'Bitte benutze die Schreibweise "<ok>" für "<ko>". Es ist war typografisch korrekt aber laut der Spezifikation für opening_hours nicht erlaubt. Siehe auch: http://wiki.openstreetmap.org/wiki/DE:Key:opening_hours/specification.': {
'„': '"',
'“': '"',
'”': '"',
- }, 'Please use notation "<ok>" for "<ko>". The used quote signs might be typographically correct but are not defined in the specification. See http://wiki.openstreetmap.org/wiki/Key:opening_hours:specification.': {
+ }, 'Please use notation "<ok>" for "<ko>". The used quote signs might be typographically correct but are not defined in the specification. See http://wiki.openstreetmap.org/wiki/Key:opening_hours/specification.': {
'«': '"',
'»': '"',
'‚': '"',
@@ -1524,7 +2844,7 @@
'」': '"',
'『': '"',
'』': '"',
- }, 'Please use notation "<ok>" for "<ko>". The used quote signs are not defined in the specification. See http://wiki.openstreetmap.org/wiki/Key:opening_hours:specification.': {
+ }, 'Please use notation "<ok>" for "<ko>". The used quote signs are not defined in the specification. See http://wiki.openstreetmap.org/wiki/Key:opening_hours/specification.': {
"'": '"',
}, 'You might want to use comments instead of brackets (which are not valid in this context). If you do, replace "<ok>" with "<ko>".': {
// '（': '"',
@@ -1662,7 +2982,7 @@
}, 'Bitte benutze die englische Abkürzung "<ok>" für "<ko>".': {
'son': 0,
'sonntag': 0,
- 'sonn-': 0,
+ 'sonn-': 0,
'sonntags': 0,
'montag': 1,
'montags': 1,
@@ -1674,7 +2994,7 @@
'mit': 3,
'mittwoch': 3,
'mittwochs': 3,
- 'do': 4,
+ 'do': 4,
'don': 4,
'donnerstag': 4,
'donnerstags': 4,
@@ -1870,14 +3190,19 @@
// required to reasonably calculate 'sunrise' and to use the correct
// holidays.
var location_cc, location_state, lat, lon;
- if (typeof nominatiomJSON != 'undefined') {
- if (typeof nominatiomJSON.address != 'undefined' &&
- typeof nominatiomJSON.address.state != 'undefined') { // country_code will be tested later …
- location_cc = nominatiomJSON.address.country_code;
- location_state = nominatiomJSON.address.state;
+ if (typeof nominatiomJSON !== 'undefined') {
+ if (typeof nominatiomJSON.address !== 'undefined') {
+ if (typeof nominatiomJSON.address.country_code !== 'undefined') {
+ location_cc = nominatiomJSON.address.country_code;
+ }
+ if (typeof nominatiomJSON.address.state !== 'undefined') {
+ location_state = nominatiomJSON.address.state;
+ } else if (typeof nominatiomJSON.address.county !== 'undefined') {
+ location_state = nominatiomJSON.address.county;
+ }
}
- if (typeof nominatiomJSON.lon != 'undefined') { // lat will be tested later …
+ if (typeof nominatiomJSON.lon !== 'undefined') { // lat will be tested later …
lat = nominatiomJSON.lat;
lon = nominatiomJSON.lon;
}
@@ -1886,9 +3211,9 @@
// 0: time ranges (default), tags: opening_hours, lit, …
// 1: points in time
// 2: both (time ranges and points in time), tags: collection_times, service_times
- if (typeof oh_mode == 'undefined') {
+ if (typeof oh_mode === 'undefined') {
oh_mode = 0;
- } else if (!(typeof oh_mode == 'number' && (oh_mode === 0 || oh_mode == 1 || oh_mode == 2))) {
+ } else if (!(typeof oh_mode === 'number' && (oh_mode === 0 || oh_mode === 1 || oh_mode === 2))) {
throw 'The third constructor parameter is oh_mode and must be a number (0, 1 or 2)';
}
// }}}
@@ -1914,7 +3239,7 @@
// Rule does contain nothing useful e.g. second rule of '10:00-12:00;' (empty) which needs to be handled.
parsing_warnings.push([nrule, -1,
'This rule does not contain anything useful. Please remove this empty rule.'
- + (nrule == tokens.length - 1 && nrule > 0 && !tokens[nrule][1] ?
+ + (nrule === tokens.length - 1 && nrule > 0 && !tokens[nrule][1] ?
' Might it be possible that you are a programmer and adding a semicolon after each statement is hardwired in your muscle memory ;) ?'
+ ' The thing is that the semicolon in the opening_hours syntax is defined as rule separator.'
+ ' So for compatibility reasons you should omit this last semicolon.': '')
@@ -1925,7 +3250,7 @@
var continue_at = 0;
var next_rule_is_additional = false;
do {
- if (continue_at == tokens[nrule][0].length) break;
+ if (continue_at === tokens[nrule][0].length) break;
// Additional rule does contain nothing useful e.g. second rule of '10:00-12:00,' (empty) which needs to be handled.
var selectors = {
@@ -1956,7 +3281,7 @@
selectors.build_from_token_rule = [ nrule, continue_at, new_tokens.length ];
continue_at = parseGroup(tokens[nrule][0], continue_at, selectors, nrule);
- if (typeof continue_at == 'object') {
+ if (typeof continue_at === 'object') {
continue_at = continue_at[0];
} else {
continue_at = 0;
@@ -2012,8 +3337,7 @@
comment: selectors.comment,
wrapped: true,
- // build_from_token_rule: selectors.build_from_token_rule,
- // Not (yet) needed.
+ build_from_token_rule: selectors.build_from_token_rule,
};
for (var dselg = 0; dselg < selectors.date.length; dselg++) {
@@ -2042,17 +3366,17 @@
*/
function formatWarnErrorMessage(nrule, at, message) {
// FIXME: Change to new_tokens.
- if (typeof nrule == 'number') {
+ if (typeof nrule === 'number') {
var pos = 0;
- if (nrule == -1) { // Usage of rule index not required because we do have access to value.length.
+ if (nrule === -1) { // Usage of rule index not required because we do have access to value.length.
pos = value.length - at;
} else { // Issue accrued at a later time, position in string needs to be reconstructed.
- if (typeof tokens[nrule][0][at] == 'undefined') {
- if (typeof tokens[nrule][0] && at == -1) {
+ if (typeof tokens[nrule][0][at] === 'undefined') {
+ if (typeof tokens[nrule][0] && at === -1) {
pos = value.length;
- if (typeof tokens[nrule+1] == 'object' && typeof tokens[nrule+1][2] == 'number') {
+ if (typeof tokens[nrule+1] === 'object' && typeof tokens[nrule+1][2] === 'number') {
pos -= tokens[nrule+1][2];
- } else if (typeof tokens[nrule][2] == 'number') {
+ } else if (typeof tokens[nrule][2] === 'number') {
pos -= tokens[nrule][2];
}
} else {
@@ -2060,7 +3384,7 @@
//
formatLibraryBugMessage('Bug in warning generation code which could not determine the exact position of the warning or error in value.');
pos = value.length;
- if (typeof tokens[nrule][2] != 'undefined') {
+ if (typeof tokens[nrule][2] !== 'undefined') {
// Fallback: Point to last token in the rule which caused the problem.
// Run real_test regularly to fix the problem before a user is confronted with it.
pos -= tokens[nrule][2];
@@ -2073,15 +3397,15 @@
}
} else {
pos = value.length;
- if (typeof tokens[nrule][0][at+1] != 'undefined') {
+ if (typeof tokens[nrule][0][at+1] !== 'undefined') {
pos -= tokens[nrule][0][at+1][2];
- } else if (typeof tokens[nrule][2] != 'undefined') {
+ } else if (typeof tokens[nrule][2] !== 'undefined') {
pos -= tokens[nrule][2];
}
}
}
return value.substring(0, pos) + ' <--- (' + message + ')';
- } else if (typeof nrule == 'string') {
+ } else if (typeof nrule === 'string') {
return nrule.substring(0, at) + ' <--- (' + message + ')';
}
}
@@ -2093,7 +3417,7 @@
* :returns: Error message for the user.
*/
function formatLibraryBugMessage(message) {
- if (typeof message == 'undefined')
+ if (typeof message === 'undefined')
message = '';
else
message = ' ' + message;
@@ -2137,7 +3461,7 @@
// special day name (holidays)
curr_rule_tokens.push([tmp[0].toUpperCase(), 'holiday', value.length ]);
value = value.substr(2);
- } else if (tmp = value.match(/^(&|_|→|–|−|=|·|opening_hours=|ー|\?|~|～|：|°°|24x7|24 hours 7 days a week|24 hours|7 ?days(?:(?: a |\/)week)?|7j?\/7|all days?|every day|-?(?:(?:till? )?late|open[ ]?end)|(?:(?:one )?day (?:before|after) )?(?:school|public) holidays?|days?\b|до|рм|ам|jours fériés|on work days?|(?:nur |an )?sonn-(?:(?: und |\/)feiertag(?:s|en))?|[a-zäößàáéøčěíúýřПнВсо]+\b|à|á|mo|tu|we|th|fr|sa|su|jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\.?/i)) {
+ } else if (tmp = value.match(/^(&|_|→|–|−|=|·|opening_hours=|ー|\?|~|～|：|°°|24x7|24 hours 7 days a week|24 hours|7 ?days(?:(?: a |\/)week)?|7j?\/7|all days?|every day|(?:|-|till? |bis )?(?:late|open[ ]?end)|(?:(?:one )?day (?:before|after) )?(?:school|public) holidays?|days?\b|до|рм|ам|jours fériés|on work days?|sonntag?|(?:nur |an )?sonn-?(?:(?: und |\/)feiertag(?:s|en?)?)?|[a-zäößàáéøčěíúýřПнВсо]+\b|à|á|mo|tu|we|th|fr|sa|su|jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\.?/i)) {
/* Handle all remaining words and specific other characters with error tolerance.
*
* à|á: Word boundary does not work with unicode chars: 'test à test'.match(/\bà\b/i)
@@ -2149,11 +3473,11 @@
*/
var correct_val = returnCorrectWordOrToken(tmp[1].toLowerCase(), value.length);
// console.log('Error tolerance for string "' + tmp[1] + '" returned "' + correct_val + '".');
- if (typeof correct_val == 'object') {
+ if (typeof correct_val === 'object') {
curr_rule_tokens.push([ correct_val[0], correct_val[1], value.length ]);
value = value.substr(tmp[0].length);
- } else if (typeof correct_val == 'string') {
- if (tmp[1].toLowerCase() == 'pm') {
+ } else if (typeof correct_val === 'string') {
+ if (tmp[1].toLowerCase() === 'pm') {
var hours_token_at = curr_rule_tokens.length - 1;
var hours_token;
if (hours_token_at >= 0) {
@@ -2169,7 +3493,7 @@
hours_token = curr_rule_tokens[hours_token_at];
}
- if (typeof hours_token == 'object' && hours_token[0] <= 12) {
+ if (typeof hours_token === 'object' && hours_token[0] <= 12) {
hours_token[0] += 12;
curr_rule_tokens[hours_token_at] = hours_token;
}
@@ -2195,7 +3519,7 @@
} else if (tmp = value.match(/^\d+/)) {
// number
if (Number(tmp[0]) > 1900) { // Assumed to be a year number.
- curr_rule_tokens.push([tmp[0], 'year', value.length ]);
+ curr_rule_tokens.push([Number(tmp[0]), 'year', value.length ]);
if (Number(tmp[0]) >= 2100) // Probably an error
parsing_warnings.push([ -1, value.length - 1,
'The number ' + Number(tmp[0]) + ' will be interpreted as year.'
@@ -2222,9 +3546,9 @@
for (var pos = 1; pos <= 3; pos += 2) {
// console.log('Pos: ' + pos + ', substring: ' + tmp[pos]);
var correct_val = returnCorrectWordOrToken(tmp[pos],
- value.length - (pos == 3 ? tmp[1].length + tmp[2].length : 0)
+ value.length - (pos === 3 ? tmp[1].length + tmp[2].length : 0)
);
- if (typeof correct_val != 'string' && tmp[pos] != '"') {
+ if (typeof correct_val !== 'string' && tmp[pos] !== '"') {
throw formatLibraryBugMessage(
'A character for error tolerance was allowed in the regular expression'
+ ' but is not covered by word_error_correction'
@@ -2264,7 +3588,7 @@
value = value.substr(tmp[0].length);
} else if (value.match(/^[:.]/)) {
// time separator
- if (value[0] == '.' && !done_with_warnings)
+ if (value[0] === '.' && !done_with_warnings)
parsing_warnings.push([ -1, value.length - 1, 'Please use ":" as hour/minute-separator' ]);
curr_rule_tokens.push([ ':', 'timesep', value.length ]);
value = value.substr(1);
@@ -2295,12 +3619,12 @@
for (var token_name in word_error_correction) {
for (var comment in word_error_correction[token_name]) {
for (var old_val in word_error_correction[token_name][comment]) {
- if (old_val == word) {
+ if (old_val === word) {
var val = word_error_correction[token_name][comment][old_val];
- if (comment == 'default') {
+ if (comment === 'default') {
// Return internal representation of word.
return [ val, token_name ];
- } else if (token_name == 'wrong_words' && !done_with_warnings) {
+ } else if (token_name === 'wrong_words' && !done_with_warnings) {
// Replace wrong words or characters with correct ones.
// This will return a string which is then being tokenized.
parsing_warnings.push([ -1, value_length - old_val.length,
@@ -2310,13 +3634,13 @@
// Get correct string value from the 'default' hash and generate warning.
var correct_abbr;
for (correct_abbr in word_error_correction[token_name]['default']) {
- if (word_error_correction[token_name]['default'][correct_abbr] == val)
+ if (word_error_correction[token_name]['default'][correct_abbr] === val)
break;
}
- if (typeof correct_abbr == 'undefined') {
+ if (typeof correct_abbr === 'undefined') {
throw formatLibraryBugMessage('Including the stacktrace.');
}
- if (token_name != 'timevar') {
+ if (token_name !== 'timevar') {
// Everything else than timevar:
// E.g. 'Mo' start with a upper case letter.
// It just looks better.
@@ -2342,7 +3666,7 @@
* :returns: Warnings as list with one warning per element.
*/
function getWarnings(it) {
- if (!done_with_warnings && typeof it == 'object') {
+ if (!done_with_warnings && typeof it === 'object') {
/* getWarnings was called in a state without critical errors.
* We can do extended tests.
*/
@@ -2377,13 +3701,13 @@
selector_start_end_type = getSelectorRange(new_tokens[nrule][0], selector_start_end_type[1]);
// console.log(selector_start_end_type, new_tokens[nrule][0].length);
- if (selector_start_end_type[0] == selector_start_end_type[1] &&
- new_tokens[nrule][0][selector_start_end_type[0]][0] == '24/7'
+ if (selector_start_end_type[0] === selector_start_end_type[1] &&
+ new_tokens[nrule][0][selector_start_end_type[0]][0] === '24/7'
) {
has_token['24/7'] = true;
}
- if (typeof used_selectors[nrule][selector_start_end_type[2]] != 'object') {
+ if (typeof used_selectors[nrule][selector_start_end_type[2]] !== 'object') {
used_selectors[nrule][selector_start_end_type[2]] = [ selector_start_end_type[1] ];
} else {
used_selectors[nrule][selector_start_end_type[2]].push(selector_start_end_type[1]);
@@ -2406,7 +3730,7 @@
'You have used ' + used_selectors[nrule][selector_type].length
+ (selector_type.match(/^(?:comment|state)/) ?
' ' + selector_type
- + (selector_type == 'state' ? ' keywords' : 's')
+ + (selector_type === 'state' ? ' keywords' : 's')
+ ' in one rule.'
+ ' You may only use one in one rule.'
:
@@ -2414,7 +3738,7 @@
+ (selector_type.match(/^(?:month|weekday)$/) ? 's' : ' ranges')
+ ' in one rule.'
+ ' This is probably an error.'
- + ' Equal selector types can (and should) always be written in conjunction separated by comma or something.'
+ + ' Equal selector types can (and should) always be written in conjunction separated by comma.'
+ ' Example for time ranges "12:00-13:00,15:00-18:00".'
+ ' Example for weekdays "Mo-We,Fr".'
)
@@ -2485,7 +3809,7 @@
// parsing_warnings.push([nrule, new_tokens[nrule][0].length - 1,
// "This rule will be evaluated as closed but it was specified as additional rule."
// + " It is enough to specify this rule as normal rule using the \";\" character."
- // + " See https://wiki.openstreetmap.org/wiki/Key:opening_hours:specification#explain:rule_modifier:closed."
+ // + " See https://wiki.openstreetmap.org/wiki/Key:opening_hours/specification#explain:rule_modifier:closed."
// ]);
}
/* }}} */
@@ -2494,13 +3818,13 @@
for (var i = 0; i < used_selectors_types_array[nrule].length - 1; i++) {
var selector_type = used_selectors_types_array[nrule][i];
var next_selector_type = used_selectors_types_array[nrule][i+1];
- if ( ( wide_range_selectors.indexOf(selector_type) != -1
- && wide_range_selectors.indexOf(next_selector_type) != -1
- ) || ( small_range_selectors.indexOf(selector_type) != -1
- && small_range_selectors.indexOf(next_selector_type) != -1)
+ if ( ( wide_range_selectors.indexOf(selector_type) !== -1
+ && wide_range_selectors.indexOf(next_selector_type) !== -1
+ ) || ( small_range_selectors.indexOf(selector_type) !== -1
+ && small_range_selectors.indexOf(next_selector_type) !== -1)
) {
- if (new_tokens[nrule][0][used_selectors[nrule][selector_type][0]][0] == ':') {
+ if (new_tokens[nrule][0][used_selectors[nrule][selector_type][0]][0] === ':') {
parsing_warnings.push([nrule, used_selectors[nrule][selector_type][0],
"You have used the optional symbol <separator_for_readability> in the wrong place."
+ " Please check the syntax specification to see where it could be used or remove it."
@@ -2548,12 +3872,12 @@
* the token is the start of a selector.
*/
function tokenIsTheBeginOfSelector(tokens, at) {
- if (typeof tokens[at][3] == 'string') {
+ if (typeof tokens[at][3] === 'string') {
return 3;
- } else if (tokens[at][1] == 'comment'
- || tokens[at][1] == 'state'
- || tokens[at][1] == '24/7'
- || tokens[at][1] == 'rule separator'
+ } else if (tokens[at][1] === 'comment'
+ || tokens[at][1] === 'state'
+ || tokens[at][1] === '24/7'
+ || tokens[at][1] === 'rule separator'
){
return 1;
@@ -2591,7 +3915,7 @@
// Selector consists of a single token.
// Include tailing colon.
- if (selector_end + 1 < tokens.length && tokens[selector_end + 1][0] == ':')
+ if (selector_end + 1 < tokens.length && tokens[selector_end + 1][0] === ':')
selector_end++;
return [ selector_start, selector_end, tokens[selector_start][pos_in_token_array] ];
@@ -2621,7 +3945,7 @@
var user_conf = {},
get_internals = false,
rule_index;
- if (typeof argument_hash != 'undefined') {
+ if (typeof argument_hash !== 'undefined') {
if (typeof argument_hash.conf === 'object')
user_conf = argument_hash.conf;
@@ -2634,7 +3958,7 @@
}
for (var key in default_prettify_conf) {
- if (typeof user_conf[key] == 'undefined')
+ if (typeof user_conf[key] === 'undefined')
user_conf[key] = default_prettify_conf[key];
}
@@ -2645,15 +3969,15 @@
if (new_tokens[nrule][0].length === 0) continue;
// Rule does contain nothing useful e.g. second rule of '10:00-12:00;' (empty) which needs to be handled.
- if (typeof rule_index == 'number') {
- if (rule_index != nrule) continue;
+ if (typeof rule_index === 'number') {
+ if (rule_index !== nrule) continue;
} else {
if (nrule !== 0)
prettified_value += (
new_tokens[nrule][1]
? user_conf.rule_sep_string + '|| '
: (
- new_tokens[nrule][0][0][1] == 'rule separator'
+ new_tokens[nrule][0][0][1] === 'rule separator'
? ','
: (
user_conf.print_semicolon
@@ -2678,7 +4002,7 @@
throw formatLibraryBugMessage('infinite loop');
}
- if (selector_start_end_type[2] != 'rule separator') {
+ if (selector_start_end_type[2] !== 'rule separator') {
prettified_group_value.push(
[
selector_start_end_type,
@@ -2720,7 +4044,7 @@
if (!done_with_selector_reordering_warnings) {
for (var i = 0, l = not_sorted_prettified_group_value.length; i < l; i++) {
- if (not_sorted_prettified_group_value[i] != prettified_group_value[i]) {
+ if (not_sorted_prettified_group_value[i] !== prettified_group_value[i]) {
// console.log(i + ': ' + prettified_group_value[i][0][2]);
var length = i + old_prettified_value_length; // i: Number of spaces in string.
for (var x = 0; x <= i; x++) {
@@ -2831,11 +4155,11 @@
tokens[at][3] = 'week';
at = parseWeekRange(tokens, at);
- } else if (at !== 0 && at != tokens.length - 1 && tokens[at][0] == ':') {
+ } else if (at !== 0 && at !== tokens.length - 1 && tokens[at][0] === ':') {
/* Ignore colon if they appear somewhere else than as time separator.
* Except the start or end of the value.
* This provides compatibility with the syntax proposed by Netzwolf:
- * http://wiki.openstreetmap.org/wiki/Key:opening_hours:specification#separator_for_readability
+ * http://wiki.openstreetmap.org/wiki/Key:opening_hours/specification#separator_for_readability
* Check for valid use of <separator_for_readability> is implemented in function getWarnings().
*/
@@ -2852,9 +4176,9 @@
} else if (matchTokens(tokens, at, 'state')) {
- if (tokens[at][0] == 'open') {
+ if (tokens[at][0] === 'open') {
selectors.meaning = true;
- } else if (tokens[at][0] == 'closed' || tokens[at][0] == 'off') {
+ } else if (tokens[at][0] === 'closed' || tokens[at][0] === 'off') {
selectors.meaning = false;
} else {
selectors.meaning = false;
@@ -2863,7 +4187,7 @@
rule_modifier_specified = true;
at++;
- if (typeof tokens[at] == 'object' && tokens[at][0] == ',') // additional rule
+ if (typeof tokens[at] === 'object' && tokens[at][0] === ',') // additional rule
at = [ at + 1 ];
} else if (matchTokens(tokens, at, 'comment')) {
@@ -2877,9 +4201,9 @@
rule_modifier_specified = true;
at++;
- if (typeof tokens[at] == 'object' && tokens[at][0] == ',') // additional rule
+ if (typeof tokens[at] === 'object' && tokens[at][0] === ',') // additional rule
at = [ at + 1 ];
- } else if ((at === 0 || at == tokens.length - 1) && matchTokens(tokens, at, 'rule separator')) {
+ } else if ((at === 0 || at === tokens.length - 1) && matchTokens(tokens, at, 'rule separator')) {
at++;
console.log("value: " + nrule);
// throw formatLibraryBugMessage('Not implemented yet.');
@@ -2887,10 +4211,10 @@
var warnings = getWarnings();
throw formatWarnErrorMessage(nrule, at, 'Unexpected token: "' + tokens[at][1]
+ '" This means that the syntax is not valid at that point or it is currently not supported.')
- + (warnings ? ' ' + warnings.join('; ') : '');
+ + (warnings ? (' ' + warnings.join('; ')) : '');
}
- if (typeof at == 'object') { // additional rule
+ if (typeof at === 'object') { // additional rule
tokens[at[0] - 1][1] = 'rule separator';
break;
}
@@ -2901,10 +4225,10 @@
function get_last_token_pos_in_token_group(tokens, at, last_at) {
for (at++; at < last_at; at++) {
- if (typeof tokens[at] != 'undefined') {
- if (typeof tokens[at][3] == 'string'
- || tokens[at][1] == 'comment'
- || tokens[at][1] == 'state'){
+ if (typeof tokens[at] !== 'undefined') {
+ if (typeof tokens[at][3] === 'string'
+ || tokens[at][1] === 'comment'
+ || tokens[at][1] === 'state'){
return at - 1;
}
@@ -3019,7 +4343,7 @@
throw formatWarnErrorMessage(nrule, at,
'Number between -5 and 5 (except 0) expected');
- if (from == to) {
+ if (from === to) {
if (number !== 0)
throw formatWarnErrorMessage(nrule, at,
'You can not use more than one constrained weekday in a month range');
@@ -3046,7 +4370,7 @@
throw formatWarnErrorMessage(nrule, at,
'You can not use '+ period_type +' ranges with period equals zero.');
} else if (period === 1) {
- if (typeof parm_string == 'string' && parm_string == 'no_end_year')
+ if (typeof parm_string === 'string' && parm_string === 'no_end_year')
parsing_warnings.push([nrule, at,
'Please don’t use '+ period_type +' ranges with period equals one.'
+ ' If you want to express that a facility is open starting from a year without limit use "<year>+".']);
@@ -3071,7 +4395,7 @@
tmp_date.setDate(tmp_date.getDate() + (constrained_weekday[0] + (constrained_weekday[0] > 0 ? -1 : 0)) * 7);
- if (typeof add_days != 'undefined' && add_days[1])
+ if (typeof add_days !== 'undefined' && add_days[1])
tmp_date.setDate(tmp_date.getDate() + add_days[0]);
return tmp_date;
@@ -3087,16 +4411,16 @@
function checkIfDateIsValid(month, day, nrule, at) {
// May use this instead. The problem is that this does not give feedback as precise as the code which is used in this function.
// var testDate = new Date(year, month, day);
- // if (testDate.getDate() != day || testDate.getMonth() != month || testDate.getFullYear() != year) {
+ // if (testDate.getDate() !== day || testDate.getMonth() !== month || testDate.getFullYear() !== year) {
// console.error('date not valid');
// }
// https://en.wikipedia.org/wiki/Month#Julian_and_Gregorian_calendars
if (day < 1 || day > 31)
throw formatWarnErrorMessage(nrule, at, 'Day must be between 1 and 31.');
- if ((month==3 || month==5 || month==8 || month==10) && day==31)
+ if ((month===3 || month===5 || month===8 || month===10) && day===31)
throw formatWarnErrorMessage(nrule, at, 'Month ' + months[month] + " doesn't have 31 days.!");
- if (month == 1 && day == 30)
+ if (month === 1 && day === 30)
throw formatWarnErrorMessage(nrule, at, 'Month ' + months[1]+ " either has 28 or 29 days (leap years).");
}
// }}}
@@ -3118,7 +4442,7 @@
for (; at < tokens.length; at++) {
var has_time_var_calc = [], has_normal_time = []; // element 0: start time, 1: end time
- has_normal_time[0] = matchTokens(tokens, at, 'number', 'timesep', 'number');
+ has_normal_time[0] = matchTokens(tokens, at, 'number', 'timesep', 'number');
has_time_var_calc[0] = matchTokens(tokens, at, '(', 'timevar');
var minutes_from,
minutes_to;
@@ -3153,10 +4477,10 @@
throw formatWarnErrorMessage(nrule,
at+(
has_normal_time[0] ? (
- typeof tokens[at+3] == 'object' ? 3 : 2
+ typeof tokens[at+3] === 'object' ? 3 : 2
) : (
has_time_var_calc[0] ? 2 : (
- typeof tokens[at+1] != 'undefined' ? 1 : 0
+ typeof tokens[at+1] !== 'undefined' ? 1 : 0
)
)
),
@@ -3185,7 +4509,7 @@
has_normal_time[1] = matchTokens(tokens, at_end_time, 'number', 'timesep', 'number');
has_time_var_calc[1] = matchTokens(tokens, at_end_time, '(', 'timevar');
if (!has_normal_time[1] && !matchTokens(tokens, at_end_time, 'timevar') && !has_time_var_calc[1]) {
- throw formatWarnErrorMessage(nrule, at_end_time - (typeof tokens[at_end_time] != 'undefined' ? 0 : 1),
+ throw formatWarnErrorMessage(nrule, at_end_time - (typeof tokens[at_end_time] !== 'undefined' ? 0 : 1),
'Time range does not continue as expected');
} else {
if (has_normal_time[1]) {
@@ -3227,12 +4551,12 @@
} else if (matchTokens(tokens, at, '+')) {
parseTimeRange(tokens, at_end_time, selectors, minutes_to < minutes_from ? 1 : true);
at++;
- } else if (oh_mode == 1 && !is_point_in_time) {
+ } else if (oh_mode === 1 && !is_point_in_time) {
throw formatWarnErrorMessage(nrule, at_end_time,
'opening_hours is running in "points in time mode". Found time range.');
}
- if (typeof lat != 'undefined') { // lon will also be defined (see above)
+ if (typeof lat !== 'undefined') { // lon will also be defined (see above)
if (!has_normal_time[0] || !(has_normal_time[1] || has_open_end || is_point_in_time) )
week_stable = false;
} else { // we can not calculate exact times so we use the already applied constants (word_value_replacement).
@@ -3243,14 +4567,14 @@
if (!extended_open_end && minutes_from >= minutes_in_day)
throw formatWarnErrorMessage(nrule, at_end_time - 2,
'Time range starts outside of the current day');
- if (minutes_to < minutes_from || ((has_normal_time[0] && has_normal_time[1]) && minutes_from == minutes_to))
+ if (minutes_to < minutes_from || ((has_normal_time[0] && has_normal_time[1]) && minutes_from === minutes_to))
minutes_to += minutes_in_day;
if (minutes_to > minutes_in_day * 2)
throw formatWarnErrorMessage(nrule, at_end_time + (has_normal_time[1] ? 4 : (has_time_var_calc[1] ? 7 : 1)) - 2,
'Time spanning more than two midnights not supported');
// This shortcut makes always-open range check faster.
- if (minutes_from === 0 && minutes_to == minutes_in_day) {
+ if (minutes_from === 0 && minutes_to === minutes_in_day) {
selectors.time.push(function(date) { return [true]; });
} else {
if (minutes_to > minutes_in_day) { // has_normal_time[1] must be true
@@ -3268,16 +4592,16 @@
// Needs to be added because it was added by
// normal times: if (minutes_to < minutes_from)
// above the selector construction.
- } else if (is_point_in_time && typeof point_in_time_period != 'number') {
+ } else if (is_point_in_time && typeof point_in_time_period !== 'number') {
minutes_to = minutes_from + 1;
}
- if (typeof point_in_time_period == 'number') {
+ if (typeof point_in_time_period === 'number') {
if (ourminutes < minutes_from) {
return [false, dateAtDayMinutes(date, minutes_from)];
} else if (ourminutes <= minutes_to) {
for (var cur_min = minutes_from; ourminutes + point_in_time_period >= cur_min; cur_min += point_in_time_period) {
- if (cur_min == ourminutes) {
+ if (cur_min === ourminutes) {
return [true, dateAtDayMinutes(date, ourminutes + 1)];
} else if (ourminutes < cur_min) {
return [false, dateAtDayMinutes(date, cur_min)];
@@ -3310,10 +4634,10 @@
// which returns the selector function.
}
- if (typeof point_in_time_period == 'number') {
+ if (typeof point_in_time_period === 'number') {
if (ourminutes <= minutes_to) {
for (var cur_min = 0; ourminutes + point_in_time_period >= cur_min; cur_min += point_in_time_period) {
- if (cur_min == ourminutes) {
+ if (cur_min === ourminutes) {
return [true, dateAtDayMinutes(date, ourminutes + 1)];
} else if (ourminutes < cur_min) {
return [false, dateAtDayMinutes(date, cur_min)];
@@ -3337,16 +4661,16 @@
if (timevar_string[1]) {
var date_to = SunCalc.getTimes(date, lat, lon)[timevar_string[1]];
minutes_to = date_to.getHours() * 60 + date_to.getMinutes() + timevar_add[1];
- } else if (is_point_in_time && typeof point_in_time_period != 'number') {
+ } else if (is_point_in_time && typeof point_in_time_period !== 'number') {
minutes_to = minutes_from + 1;
}
- if (typeof point_in_time_period == 'number') {
+ if (typeof point_in_time_period === 'number') {
if (ourminutes < minutes_from) {
return [false, dateAtDayMinutes(date, minutes_from)];
} else if (ourminutes <= minutes_to) {
for (var cur_min = minutes_from; ourminutes + point_in_time_period >= cur_min; cur_min += point_in_time_period) {
- if (cur_min == ourminutes) {
+ if (cur_min === ourminutes) {
return [true, dateAtDayMinutes(date, ourminutes + 1)];
} else if (ourminutes < cur_min) {
return [false, dateAtDayMinutes(date, cur_min)];
@@ -3423,7 +4747,7 @@
if (matchTokens(tokens, at, 'number', 'timesep'))
throw formatWarnErrorMessage(nrule, at+1, 'Missing minutes in time range after: "' + tokens[at+1][1] + '"');
if (matchTokens(tokens, at, 'number'))
- throw formatWarnErrorMessage(nrule, at + (typeof tokens[at+1] != 'undefined' ? 1 : 0),
+ throw formatWarnErrorMessage(nrule, at + (typeof tokens[at+1] !== 'undefined' ? 1 : 0),
'Missing time separator in time range after: "' + tokens[at][1] + '"');
return [ at ];
}
@@ -3467,7 +4791,7 @@
if (matchTokens(tokens, at+2, '+') || matchTokens(tokens, at+2, '-')) {
if (matchTokens(tokens, at+3, 'number', 'timesep', 'number')) {
if (matchTokens(tokens, at+6, ')')) {
- var add_or_subtract = tokens[at+2][0] == '+' ? '1' : '-1';
+ var add_or_subtract = tokens[at+2][0] === '+' ? '1' : '-1';
var minutes = getMinutesByHoursMinutes(tokens, nrule, at+3) * add_or_subtract;
if (minutes === 0)
parsing_warnings.push([ nrule, at+5, 'Adding zero in a variable time calculation does not change the variable time.'
@@ -3517,7 +4841,7 @@
throw formatWarnErrorMessage(nrule, at,
'Number between -5 and 5 (except 0) expected');
- if (from == to) {
+ if (from === to) {
numbers.push(from);
} else if (from < to) {
for (var i = from; i <= to; i++) {
@@ -3586,7 +4910,7 @@
target_day_with_added_moved_days_this_month.setDate(target_day_with_added_moved_days_this_month.getDate()
+ (number + (number > 0 ? -1 : 0)) * 7 + add_days);
- if (date_num == getValueForDate(target_day_with_added_moved_days_this_month, false))
+ if (date_num === getValueForDate(target_day_with_added_moved_days_this_month, false))
return [true, dateAtDayMinutes(date, minutes_in_day)];
} else if (add_days < 0) {
target_day_with_added_moved_days_this_month = dateAtNextWeekday(
@@ -3599,7 +4923,7 @@
return [false, target_day_with_added_moved_days_this_month];
} else {
if (target_day_with_added_days_this_month.getTime() < start_of_next_month.getTime()
- && getValueForDate(target_day_with_added_days_this_month, false) == date_num)
+ && getValueForDate(target_day_with_added_days_this_month, false) === date_num)
return [true, dateAtDayMinutes(date, minutes_in_day)];
target_day_with_added_days_this_month = target_day_with_added_moved_days_this_month;
@@ -3607,7 +4931,7 @@
}
// we hit the target day
- if (date.getDate() == target_day_with_added_days_this_month.getDate()) {
+ if (date.getDate() === target_day_with_added_days_this_month.getDate()) {
return [true, dateAtDayMinutes(date, minutes_in_day)];
}
@@ -3659,6 +4983,12 @@
} else if (matchTokens(tokens, at, 'holiday')) {
week_stable = false;
return parseHoliday(tokens, at, selectors, true, in_holiday_selector);
+ } else if (matchTokens(tokens, at - 1, ',')) { // additional rule
+ throw formatWarnErrorMessage(
+ nrule,
+ at - 1,
+ 'An additional rule does not make sense here. Just use a ";" as rule separator.'
+ + ' See https://wiki.openstreetmap.org/wiki/Key:opening_hours/specification#explain:additional_rule_separator');
} else {
throw formatWarnErrorMessage(nrule, at, 'Unexpected token in weekday range: ' + tokens[at][1]);
}
@@ -3718,7 +5048,7 @@
for (; at < tokens.length; at++) {
if (matchTokens(tokens, at, 'holiday')) {
- if (tokens[at][0] == 'PH') {
+ if (tokens[at][0] === 'PH') {
var applying_holidays = getMatchingHoliday(tokens[at][0]);
// Only allow moving one day in the past or in the future.
@@ -3745,14 +5075,14 @@
if (date_num < last_holiday_last_year_num ) {
return [ false, last_holiday_last_year[0] ];
- } else if (date_num == last_holiday_last_year_num) {
+ } else if (date_num === last_holiday_last_year_num) {
return [true, dateAtDayMinutes(last_holiday_last_year[0], minutes_in_day),
'Day after ' +last_holiday_last_year[1] ];
}
}
return [ false, holidays[i][0] ];
- } else if (date_num == next_holiday_date_num) {
+ } else if (date_num === next_holiday_date_num) {
return [true, new Date(date.getFullYear(), date.getMonth(), date.getDate() + 1),
(add_days[0] > 0 ? 'Day after ' : (add_days[0] < 0 ? 'Day before ' : '')) + holidays[i][1] ];
}
@@ -3763,7 +5093,7 @@
var holidays_next_year = getApplyingHolidaysForYear(applying_holidays, date.getFullYear() + 1, add_days);
var first_holidays_next_year = holidays_next_year[0];
var first_holidays_next_year_num = getValueForDate(first_holidays_next_year[0], true);
- if (date_num == first_holidays_next_year_num) {
+ if (date_num === first_holidays_next_year_num) {
return [true, dateAtDayMinutes(first_holidays_next_year[0], minutes_in_day),
'Day before ' + first_holidays_next_year[1] ];
}
@@ -3782,7 +5112,7 @@
selectors.holiday.push(selector);
at += 1 + add_days[1];
- } else if (tokens[at][0] == 'SH') {
+ } else if (tokens[at][0] === 'SH') {
var applying_holidays = getMatchingHoliday(tokens[at][0]);
var holidays = []; // needs to be sorted each time because of movable days
@@ -3807,7 +5137,7 @@
// check if we are in the holidays from the last year spanning into this year
var last_year_holiday = getSHForYear(applying_holidays[applying_holidays.length - 1], date.getFullYear() - 1, false);
- if (typeof last_year_holiday != 'undefined') {
+ if (typeof last_year_holiday !== 'undefined') {
var last_year_holiday_from = (last_year_holiday[last_year_holiday.length - 4] - 1) * 100
+ last_year_holiday[last_year_holiday.length - 3]; // e.g. 1125
var last_year_holiday_to = (last_year_holiday[last_year_holiday.length - 2] - 1) * 100
@@ -3826,12 +5156,12 @@
} else if (holiday_from <= date_num && (date_num < holiday_to_plus || holiday_ends_next_year)) {
return [ true, new Date(date.getFullYear() + holiday_ends_next_year, holiday[2+h] - 1, holiday[3+h] + 1),
applying_holidays[i].name ];
- } else if (holiday_to_plus == date_num) { // selected holiday end is equal to month and day
+ } else if (holiday_to_plus === date_num) { // selected holiday end is equal to month and day
if (h + 4 < holiday.length) { // next holiday is next date range of the same holidays
h += 4;
return [ false, new Date(date.getFullYear(), holiday[0+h] - 1, holiday[1+h]) ];
} else {
- if (i + 1 == applying_holidays.length) { // last holidays are handled, continue all over again
+ if (i + 1 === applying_holidays.length) { // last holidays are handled, continue all over again
var holiday = getSHForYear(applying_holidays[0], date.getFullYear() + 1);
return [ false, new Date(date.getFullYear() + !holiday_ends_next_year, holiday[0+h] - 1, holiday[1+h]) ];
} else { // return the start of the next holidays
@@ -3849,12 +5179,18 @@
selectors.weekday.push(selector);
else
selectors.holiday.push(selector);
- at += 1;
+ at += 1; // FIXME: test
}
} else if (matchTokens(tokens, at, 'weekday')) {
return parseWeekdayRange(tokens, at, selectors, true);
+ } else if (matchTokens(tokens, at - 1, ',')) { // additional rule
+ throw formatWarnErrorMessage(
+ nrule,
+ at - 1,
+ 'An additional rule does not make sense here. Just use a ";" as rule separator.'
+ + ' See https://wiki.openstreetmap.org/wiki/Key:opening_hours/specification#explain:additional_rule_separator');
} else {
- throw formatWarnErrorMessage(nrule, at, 'Unexpected token (school holiday parser): ' + tokens[at][1]);
+ throw formatWarnErrorMessage(nrule, at, 'Unexpected token (holiday parser): ' + tokens[at][1]);
}
if (!matchTokens(tokens, at, ','))
@@ -3876,7 +5212,7 @@
*/
function getValueForDate(date, include_year) {
// Implicit because undefined evaluates to false.
- // include_year = typeof include_year != 'undefined' ? include_year : false;
+ // include_year = typeof include_year !== 'undefined' ? include_year : false;
return (include_year ? date.getFullYear() * 10000 : 0) + date.getMonth() * 100 + date.getDate();
}
@@ -3885,13 +5221,13 @@
// return the school holiday definition e.g. [ 5, 25, /* to */ 6, 5 ],
// for the specified year
function getSHForYear(SH_hash, year, fatal) {
- if (typeof fatal == 'undefined')
+ if (typeof fatal === 'undefined')
fatal = true;
var holiday = SH_hash[year];
- if (typeof holiday == 'undefined') {
+ if (typeof holiday === 'undefined') {
holiday = SH_hash['default']; // applies for any year without explicit definition
- if (typeof holiday == 'undefined') {
+ if (typeof holiday === 'undefined') {
if (fatal) {
throw formatLibraryBugMessage('School holiday ' + SH_hash.name + ' has no definition for the year ' + year + '.'
+ ' You can also add them: ' + repository_url);
@@ -3907,40 +5243,39 @@
// First try to get the state, if missing get the country wide holidays
// (which can be limited to some states).
function getMatchingHoliday(type_of_holidays) {
- if (typeof location_cc != 'undefined') {
+ if (typeof location_cc !== 'undefined') {
if (holidays.hasOwnProperty(location_cc)) {
- if (typeof location_state != 'undefined') {
- if (holidays[location_cc][location_state]
- && holidays[location_cc][location_state][type_of_holidays]) {
- // if holidays for the state are specified use it
- // and ignore lesser specific ones (for the country)
- return holidays[location_cc][location_state][type_of_holidays];
- } else if (holidays[location_cc][type_of_holidays]) {
- // holidays are only defined country wide
- var matching_holiday = {}; // holidays in the country wide scope can be limited to certain states
- for (var holiday_name in holidays[location_cc][type_of_holidays]) {
- if (typeof holidays[location_cc][type_of_holidays][holiday_name][2] === 'object') {
- if (-1 != holidays[location_cc][type_of_holidays][holiday_name][2].indexOf(location_state))
- matching_holiday[holiday_name] = holidays[location_cc][type_of_holidays][holiday_name];
- } else {
+ if (typeof location_state !== 'undefined'
+ && holidays[location_cc][location_state]
+ && holidays[location_cc][location_state][type_of_holidays]) {
+ // if holidays for the state are specified use it
+ // and ignore lesser specific ones (for the country)
+ return holidays[location_cc][location_state][type_of_holidays];
+ } else if (holidays[location_cc][type_of_holidays]) {
+ // holidays are only defined country wide
+ var matching_holiday = {}; // holidays in the country wide scope can be limited to certain states
+ for (var holiday_name in holidays[location_cc][type_of_holidays]) {
+ if (typeof holidays[location_cc][type_of_holidays][holiday_name][2] === 'object') {
+ if (-1 !== holidays[location_cc][type_of_holidays][holiday_name][2].indexOf(location_state))
matching_holiday[holiday_name] = holidays[location_cc][type_of_holidays][holiday_name];
- }
+ } else {
+ matching_holiday[holiday_name] = holidays[location_cc][type_of_holidays][holiday_name];
}
- if (Object.keys(matching_holiday).length === 0)
- throw formatLibraryBugMessage('There are no holidays ' + type_of_holidays + ' defined for country ' + location_cc + '.'
- + ' You can also add them: ' + repository_url);
- return matching_holiday;
- } else {
- throw formatLibraryBugMessage('Holidays ' + type_of_holidays + ' are not defined for country ' + location_cc
- + ' and state ' + location_state + '.'
- + ' You can also add them: ' + repository_url);
}
+ if (Object.keys(matching_holiday).length === 0)
+ throw formatLibraryBugMessage('There are no holidays ' + type_of_holidays + ' defined for country ' + location_cc + '.'
+ + ' You can also add them: ' + repository_url);
+ return matching_holiday;
+ } else {
+ throw formatLibraryBugMessage('Holidays ' + type_of_holidays + ' are not defined for country ' + location_cc
+ + ' and state ' + location_state + '.'
+ + ' You can also add them: ' + repository_url);
}
} else {
throw formatLibraryBugMessage('No holidays are defined for country ' + location_cc + '.'
+ ' You can also add them: ' + repository_url);
}
- } else { // we have no idea which holidays do apply because the country code was not provided
+ } else { /* We have no idea which holidays do apply because the country code was not provided. */
throw 'Country code missing which is needed to select the correct holidays (see README how to provide it)';
}
}
@@ -3990,24 +5325,44 @@
var july_1 = new Date(Y, 6, 1);
var canadaDay = july_1.getDay() === 0 ? 2 : 1;
- // calculate first Monday for each month
- var firstMondays = {};
- for (var i = 0; i < 12; i++) {
- var first = new Date(Y, i, 1);
- var firstMonday = 1 + ((8 - first.getDay()) % 7);
- firstMondays[i] = firstMonday;
+ function firstWeekdayOfMonth(month, weekday){
+ var first = new Date(Y, month, 1);
+ return 1 + ((7 + weekday - first.getDay()) % 7);
+ }
+
+ function lastWeekdayOfMonth(month, weekday){
+ var last = new Date(Y, month+1, 0);
+ var offset=((7 + last.getDay() - weekday) % 7);
+ return last.getDate() - offset;
}
return {
- 'firstFebruaryMonday': new Date(Y, 1, firstMondays[1]),
- 'lastFebruarySunday': new Date(Y, 1, lastFebruarySunday),
- 'easter': new Date(Y, M - 1, D),
- 'victoriaDay': new Date(Y, 4, victoriaDay),
- 'canadaDay': new Date(Y, 6, canadaDay),
- 'firstAugustMonday': new Date(Y, 7, firstMondays[7]),
- 'firstSeptemberMonday': new Date(Y, 8, firstMondays[8]),
- 'firstOctoberMonday': new Date(Y, 9, firstMondays[9]),
- 'orthodox easter' : oDate,
+ 'easter' : new Date(Y, M - 1, D),
+ 'orthodox easter' : oDate,
+ 'victoriaDay' : new Date(Y, 4, victoriaDay),
+ 'canadaDay' : new Date(Y, 6, canadaDay),
+ 'firstJanuaryMonday' : new Date(Y, 0, firstWeekdayOfMonth(0, 1)),
+ 'firstFebruaryMonday' : new Date(Y, 1, firstWeekdayOfMonth(1, 1)),
+ 'lastFebruarySunday' : new Date(Y, 1, lastFebruarySunday),
+ 'firstMarchMonday' : new Date(Y, 2, firstWeekdayOfMonth(2, 1)),
+ 'firstAprilMonday' : new Date(Y, 3, firstWeekdayOfMonth(3, 1)),
+ 'firstMayMonday' : new Date(Y, 4, firstWeekdayOfMonth(4, 1)),
+ 'firstJuneMonday' : new Date(Y, 5, firstWeekdayOfMonth(5, 1)),
+ 'firstJulyMonday' : new Date(Y, 6, firstWeekdayOfMonth(6, 1)),
+ 'firstAugustMonday' : new Date(Y, 7, firstWeekdayOfMonth(7, 1)),
+ 'firstSeptemberMonday' : new Date(Y, 8, firstWeekdayOfMonth(8, 1)),
+ 'firstSeptemberSunday' : new Date(Y, 8, firstWeekdayOfMonth(8, 0)),
+ 'firstOctoberMonday' : new Date(Y, 9, firstWeekdayOfMonth(9, 1)),
+ 'firstNovemberMonday' : new Date(Y, 10, firstWeekdayOfMonth(10, 1)),
+ 'firstMarchTuesday' : new Date(Y, 2, firstWeekdayOfMonth(2, 2)),
+ 'firstAugustTuesday' : new Date(Y, 7, firstWeekdayOfMonth(7, 2)),
+ 'firstAugustFriday' : new Date(Y, 7, firstWeekdayOfMonth(7, 5)),
+ 'firstNovemberThursday' : new Date(Y, 10, firstWeekdayOfMonth(10, 4)),
+ 'lastMayMonday' : new Date(Y, 4, lastWeekdayOfMonth(4, 1)),
+ 'lastMarchMonday' : new Date(Y, 2, lastWeekdayOfMonth(2, 1)),
+ 'lastAprilMonday' : new Date(Y, 3, lastWeekdayOfMonth(3, 1)),
+ 'lastAprilFriday' : new Date(Y, 3, lastWeekdayOfMonth(3, 5)),
+ 'lastOctoberFriday' : new Date(Y, 9, lastWeekdayOfMonth(9, 5)),
};
}
@@ -4018,7 +5373,7 @@
var next_holiday;
for (var holiday_name in applying_holidays) {
- if (typeof applying_holidays[holiday_name][0] == 'string') {
+ if (typeof applying_holidays[holiday_name][0] === 'string') {
var selected_movableDay = movableDays[applying_holidays[holiday_name][0]];
if (!selected_movableDay)
throw 'Movable day ' + applying_holidays[holiday_name][0] + ' can not not be calculated.'
@@ -4028,7 +5383,7 @@
selected_movableDay.getDate()
+ applying_holidays[holiday_name][1]
);
- if (year != next_holiday.getFullYear())
+ if (year !== next_holiday.getFullYear())
throw 'The movable day ' + applying_holidays[holiday_name][0] + ' plus '
+ applying_holidays[holiday_name][1]
+ ' days is not in the year of the movable day anymore. Currently not supported.';
@@ -4088,15 +5443,16 @@
var year_from = parseInt(tokens[at][0]);
// error checking {{{
if (is_range && tokens[at+2][0] <= year_from) {
- // handle reversed range
- if (tokens[at+2][0] == year_from)
- throw formatWarnErrorMessage(nrule, at,
- 'A year range in which the start year is equal to the end year does not make sense.'
- + ' Please remove the end year. E.g. "' + year_from + ' May 23"');
- else
- throw formatWarnErrorMessage(nrule, at,
- 'A year range in which the start year is greater than the end year does not make sense.'
- + ' Please turn it over.');
+ // handle reversed range
+ if (tokens[at+2][0] === year_from) {
+ throw formatWarnErrorMessage(nrule, at,
+ 'A year range in which the start year is equal to the end year does not make sense.'
+ + ' Please remove the end year. E.g. "' + year_from + ' May 23"');
+ } else {
+ throw formatWarnErrorMessage(nrule, at,
+ 'A year range in which the start year is greater than the end year does not make sense.'
+ + ' Please turn it over.');
+ }
}
// }}}
@@ -4121,7 +5477,7 @@
} else if (is_range) {
if (ouryear <= year_to)
return [true, new Date(year_to + 1, 0, 1)];
- } else if (ouryear == year_from) {
+ } else if (ouryear === year_from) {
return [true];
}
@@ -4129,7 +5485,13 @@
}}(tokens, at, year_from, is_range, has_period, period));
- at += 1 + (is_range ? 2 : 0) + (has_period ? (has_period == 2 ? 1 : 2) : 0);
+ at += 1 + (is_range ? 2 : 0) + (has_period ? (has_period === 2 ? 1 : 2) : 0);
+ } else if (matchTokens(tokens, at - 1, ',')) { // additional rule
+ throw formatWarnErrorMessage(
+ nrule,
+ at - 1,
+ 'An additional rule does not make sense here. Just use a ";" as rule separator.'
+ + ' See https://wiki.openstreetmap.org/wiki/Key:opening_hours/specification#explain:additional_rule_separator');
} else {
throw formatWarnErrorMessage(nrule, at, 'Unexpected token in year range: ' + tokens[at][1]);
}
@@ -4190,7 +5552,7 @@
week_stable = false;
}
- if (!period && week_from == 1 && week_to == 53) {
+ if (!period && week_from === 1 && week_to === 53) {
/* Shortcut and work around bug. */
selectors.week.push(function(date) { return [true]; });
} else {
@@ -4224,11 +5586,17 @@
}
// console.log("Match");
- return [true, getNextDateOfISOWeek(week_to == 53 ? 1 : week_to + 1, date)];
+ return [true, getNextDateOfISOWeek(week_to === 53 ? 1 : week_to + 1, date)];
}}(week_from, week_to, is_range, period));
}
at += 1 + (is_range ? 2 : 0) + (period ? 2 : 0);
+ } else if (matchTokens(tokens, at - 1, ',')) { // additional rule
+ throw formatWarnErrorMessage(
+ nrule,
+ at - 1,
+ 'An additional rule does not make sense here. Just use a ";" as rule separator.'
+ + ' See https://wiki.openstreetmap.org/wiki/Key:opening_hours/specification#explain:additional_rule_separator');
} else {
throw formatWarnErrorMessage(nrule, at, 'Unexpected token in week range: ' + tokens[at][1]);
}
@@ -4392,11 +5760,11 @@
if (matchTokens(tokens, at+has_year[0], 'month', 'weekday', '[')) {
has_constrained_weekday[0] = getConstrainedWeekday(tokens, at+has_year[0]+3);
has_calc[0] = getMoveDays(tokens, has_constrained_weekday[0][1], 6, 'constrained weekdays');
- at_range_sep = has_constrained_weekday[0][1] + (typeof has_calc[0] != 'undefined' && has_calc[0][1] ? 3 : 0);
+ at_range_sep = has_constrained_weekday[0][1] + (typeof has_calc[0] !== 'undefined' && has_calc[0][1] ? 3 : 0);
} else {
at_range_sep = at+has_year[0]
+ (has_event[0]
- ? (typeof has_calc[0] != 'undefined' && has_calc[0][1] ? 4 : 1)
+ ? (typeof has_calc[0] !== 'undefined' && has_calc[0][1] ? 4 : 1)
: 2);
}
@@ -4417,7 +5785,7 @@
}
// monthday range like Jan 26-Feb 26 {{{
- if (has_year[0] == has_year[1] && (has_month[1] || has_event[1] || has_constrained_weekday[1])) {
+ if (has_year[0] === has_year[1] && (has_month[1] || has_event[1] || has_constrained_weekday[1])) {
if (has_month[0])
checkIfDateIsValid(tokens[at+has_year[0]][0], tokens[at+has_year[0]+1][0], nrule, at+has_year[0]+1);
@@ -4433,10 +5801,10 @@
movableDays = getMovableEventsForYear(has_year[0] ? parseInt(tokens[at][0]) : date.getFullYear());
from_date = movableDays[tokens[at+has_year[0]][0]];
- if (typeof has_calc[0] != 'undefined' && has_calc[0][1]) {
+ if (typeof has_calc[0] !== 'undefined' && has_calc[0][1]) {
var from_year_before_calc = from_date.getFullYear();
from_date.setDate(from_date.getDate() + has_calc[0][0]);
- if (from_year_before_calc != from_date.getFullYear())
+ if (from_year_before_calc !== from_date.getFullYear())
throw formatWarnErrorMessage(nrule, at+has_year[0]+has_calc[0][1]*3,
'The movable day ' + tokens[at+has_year[0]][0] + ' plus ' + has_calc[0][0]
+ ' days is not in the year of the movable day anymore. Currently not supported.');
@@ -4459,10 +5827,10 @@
: date.getFullYear());
to_date = movableDays[tokens[at_sec_event_or_month][0]];
- if (typeof has_calc[1] != 'undefined' && has_calc[1][1]) {
+ if (typeof has_calc[1] !== 'undefined' && has_calc[1][1]) {
var to_year_before_calc = to_date.getFullYear();
to_date.setDate(to_date.getDate() + has_calc[1][0]);
- if (to_year_before_calc != to_date.getFullYear())
+ if (to_year_before_calc !== to_date.getFullYear())
throw formatWarnErrorMessage(nrule, at_sec_event_or_month+has_calc[1][1],
'The movable day ' + tokens[at_sec_event_or_month][0] + ' plus ' + has_calc[1][0]
+ ' days is not in the year of the movable day anymore. Currently not supported.');
@@ -4508,7 +5876,7 @@
at = (has_constrained_weekday[1]
? has_constrained_weekday[1][1]
: at_sec_event_or_month + (has_event[1] ? 1 : 2))
- + (typeof has_calc[1] != 'undefined' ? has_calc[1][1] : 0);
+ + (typeof has_calc[1] !== 'undefined' ? has_calc[1][1] : 0);
// }}}
// Monthday range like Jan 26-31 {{{
@@ -4559,13 +5927,13 @@
var from_date = new Date(has_year ? year : date.getFullYear(),
month, range_from);
- if (month == 1 && range_from != from_date.getDate()) // Only on leap years does this day exist.
+ if (month === 1 && range_from !== from_date.getDate()) // Only on leap years does this day exist.
return [false]; // If day 29 does not exist,
// then the date object adds one day to date
// and this selector should not match.
var to_date = new Date(from_date.getFullYear(),
month, range_to);
- if (month == 1 && is_range && range_to != to_date.getDate()) // Only on leap years does this day exist.
+ if (month === 1 && is_range && range_to !== to_date.getDate()) // Only on leap years does this day exist.
return [false];
if (date.getTime() < from_date.getTime())
@@ -4612,7 +5980,7 @@
if (add_days[0]) {
event_date.setDate(event_date.getDate() + add_days[0]);
- if (date.getFullYear() != event_date.getFullYear())
+ if (date.getFullYear() !== event_date.getFullYear())
throw formatWarnErrorMessage(nrule, at+has_year+add_days[1], 'The movable day ' + tokens[at+has_year][0] + ' plus '
+ add_days[0]
+ ' days is not in the year of the movable day anymore. Currently not supported.');
@@ -4621,7 +5989,7 @@
if (date.getTime() < event_date.getTime())
return [false, event_date];
// else if (date.getTime() < event_date.getTime() + msec_in_day) // does not work because of daylight saving times
- else if (event_date.getMonth() * 100 + event_date.getDate() == date.getMonth() * 100 + date.getDate())
+ else if (event_date.getMonth() * 100 + event_date.getDate() === date.getMonth() * 100 + date.getDate())
return [true, new Date(date.getFullYear(), date.getMonth(), date.getDate() + 1)];
else
return [false, new Date(date.getFullYear() + 1, 0, 1)];
@@ -4633,7 +6001,7 @@
else
selectors.monthday.push(selector);
- at += has_year[0] + has_event[0] + (typeof has_calc[0][1] != 'undefined' && has_calc[0][1] ? 3 : 0);
+ at += has_year[0] + has_event[0] + (typeof has_calc[0][1] !== 'undefined' && has_calc[0][1] ? 3 : 0);
// }}}
} else if (has_constrained_weekday[0]) {
at = parseMonthRange(tokens, at);
@@ -4672,11 +6040,14 @@
var date_matching_rules = [];
+ /* Go though all date selectors and check if they return something
+ * else than closed for the given date.
+ */
for (var nrule = 0; nrule < rules.length; nrule++) {
var matching_date_rule = true;
// console.log(nrule, 'length', rules[nrule].date.length);
- // Try each date selector type
+ /* Try each date selector type. */
for (var ndateselector = 0; ndateselector < rules[nrule].date.length; ndateselector++) {
var dateselectors = rules[nrule].date[ndateselector];
// console.log(nrule, ndateselector);
@@ -4687,8 +6058,8 @@
if (res[0]) {
has_matching_selector = true;
- if (typeof res[2] == 'string') { // holiday name
- comment = [ res[2] ];
+ if (typeof res[2] === 'string') { // holiday name
+ comment = [ res[2], nrule ];
}
}
@@ -4705,15 +6076,15 @@
// are checked first.
break;
}
-
}
if (matching_date_rule) {
- // The following lines implement date overwriting logic (e.g. for
- // "Mo-Fr 10:00-20:00; We 10:00-16:00", We rule overrides Mo-Fr rule partly (We).
- //
- // This is the only way to be consistent. I thought about ("22:00-02:00; Tu 12:00-14:00") letting Th override 22:00-02:00 partly:
- // Like: Th 00:00-02:00,12:00-14:00 but this would result in including 22:00-00:00 for Th which is probably not what you want.
+ /* The following lines implement date overwriting logic (e.g. for
+ * "Mo-Fr 10:00-20:00; We 10:00-16:00", We rule overrides Mo-Fr rule partly (We).
+ *
+ * This is the only way to be consistent. I thought about ("22:00-02:00; Tu 12:00-14:00") letting Th override 22:00-02:00 partly:
+ * Like: Th 00:00-02:00,12:00-14:00 but this would result in including 22:00-00:00 for Th which is probably not what you want.
+ */
if ((rules[nrule].date.length > 0 || nrule > 0 && rules[nrule].meaning && rules[nrule-1].date.length === 0)
&& (rules[nrule].meaning || rules[nrule].unknown)
&& !rules[nrule].wrapped && !rules[nrule].additional && !rules[nrule].fallback
@@ -4730,6 +6101,7 @@
}
}
+ // console.log(date_matching_rules);
rule:
for (var nrule = 0; nrule < date_matching_rules.length; nrule++) {
var rule = date_matching_rules[nrule];
@@ -4737,18 +6109,13 @@
// console.log('Processing rule ' + rule + ': with date ' + date
// + ' and ' + rules[rule].time.length + ' time selectors (comment: "' + rules[rule].comment + '").');
- // there is no time specified, state applies to the whole day
+ /* There is no time specified, state applies to the whole day. */
if (rules[rule].time.length === 0) {
// console.log('there is no time', date);
if (!rules[rule].fallback || (rules[rule].fallback && !(resultstate || unknown))) {
resultstate = rules[rule].meaning;
unknown = rules[rule].unknown;
- match_rule = rule;
-
- if (typeof rules[rule].comment != 'undefined')
- comment = rules[rule].comment;
- else if (typeof comment == 'object') // holiday name
- comment = comment[0];
+ match_rule = rule;
// if (rules[rule].fallback)
// break rule; // fallback rule matched, no need for checking the rest
@@ -4766,31 +6133,27 @@
unknown = rules[rule].unknown;
match_rule = rule;
- if (typeof rules[rule].comment == 'string') // only use comment if one is specified
- comment = rules[rule].comment;
- else if (typeof comment == 'object') // holiday name
- comment = comment[0];
- else if (comment === 'Specified as open end. Closing time was guessed.')
- comment = rules[rule].comment;
+ /* Reset open end comment */
+ if (typeof comment === 'object' && comment[0] === 'Specified as open end. Closing time was guessed.')
+ comment = undefined;
// open end
if (res[2] === true && (resultstate || unknown)) {
- if (typeof comment == 'undefined')
- comment = 'Specified as open end. Closing time was guessed.';
+ comment = [ 'Specified as open end. Closing time was guessed.', match_rule ];
resultstate = false;
unknown = true;
/* Hack to make second rule in '07:00+,12:00-16:00; 16:00-24:00 closed "needed because of open end"' obsolete {{{ */
- if (typeof rules[rule].time[timesel+1] == 'function') {
+ if (typeof rules[rule].time[timesel+1] === 'function') {
var next_res = rules[rule].time[timesel+1](date);
if ( !next_res[0]
// && next_res[2]
- && typeof next_res[1] == 'object'
- // && getValueForDate(next_res[1], true) != getValueForDate(date, true) // Just to be sure.
+ && typeof next_res[1] === 'object'
+ // && getValueForDate(next_res[1], true) !== getValueForDate(date, true) // Just to be sure.
&& rules[rule].time[timesel](new Date(date.getTime() - 1))[0]
- /* To keep the following two apart:
+ /* To distinguish the following two values:
* 'sunrise-14:00,14:00+',
* '07:00+,12:00-16:00',
*/
@@ -4812,10 +6175,10 @@
* + ', ' overwritten part: 00:00-03:00 open + '00:00-02:00 open', // Second internal rule.
*/
if ( false
- && typeof rules[rule-1] == 'object'
- && rules[rule].build_from_token_rule.toString() == rules[rule-1].build_from_token_rule.toString()
- && typeof rules[rule] == 'object'
- && rules[rule].build_from_token_rule.toString() == rules[rule].build_from_token_rule.toString()
+ && typeof rules[rule-1] === 'object'
+ && rules[rule].build_from_token_rule.toString() === rules[rule-1].build_from_token_rule.toString()
+ && typeof rules[rule] === 'object'
+ && rules[rule].build_from_token_rule.toString() === rules[rule].build_from_token_rule.toString()
) {
var last_wrapping_time_selector = rules[rule].time[rules[rule].time.length - 1];
@@ -4823,10 +6186,10 @@
// console.log(last_w_res);
if ( last_w_res[0]
- && typeof last_w_res[2] == 'undefined'
- && (typeof last_w_res[2] == 'undefined' || last_w_res[2] === false) // Not match for 'Tu 23:59-40:00+'
- && typeof last_w_res[1] == 'object'
- && date.getTime() == last_w_res[1].getTime()
+ && typeof last_w_res[2] === 'undefined'
+ && (typeof last_w_res[2] === 'undefined' || last_w_res[2] === false) // Do not match for 'Tu 23:59-40:00+'
+ && typeof last_w_res[1] === 'object'
+ && date.getTime() === last_w_res[1].getTime()
) {
// '05:00-06:00,17:00+,13:00-02:00',
@@ -4856,6 +6219,17 @@
}
}
+ if (typeof rules[match_rule] === 'object' && typeof rules[match_rule].comment === 'string') {
+ /* Only use comment if one is explicitly specified. */
+ comment = rules[match_rule].comment;
+ } else if (typeof comment === 'object') {
+ if (comment[1] === match_rule) {
+ comment = comment[0];
+ } else {
+ comment = undefined;
+ }
+ }
+
// console.log('changedate', changedate, resultstate, comment, match_rule);
return [ resultstate, changedate, unknown, comment, match_rule ];
};
@@ -4879,18 +6253,18 @@
if (!conf.leave_weekday_sep_one_day_betw
&& at - selector_start > 1 && (matchTokens(tokens, at-1, ',') || matchTokens(tokens, at-1, '-'))
&& matchTokens(tokens, at-2, 'weekday')
- && tokens[at][0] == (tokens[at-2][0] + 1) % 7) {
+ && tokens[at][0] === (tokens[at-2][0] + 1) % 7) {
value = value.substring(0, value.length - 1) + conf.sep_one_day_between;
}
value += weekdays[tokens[at][0]];
} else if (at - selector_start > 0 // e.g. '09:0' -> '09:00'
- && selector_type == 'time'
+ && selector_type === 'time'
&& matchTokens(tokens, at-1, 'timesep')
&& matchTokens(tokens, at, 'number')) {
value += (tokens[at][0] < 10 ? '0' : '') + tokens[at][0].toString();
- } else if (selector_type == 'time' // e.g. '9:00' -> ' 09:00'
+ } else if (selector_type === 'time' // e.g. '9:00' -> ' 09:00'
&& conf.zero_pad_hour
- && at != tokens.length
+ && at !== tokens.length
&& matchTokens(tokens, at, 'number')
&& matchTokens(tokens, at+1, 'timesep')) {
value += (
@@ -4898,7 +6272,7 @@
(tokens[at][0] === 0 && conf.one_zero_if_hour_zero ?
'' : '0') :
'') + tokens[at][0].toString();
- } else if (selector_type == 'time' // e.g. '9-18' -> '09:00-18:00'
+ } else if (selector_type === 'time' // e.g. '9-18' -> '09:00-18:00'
&& at + 2 <= selector_end
&& matchTokens(tokens, at, 'number')
&& matchTokens(tokens, at+1, '-')
@@ -4915,8 +6289,8 @@
} else if (matchTokens(tokens, at, 'closed')) {
value += (conf.leave_off_closed ? tokens[at][0] : conf.keyword_for_off_closed);
} else if (at - selector_start > 0 && matchTokens(tokens, at, 'number')
- && (matchTokens(tokens, at-1, 'month') && selector_type == 'month'
- || matchTokens(tokens, at-1, 'week') && selector_type == 'week'
+ && (matchTokens(tokens, at-1, 'month') && selector_type === 'month'
+ || matchTokens(tokens, at-1, 'week') && selector_type === 'week'
)) {
value += ' '
+ (conf.zero_pad_month_and_week_numbers && tokens[at][0] < 10 ? '0' : '')
@@ -4934,11 +6308,11 @@
} else if (at + 2 <= selector_end
&& (matchTokens(tokens, at, '-') || matchTokens(tokens, at, '+'))
&& matchTokens(tokens, at+1, 'number', 'calcday')) {
- value += ' ' + tokens[at][0] + tokens[at+1][0] + ' day' + (Math.abs(tokens[at+1][0]) == 1 ? '' : 's');
+ value += ' ' + tokens[at][0] + tokens[at+1][0] + ' day' + (Math.abs(tokens[at+1][0]) === 1 ? '' : 's');
at += 2;
- } else if (at == selector_end
- && selector_type == 'weekday'
- && tokens[at][0] == ':') {
+ } else if (at === selector_end
+ && selector_type === 'weekday'
+ && tokens[at][0] === ':') {
// Do nothing.
} else {
value += tokens[at][0].toString();
@@ -4971,7 +6345,7 @@
/* setDate {{{ */
this.setDate = function(date) {
- if (typeof date != 'object')
+ if (typeof date !== 'object')
throw 'Date parameter needed.';
prevstate = [ undefined, date, undefined, undefined, undefined ];
@@ -5005,7 +6379,7 @@
/* getMatchingRule: Get the rule which matched thus deterrents the current state {{{ */
this.getMatchingRule = function() {
- if (typeof state[4] == 'undefined')
+ if (typeof state[4] === 'undefined')
return undefined;
return rules[state[4]].build_from_token_rule[2];
@@ -5129,13 +6503,13 @@
while (it.advance(to)) {
if (it.getState() || it.getUnknown()) {
- if (res.length !== 0 && typeof res[res.length - 1][1] == 'undefined') {
+ if (res.length !== 0 && typeof res[res.length - 1][1] === 'undefined') {
// last state was also open or unknown
res[res.length - 1][1] = it.getDate();
}
res.push([it.getDate(), undefined, it.getUnknown(), it.getComment()]);
} else {
- if (res.length !== 0 && typeof res[res.length - 1][1] == 'undefined') {
+ if (res.length !== 0 && typeof res[res.length - 1][1] === 'undefined') {
// only use the first time as closing/change time and ignore closing times which might follow
res[res.length - 1][1] = it.getDate();
}
diff --git a/i18n/build.xml b/i18n/build.xml
index f497705..a839c2f 100644
--- a/i18n/build.xml
+++ b/i18n/build.xml
@@ -5,7 +5,7 @@
<property name="josm.presets" value="${josm.build.dir}/data/defaultpresets.xml"/>
<!--<property name="josm.style" value="${josm.build.dir}/styles/standard/elemstyles.xml"/>-->
<property name="plugin.dir" value="../plugins"/>
- <property name="validator.tagfile" value="${josm.build.dir}/data/validator/tagchecker.cfg"/>
+ <!--<property name="validator.tagfile" value="${josm.build.dir}/data/validator/tagchecker.cfg"/>-->
<property name="maps.srcfile" value="http://josm.openstreetmap.de/maps"/>
<property name="surveyor.srcfile" value="${plugin.dir}/surveyor/resources/surveyor.xml"/>
<property name="i18n.build.dir" value="build"/>
@@ -30,9 +30,9 @@
<!--<exec executable="perl" output="${i18n.build.dir}/trans_style.java">
<arg line="convstyle.pl ${josm.style}"/>
</exec>-->
- <exec executable="perl" failonerror="true" output="${i18n.build.dir}/trans_validator.java">
+ <!--<exec executable="perl" failonerror="true" output="${i18n.build.dir}/trans_validator.java">
<arg line="convvalidator.pl ${validator.tagfile}"/>
- </exec>
+ </exec>-->
<exec executable="perl" failonerror="true" output="${i18n.build.dir}/trans_maps.java">
<arg line="convmaps.pl ${maps.srcfile}"/>
</exec>
@@ -96,7 +96,6 @@
</antcall>
</target>
<target name="buildcore" depends="po/josm.pot,init">
- <gettext-merge keysFile="josm.pot" poDirectory="po"/>
<antcall target="coretrans"/>
</target>
<target name="coretrans">
diff --git a/i18n/convpreset.pl b/i18n/convpreset.pl
index 55c599d..4c86335 100644
--- a/i18n/convpreset.pl
+++ b/i18n/convpreset.pl
@@ -24,6 +24,9 @@ sub fix($)
{
my ($val) = @_;
$val =~ s/'/''/g;
+ $val =~ s/</</g;
+ $val =~ s/>/>/g;
+ $val =~ s/&/&/g;
return $val;
}
diff --git a/i18n/i18n.pl b/i18n/i18n.pl
index 1cadc39..1612f1b 100755
--- a/i18n/i18n.pl
+++ b/i18n/i18n.pl
@@ -7,6 +7,8 @@ use Encode;
my $waswarn = 0;
my $maxcount = 0;
+my $lang_pattern = '([a-z]{2}_[A-Z]{2}|[a-z]{2,3}|[a-z]{2}\@[a-z]+)';
+my $lang_pattern_file = '([a-z]{2}_[A-Z]{2}|[a-z]{2,3}|[a-z]{2}-[a-z]+)';
main();
@@ -28,13 +30,13 @@ sub loadfiles($@)
my $linenum = 0;
my $cnt = -1; # don't count translators info
- if($file =~ /\/(.._..)\.po$/ || $file =~ /\/(...?)\.po$/)
+ if($file =~ /\/$lang_pattern\.po$/)
{
my $l = $1;
++$lang->{$l};
my %postate = (last => "", type => "");
my $linenum = 0;
- print "Reading file $file\n";
+ print "Reading file $file (lang $l)\n";
while(<FILE>)
{
++$linenum;
@@ -260,10 +262,10 @@ sub createlang($@)
{
my $la;
my $cnt = 0;
- if($file =~ /[-_](.._..)\.lang$/ || $file =~ /^(?:.*\/)?(.._..)\.lang$/ ||
- $file =~ /[-_](...?)\.lang$/ || $file =~ /^(?:.*\/)?(...?)\.lang$/)
+ if($file =~ /^(?:.*\/)?$lang_pattern_file\.lang$/)
{
$la = $1;
+ $la =~ s/-/\@/;
}
else
{
@@ -369,6 +371,7 @@ sub main
my @clang;
foreach my $la (sort keys %lang)
{
+ $la =~ s/\@/-/;
push(@clang, "${basename}$la.lang");
}
push(@clang, "${basename}en.lang");
diff --git a/i18n/launchpad.pl b/i18n/launchpad.pl
index aa182c5..e3eedf0 100755
--- a/i18n/launchpad.pl
+++ b/i18n/launchpad.pl
@@ -15,13 +15,13 @@ $pwd = '';
# list of supported languages
my %lang = map {$_ => 1} (
-"ast", "bg", "ca", "cs", "da", "de", "el", "en_AU", "en_GB",
+"ast", "bg", "ca", "ca\@valencia", "cs", "da", "de", "el", "en_AU", "en_GB",
"es", "et", "fi", "fr", "gl", "hu", "id",
"it", "ja", "km", "lt", "nl", "pl", "pt", "pt_BR", "ru", "sk",
"sv", "uk", "zh_CN", "zh_TW"
);
-my $revision = '$Revision: 31071 $';
+my $revision = '$Revision: 31086 $';
$revision =~ s/^.*?(\d+).*$/$1/;
my $agent = "JOSM_Launchpad/1.$revision";
@@ -156,10 +156,10 @@ sub copypo
my ($path) = @_;
foreach my $name (split("\n", `find $path -name "*.po"`))
{
- $name =~ /([a-zA-Z_]+)\.po/;
+ $name =~ /([a-zA-Z_@]+)\.po/;
if($lang{$1})
{
- system "cp -v $name po/$1.po";
+ system("cp", "-v", $name, "po/$1.po");
}
elsif($cleanall)
{
diff --git a/i18n/po/af.po b/i18n/po/af.po
index 465dbf2..2194938 100644
--- a/i18n/po/af.po
+++ b/i18n/po/af.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2011-10-13 02:39+0000\n"
"Last-Translator: Grant Slater <Unknown>\n"
"Language-Team: Afrikaans <af at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:30+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:30+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: af\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Goed"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr "Goed"
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/am.po b/i18n/po/am.po
index 6a4cdce..073a350 100644
--- a/i18n/po/am.po
+++ b/i18n/po/am.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2010-03-30 12:09+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Amharic <am at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:31+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:31+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: am\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ar.po b/i18n/po/ar.po
index 608a763..0e0010a 100644
--- a/i18n/po/ar.po
+++ b/i18n/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2013-03-30 14:17+0000\n"
"Last-Translator: Chdoula <chdoula at gmail.com>\n"
"Language-Team: Arabic <ar at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:32+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:32+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: ar\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -446,15 +446,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "وزّع العقد"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "وزع العقد المختارة على مسافاة متساوية على طول خط."
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "نزّل من أو.أس.أم ..."
@@ -469,6 +472,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -963,6 +969,12 @@ msgstr "أغلق الحوار و الغي التنزيل"
msgid "Download Data"
msgstr "نزل معطيات"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1711,6 +1723,28 @@ msgstr ""
msgid "Notes"
msgstr "الملاحظات"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1720,6 +1754,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2302,134 +2339,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>مغيير</b> - كلّ الأغراض المغييرة"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>المختارة</b> - كلّ الأغراض المختارة"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>غير المكتملة</b> - كلّ الأغراض غير المكتملة"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>غير المسمات</b> - كلّ الأغراض غير المسمات"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "إستعمل <b>|</b> أو <b>أو</b> للدمج بالأو المنطقي"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2469,6 +2378,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2484,12 +2399,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2526,7 +2435,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2538,6 +2452,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3884,7 +3801,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4528,6 +4445,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4586,6 +4506,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5980,9 +5903,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6851,8 +6771,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<مختلف>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr ""
@@ -6869,6 +6799,12 @@ msgstr "عضو من"
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr "<مختلف>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6999,6 +6935,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7725,18 +7671,21 @@ msgstr "الغرض"
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7745,6 +7694,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8768,6 +8720,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10738,6 +10693,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11375,6 +11336,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14109,6 +14078,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14212,6 +14184,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14339,6 +14314,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14961,11 +14939,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15282,6 +15255,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15985,15 +15963,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "بهائي"
@@ -17241,6 +17238,12 @@ msgstr ""
msgid "Marina"
msgstr "مارينا"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr "رصيف ميناء"
@@ -17639,6 +17642,12 @@ msgstr "غسيل سيارات"
msgid "Car Dealer"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Repair"
msgstr "تصليح سيارات"
@@ -17651,12 +17660,6 @@ msgstr ""
msgid "Rental"
msgstr "إستئجار سيارة"
-msgid "Second hand"
-msgstr ""
-
-msgid "only"
-msgstr ""
-
msgid "Sharing"
msgstr "مشاركة السيارة"
@@ -17866,6 +17869,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr "مدخل قطار نفقي"
+
msgid "Station or amenities"
msgstr ""
@@ -17921,9 +17927,6 @@ msgstr ""
msgid "Building"
msgstr "مبنى"
-msgid "Subway Entrance"
-msgstr "مدخل قطار نفقي"
-
msgid "Ticket Machine"
msgstr ""
@@ -18050,7 +18053,7 @@ msgstr "النجوم"
msgid "Motel"
msgstr "فندق (رخيص)"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18695,9 +18698,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18871,6 +18871,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19618,9 +19630,6 @@ msgstr "منارة"
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22176,6 +22185,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22342,36 +22361,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23490,6 +23479,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23544,6 +23539,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24153,6 +24176,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24467,9 +24493,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25508,6 +25549,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27612,6 +27656,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ast.po b/i18n/po/ast.po
index 46686f2..9b44919 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: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2015-03-26 12:59+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Asturian <ast at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:33+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:33+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: ast\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -460,9 +460,6 @@ msgstr "Activar panel de diálogos"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Conmuta el panel de diálogos, maximiza la vista del mapa"
-msgid "Distribute Nodes"
-msgstr "Distribuir nodos"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Distribuir los nodos seleicionaos a distancies iguales a lo llargo d''una "
@@ -471,6 +468,12 @@ msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Ignorando {0} nodos con coordenaes nules"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Descargar d''OSM..."
@@ -487,6 +490,9 @@ msgstr ""
msgid "Download data"
msgstr "Descargar datos"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Descargar oxetu..."
@@ -1033,6 +1039,12 @@ msgstr "Zarrar el diálogu y encaboxar la descarga"
msgid "Download Data"
msgstr "Descargar datos"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Aceutar"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1842,6 +1854,28 @@ msgstr "Descarga de Notes"
msgid "Notes"
msgstr "Billetes"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr "Descargar cambeos a OSM estruyíos"
@@ -1851,6 +1885,9 @@ msgstr "Descargar cambeos a OSM"
msgid "Download Compressed OSM"
msgstr "Descargar OSM estruyíu"
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "Descargar OSM"
@@ -2489,170 +2526,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Espresión de gueta non válida"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Baker Street</b> - ''Baker'' y ''Street'' en cualesquier clave"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' en cualesquier clave"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-"<b>clave:Bak</b> - ''Bak'' en cualesquier llugar de la clave ''clave''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-clave:Bak</b> - ''Bak'' en dengún llugar de la clave ''clave''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>clave=valor</b> - la clave ''clave'' col valor exactu ''valor''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>clave=*</b> - la clave ''clave'' con cualesquier valor. Prueba tamién "
-"<b>*=valor</b>, <b>clave=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>-clave:</b> - la clave ''clave'' con cualesquier valor"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>-clave?</b> - la clave ''clave'' col valor ''yes'', ''true'', ''1'' o "
-"''on''"
-
-msgid "Special targets"
-msgstr "Etiquetes especiales"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - oxetos con un tipu correspondiente (<b>node</b>, "
-"<b>way</b>, <b>relation</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - oxetos camudaos por un usuariu"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - oxetos camudaos por usuarios anónimos"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... -oxetos cola ID dada (0 pa oxetos nuevos)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - oxetos cola versión dada (0 oxetos ensin versión "
-"conseñada)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - oxetos cola ID de conxuntu de cambios dada (0 oxetos "
-"ensin conxuntu de cambios)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - oxetos con un determináu númberu de nodos "
-"(<b>nodes:</b>contaos, <b>nodes:</b>min-max, <b>nodes:</b>min- o "
-"<b>nodes:</b>-max)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - oxetos con un determináu númberu d''etiquetes "
-"(<b>tags:</b>contaos, <b>tags:</b>min-max, <b>tags:</b>min- o <b>tags:</b>-"
-"max)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - oxetos con ciertu rol nuna relación"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>timestamp - los oxetos con esta fecha y hora del últimu "
-"cambéu (2009-11-12T14:51:09Z, 2009-11-12 o T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-"<b>timestamp:</b>min/max - los oxetos col últimu cambéu dientro del rangu"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - figures zarraes con una área determinada en m² "
-"(<b>areasize:</b>min-max o <b>areasize:</b>max)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - tolos oxetos camudaos"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - tolos oxetos esbillaos"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - tolos oxetos incompletos"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - tolos oxetos ensin etiqueta"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr "<b>closed</b> - toles vies zarraes (un nodu nun se considera zarráu)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>expr</i></b> - tolos fíos de tolos oxetos que cumplan la "
-"espresión"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - tolos padres de tolos oxetos que cumplan la "
-"espresión"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - oxetos (y tolos sos nodos de vía / "
-"rellaciones de miembru) na área descargá"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - oxetos (y tolos sos nodos de vía / rellaciones de "
-"miembru) na vista actual"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-"Usar <b>|</b> o <b>OR</b> pa realizar busques combinaes col operador lóxicu "
-"O (dixunción)"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Usar <b>\"</b> para citar los operadores (p.ex. si la clave contién <b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Dientro de les cadenes ente comines los carauteres <b>\"</b> y <b>\\</b> "
-"tienen d''escapase poniendo antes <b>\\</b> (p.ex. <b>\\\"</b> y <b>\\\\"
-"</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Usar <b>(</b> y <b>)</b> p''agrupar espresiones"
-
msgid "basic examples"
msgstr "exemplos básicos"
@@ -2693,6 +2566,15 @@ msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
"concuerda si ''clave'' ye menor que ''value'' (n''otres palabres, menor que)"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"pa operadores entrecomillaos.<br>Dientro de les cadenes entrecomillaes los "
+"caracteres<b>\"</b> y <b>\\</b> tienen de ser especificase con un "
+"procedimientu <b>\\</b> (p.e. <b>\\\"</b> y <b>\\\\</b>)."
+
msgid "combinators"
msgstr "combinadores"
@@ -2709,15 +2591,6 @@ msgstr "non lóxicu"
msgid "use parenthesis to group expressions"
msgstr "usar paréntesis p''arrexuntar espresiones"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"pa operadores entrecomillaos.<br>Dientro de les cadenes entrecomillaes los "
-"caracteres<b>\"</b> y <b>\\</b> tienen de ser especificase con un "
-"procedimientu <b>\\</b> (p.e. <b>\\\"</b> y <b>\\\\</b>)."
-
msgid "objects"
msgstr "oxetos"
@@ -2754,8 +2627,13 @@ msgstr "oxetos cola última fecha y hora de cambéu dientro del rangu"
msgid "properties"
msgstr "propiedaes"
-msgid "objects with at least 20 nodes"
-msgstr "oxetos con siquier 20 nodos"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "oxetos que tienen de 5 a 10 etiquetes"
@@ -2766,6 +2644,9 @@ msgstr "oxetos con un rol determináu nuna relación"
msgid "closed ways with an area of 100 m²"
msgstr "víes zarraes con una área de 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr "estáu"
@@ -4239,8 +4120,8 @@ msgstr ""
"coinciden con dalgún de los atributos \"name:*\" introducíos (por casu, "
"España - Spanien - Spain)."
-msgid "A name:* translation is missing."
-msgstr "Un nome:* traducción nun s''atopa."
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "Un nome non s''atopa, anque''l nome: * esiste."
@@ -4910,6 +4791,9 @@ msgstr "Amosar la versión de JOSM y colar"
msgid "Print debugging messages to console"
msgstr "Imprimir los mensaxes de depuración a la consola"
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr "Evacuar l''accesu al recursu(s) dáu(s), dixebraos por comes"
@@ -4978,6 +4862,9 @@ msgstr "Hai que cargar dalgún datu si usa --selección."
msgid "Printing debugging messages to console"
msgstr "Visualización de mensaxes de depuración en consola"
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr "Activáu nivel de depuración detallada (traces)"
@@ -6531,9 +6418,6 @@ msgstr "Llat/Llon"
msgid "East/North"
msgstr "Este/Norte"
-msgid "Ok"
-msgstr "Aceutar"
-
msgid "Please enter a GPS coordinates"
msgstr "Por favor, introduza unes coordenaes GPS"
@@ -7476,8 +7360,18 @@ msgstr "Clave descartable: primer planu"
msgid "Discardable key: background"
msgstr "Clave descartable: segundu planu"
-msgid "<different>"
-msgstr "<diferente>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr "Escueya los oxetos a los que camudar les etiquetes."
@@ -7494,6 +7388,12 @@ msgstr "Miembru de"
msgid "Position"
msgstr "Allugamientu"
+msgid "<different>"
+msgstr "<diferente>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Etiquetes: {0} / Miembros: {1}"
@@ -7628,6 +7528,16 @@ msgstr "Establecer el númberu d''etiquetes añedíes pocayá"
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
"Por favor, introduza''l númberu d''etiquetes añedíes apocayá a amosar"
@@ -8443,18 +8353,21 @@ msgstr "Oxetu"
msgid "not present"
msgstr "non presente"
-msgid "Changeset:"
-msgstr "Conxuntu de cambeos:"
-
msgid "Changeset comment"
msgstr "Comentar conxuntu de cambeos"
msgid "Changeset source"
msgstr "Fonte del conxuntu de cambeos"
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr "<b>Fonte</b>:"
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8465,6 +8378,9 @@ msgid ""
msgstr ""
"<html>Versión <strong>{0}</strong> creada´l <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "Información del coxuntu de cambeos"
@@ -9647,6 +9563,9 @@ msgstr "Escala de píxeles: {0}"
msgid "Best zoom: {0}"
msgstr "Meyor zoom: {0}"
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "Capa TMS ({0}), descargando´n nivel d´averamientu {1}"
@@ -11865,6 +11784,12 @@ msgstr "Añedir al selector del mapa esnidiosu: "
msgid "Tile cache directory: "
msgstr "Directoriu del caxé de teseles: "
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12576,6 +12501,14 @@ msgstr "Verificar dacuando si hai nuevos mensaxes"
msgid "Check interval (minutes):"
msgstr "Comprobar cada (minutos):"
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
"Erru al recuperar el Token d''Accesu OAuth dende l''alministrador de "
@@ -15719,6 +15652,9 @@ msgstr "Geoimage.at MaxRes"
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (mapa base)"
@@ -15822,6 +15758,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
@@ -15954,6 +15893,9 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Drone Imagery (Haiti)"
@@ -16576,13 +16518,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"Dexar editar información de tráficu y esportalo al simulador de movilidá "
-"urbana SUMO"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -16993,6 +16928,13 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "Editar característiques de OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Dexar editar información de tráficu y esportalo al simulador de movilidá "
+"urbana SUMO"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Dexa añedir marcadores/nodos a les posiciones GPS actual."
@@ -17726,15 +17668,34 @@ msgstr "Ciclu"
msgid "deciduous"
msgstr "caducifoliu"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr "perennifoliu"
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr "semi_caducifoliu"
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr "semi_perennifoliu"
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahaísta"
@@ -19008,6 +18969,12 @@ msgstr "Ruta de ferry"
msgid "Marina"
msgstr "Puertu deportivu"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "públicu"
+
msgid "Pier"
msgstr "Embarcaeru"
@@ -19406,6 +19373,12 @@ msgstr "Llimpieza"
msgid "Car Dealer"
msgstr "Concesionariu d''automóviles"
+msgid "Second hand"
+msgstr "Segunda mano"
+
+msgid "only"
+msgstr "solamente"
+
msgid "Repair"
msgstr "Taller"
@@ -19418,12 +19391,6 @@ msgstr "Ruedes"
msgid "Rental"
msgstr "Arriendu"
-msgid "Second hand"
-msgstr "Segunda mano"
-
-msgid "only"
-msgstr "solamente"
-
msgid "Sharing"
msgstr "Compartíu"
@@ -19635,6 +19602,9 @@ msgstr "Puntu de detención"
msgid "Platform"
msgstr "Plataforma o andén (parada)"
+msgid "Subway Entrance"
+msgstr "Boca de metru"
+
msgid "Station or amenities"
msgstr "Estación o servicios"
@@ -19690,9 +19660,6 @@ msgstr "Estación"
msgid "Building"
msgstr "Edificiu"
-msgid "Subway Entrance"
-msgstr "Boca de metru"
-
msgid "Ticket Machine"
msgstr "Máquina espendedora de billetes"
@@ -19819,8 +19786,8 @@ msgstr "Estrelles"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
-msgstr "Casa de güéspedes/Cama & almuerzu"
+msgid "Guest House/Bed & Breakfast"
+msgstr ""
msgid "Chalet"
msgstr "Cabaña o bungalow"
@@ -20466,9 +20433,6 @@ msgstr "Baños"
msgid "Access rights"
msgstr "Permisos d''accesu"
-msgid "public"
-msgstr "públicu"
-
msgid "seasonal"
msgstr "estacional"
@@ -20642,6 +20606,18 @@ msgstr "Papelera"
msgid "Waste Disposal/Dumpster"
msgstr "Contenedor de borrafes"
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr "Ciclu de funcionamientu"
+
msgid "Backrest"
msgstr "Respaldu"
@@ -21389,9 +21365,6 @@ msgstr "Faru"
msgid "Street Lamp"
msgstr "Farola"
-msgid "Operation times"
-msgstr "Ciclu de funcionamientu"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Llu-Vi 22:00-05:00"
@@ -23975,6 +23948,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24146,36 +24129,6 @@ msgstr "Amosar etiquetes de les víes (con zoom altu)"
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr "Esportar a OSM"
-
-msgid "Export traffic data to SUMO network file."
-msgstr "Esportar datos de tráficu a arquivu de rede SUMU."
-
-msgid "SUMO Export"
-msgstr "Esportar a SUMU"
-
-msgid "Export"
-msgstr "Esportar"
-
-msgid "Port:"
-msgstr "Puertu:"
-
-msgid "refresh the port list"
-msgstr "enfrescar la llista de puertos"
-
-msgid "Configure"
-msgstr "Configurar"
-
-msgid "Connection Error."
-msgstr "Erru de conexón."
-
-msgid "configure the connected DG100"
-msgstr "Configurar la conexón DG100"
-
-msgid "delete data after import"
-msgstr "Esaniciar los datos dempués d''importalos"
-
msgid "Columbus V-900 CSV Files"
msgstr "Arquivos CSV Columbus V-900"
@@ -25455,6 +25408,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Nome de Cai:"
@@ -25509,6 +25468,34 @@ msgstr "Escueya nel puntu final pa terminar la edificación"
msgid "Set width of the building"
msgstr "Establecer anchu de la edificación"
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr "en polígonu"
@@ -26192,6 +26179,9 @@ msgstr "Namá referencia ({0})"
msgid "Subject only ({0})"
msgstr "Suxetu solamente ({0})"
+msgid "Configure"
+msgstr "Configurar"
+
msgid "Configure conflation options"
msgstr "Configurar les opciones de combinación"
@@ -26512,9 +26502,24 @@ msgstr "Evacuar el rexistru de dato si la distancia cai per debaxo"
msgid "Unknown logFormat"
msgstr "logFormat desconocíu"
+msgid "Port:"
+msgstr "Puertu:"
+
+msgid "refresh the port list"
+msgstr "enfrescar la llista de puertos"
+
msgid "Configure Device"
msgstr "Configurar dispositivu"
+msgid "Connection Error."
+msgstr "Erru de conexón."
+
+msgid "configure the connected DG100"
+msgstr "Configurar la conexón DG100"
+
+msgid "delete data after import"
+msgstr "Esaniciar los datos dempués d''importalos"
+
msgid "Importing data from device."
msgstr "Importando datos dende''l dispositivu."
@@ -27645,6 +27650,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr "Esportar"
+
msgid "Measured values"
msgstr "Valores midíos"
@@ -29890,6 +29898,15 @@ msgstr "Estragal de Combinación de Nodos Allegaos"
msgid "SeaMap Editor"
msgstr "Editor SeaMap"
+msgid "OSM Export"
+msgstr "Esportar a OSM"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Esportar datos de tráficu a arquivu de rede SUMU."
+
+msgid "SUMO Export"
+msgstr "Esportar a SUMU"
+
msgid "AutoSave LiveData"
msgstr "Autograbar LiveData"
diff --git a/i18n/po/az.po b/i18n/po/az.po
index 423972c..d0f0931 100644
--- a/i18n/po/az.po
+++ b/i18n/po/az.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2013-01-12 17:56+0000\n"
"Last-Translator: iAZISS <iss-sash at mail.ru>\n"
"Language-Team: Azerbaijani <az at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:33+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:33+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -443,15 +443,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -466,6 +469,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -960,6 +966,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1704,6 +1716,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1713,6 +1747,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2295,134 +2332,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2462,6 +2371,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2477,12 +2392,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2519,7 +2428,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2531,6 +2445,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3864,7 +3781,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4504,6 +4421,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4562,6 +4482,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5952,9 +5875,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6823,9 +6743,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6841,6 +6771,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6971,6 +6907,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7697,18 +7643,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7717,6 +7666,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8739,6 +8691,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10703,6 +10658,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11340,6 +11301,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14068,6 +14037,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14171,6 +14143,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14298,6 +14273,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14920,11 +14898,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15241,6 +15214,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15944,15 +15922,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17200,6 +17197,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17598,22 +17601,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17825,6 +17828,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17880,9 +17886,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18009,7 +18012,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18654,9 +18657,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18830,6 +18830,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19577,9 +19589,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22135,6 +22144,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22301,36 +22320,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23449,6 +23438,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23503,6 +23498,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24112,6 +24135,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24426,9 +24452,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25467,6 +25508,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27571,6 +27615,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/be.po b/i18n/po/be.po
index 3488766..96b5519 100644
--- a/i18n/po/be.po
+++ b/i18n/po/be.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2013-07-08 12:07+0000\n"
"Last-Translator: Andrew West <2thewest at gmail.com>\n"
"Language-Team: Belarusian <i18n at mova.org>\n"
@@ -19,8 +19,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:34+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:34+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: be\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -453,15 +453,18 @@ msgstr "Пераключыць панэлі дыялогаў"
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "Размеркаваць ноды"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Размеркаваць ноды праз аднолькавую адлегласць па лініі"
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Запампоўка з OSM..."
@@ -476,6 +479,9 @@ msgstr ""
msgid "Download data"
msgstr "Запампоўка дадзеных"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Запампаваць аб'ект..."
@@ -1006,6 +1012,12 @@ msgstr "Спыніць запампоўку і закрыць дыялог"
msgid "Download Data"
msgstr "Запампаваць дадзеныя"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Ok"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1808,6 +1820,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1817,6 +1851,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2450,153 +2487,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Няправільны выраз для пошуку"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b> Baker Street </ b> -'' Baker'' і'' Street'' ў любым тэгу"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b> Baker Street </ b> -'' Baker'' і'' Street'' ў любым тэгу"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b> key: Bak </ b> -'' Bak'' ў любым месцы тэгу \"key\""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key: Bak </ b> -'' Bak'' не ўваходзіць ў тэг \"key\""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b> key = value </ b> - тэг \"key\" са значэннем \"value\""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b> key = *</ b> - тэг \"key\" з любым значэннем. Паспрабуйце таксама <b> * "
-"= value </ b>, <b> key = </ b>, <b> * = * </ b>, <b> * = </ b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</ b> - тэг \"key\" з якім-небудзь значэннем"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>key?</ b> - тэг \"key\" са значэннямі \"yes\",\"true\",\"1\" ці \"on\""
-
-msgid "Special targets"
-msgstr "Спецыяльныя мэты"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b> type: </ b> ... - Аб'екты адпаведныя тыпу (<b> node </ b>, <b> way </ "
-"b>, <b> relation </ b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b> user: </ b> ... - Аб'екты зменены карыстальнікам"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-"<b> user: anonymous </ b> - аб'екты зменены ананімнымі карыстальнікамі"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b> id: </ b> ... - Аб'екты з дадзеным ID (0 для новых аб'ектаў)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b> version: </ b> ... - Аб'екты дадзенай версіі (0 аб'екты без версіі)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b> changeset: </ b> ... - Аб'екты з зададзеным нумарам пакета правак "
-"(пакажыце 0 для аб'ектаў, якія не ўваходзяць у пакеты правак)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b> nodes: </ b> ... - Аб'екты з дадзеным лікам кропак (<b> nodes: </ b> "
-"лік, <b> nodes: </ b> мін-макс, <b> nodes: </ b> мін-ці <b> nodes: </ b>-"
-"макс)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b> tags: </ b> ... - Аб'екты з дадзеным лікам тэгаў (<b> tags: </ b> лік, "
-"<b> tags: </ b> мін-макс, <b> tags: </ b> мін-ці <b> tags: </ b>-макс)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b> role: </ b> ... - Аб'екты з дадзенай роляй у адносінах"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b> timestamp: </ b> час - аб'екты з апошнім часам змяненняў (2009-11-12T14: "
-"51:09 Z, 2009-11-12 Або T14: 51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-"<b> timestamp: </ b> min / max - аб'екты, якія былі зменены ў гэтым дыяпазоне"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b> areasize: </ b> ... - Замкнёныя лініі з плошчай ... (м ²) (<b> areasize: "
-"</ b> мін-макс або <b> areasize: </ b> макс)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2636,6 +2526,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2651,12 +2547,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2693,7 +2583,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2705,6 +2600,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -4038,7 +3936,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4679,6 +4577,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4737,6 +4638,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -6127,9 +6031,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr "Ok"
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6998,9 +6899,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -7016,6 +6927,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -7146,6 +7063,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7874,18 +7801,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7894,6 +7824,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8923,6 +8856,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10887,6 +10823,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11524,6 +11466,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14252,6 +14202,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14355,6 +14308,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14482,6 +14438,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -15104,11 +15063,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15425,6 +15379,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -16128,15 +16087,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17384,6 +17362,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17782,22 +17766,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -18009,6 +17993,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -18064,9 +18051,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18193,7 +18177,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18838,9 +18822,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -19014,6 +18995,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19761,9 +19754,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22319,6 +22309,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22485,36 +22485,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23633,6 +23603,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23687,6 +23663,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24296,6 +24300,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24610,9 +24617,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25651,6 +25673,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27759,6 +27784,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/bg.po b/i18n/po/bg.po
index 3f6d363..eaa5907 100644
--- a/i18n/po/bg.po
+++ b/i18n/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2015-02-21 01:31+0000\n"
"Last-Translator: pl <Unknown>\n"
"Language-Team: Bulgarian <bg at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:36+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:36+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: bg\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -456,9 +456,6 @@ msgstr "Включване на диалоговия панел"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Включване на диалоговия панел, максимално увеличаване на картата"
-msgid "Distribute Nodes"
-msgstr "Разпределяне на точки"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Разпределяне на избраните точки на равни разстояния по дължината на линия"
@@ -466,6 +463,12 @@ msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Игнориране на {0} възли с невалидни координати"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Сваляне от OSM..."
@@ -482,6 +485,9 @@ msgstr ""
msgid "Download data"
msgstr "Сваляне на данни"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Сваляне на обект..."
@@ -1009,6 +1015,12 @@ msgstr "Затвори и прекрати свалянето"
msgid "Download Data"
msgstr "Сваляне на данни"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "ОК"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1794,6 +1806,28 @@ msgstr "Сваляне на Бележки"
msgid "Notes"
msgstr "Банкноти"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1803,6 +1837,9 @@ msgstr "Сваляне на OSM промени"
msgid "Download Compressed OSM"
msgstr "Сваляне на компресиран OSM файл"
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "Сваляне на OSM"
@@ -2410,139 +2447,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Невалиден израз за търсен"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Baker Street</b> - ''Baker'' и ''Street'' в която и да е стойност"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' в която и да е стойност"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - обекти редактирани от потребител с това име"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - обекти редактирани от анонимни потребители"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - всички обекти с посочената роля в релация"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>дата_и_час - обекти с тази дата и час на последна промяна "
-"(2009-11-12T14:51:09Z, 2009-11-12 или T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr "<b>timestamp:</b>от/до - обекти променени в този интервал от време"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - всички променени обекти"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - всички избрани обекти"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - всички непълни обекти"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - всички немаркирани обекти"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>израз</i></b> - всички обекти наследници, отговарящи на израза"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>израз</i></b> - всички родители на обектите отговарящи на израза"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-"Използвайте <b>|</b> или <b>OR</b> за да обедините в логическо \"ИЛИ\""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Използвайте <b>(</b> и <b>)</b> за да групирате изрази"
-
msgid "basic examples"
msgstr "основни примери"
@@ -2582,6 +2486,12 @@ msgstr "проверка дали ''ключ'' съществува"
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr "комбинации"
@@ -2597,12 +2507,6 @@ msgstr "логическо не"
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr "обекти"
@@ -2639,8 +2543,13 @@ msgstr ""
msgid "properties"
msgstr "детайли"
-msgid "objects with at least 20 nodes"
-msgstr "обекти с поне 20 точки"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "обекти имащи между 5 и 10 тага"
@@ -2651,6 +2560,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr "състояние"
@@ -4014,7 +3926,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4666,6 +4578,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4724,6 +4639,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -6116,9 +6034,6 @@ msgstr "Шир./Дълж."
msgid "East/North"
msgstr "Изток/Север"
-msgid "Ok"
-msgstr "ОК"
-
msgid "Please enter a GPS coordinates"
msgstr "Въведете GPS координати"
@@ -6989,8 +6904,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<различни>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr ""
@@ -7007,6 +6932,12 @@ msgstr "Член на"
msgid "Position"
msgstr "Позиция"
+msgid "<different>"
+msgstr "<различни>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Тагове: {0} / Членства: {1}"
@@ -7137,6 +7068,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7867,18 +7808,21 @@ msgstr "Обект"
msgid "not present"
msgstr "не съществува"
-msgid "Changeset:"
-msgstr "Списък с промени:"
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr "<b>Източник</b>:"
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7887,6 +7831,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8940,6 +8887,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10965,6 +10915,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11603,6 +11559,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14358,6 +14322,9 @@ msgstr "Geoimage.at MaxRes"
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (base map)"
@@ -14462,6 +14429,9 @@ msgstr "Estonia Cadastre (Maaamet)"
msgid "Estonia Forestry (Maaamet)"
msgstr "Estonia Forestry (Maaamet)"
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
@@ -14593,6 +14563,9 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Drone Imagery (Haiti)"
@@ -15215,11 +15188,6 @@ msgid "Landsat 233055"
msgstr "Landsat 233055"
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15551,6 +15519,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Позволява добавянето на маркери/възли на текущата gps позиция."
@@ -16260,15 +16233,34 @@ msgstr "Цикъл"
msgid "deciduous"
msgstr "широколистен"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr "вечнозелен"
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "Бахаи"
@@ -17516,6 +17508,12 @@ msgstr "Ферибот маршрут"
msgid "Marina"
msgstr "Пристанище за яхти"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "обществен"
+
msgid "Pier"
msgstr "Кей"
@@ -17914,6 +17912,12 @@ msgstr "Автомивка"
msgid "Car Dealer"
msgstr "Автомобили"
+msgid "Second hand"
+msgstr "Втора употреба"
+
+msgid "only"
+msgstr "само"
+
msgid "Repair"
msgstr "Сервиз"
@@ -17926,12 +17930,6 @@ msgstr "Гуми"
msgid "Rental"
msgstr "Под наем"
-msgid "Second hand"
-msgstr "Втора употреба"
-
-msgid "only"
-msgstr "само"
-
msgid "Sharing"
msgstr "Споделяне на автомобили"
@@ -18141,6 +18139,9 @@ msgstr ""
msgid "Platform"
msgstr "Перон"
+msgid "Subway Entrance"
+msgstr "Вход в метро"
+
msgid "Station or amenities"
msgstr ""
@@ -18196,9 +18197,6 @@ msgstr "Гара / Спирка"
msgid "Building"
msgstr "Сграда"
-msgid "Subway Entrance"
-msgstr "Вход в метро"
-
msgid "Ticket Machine"
msgstr "Автомат за билети"
@@ -18325,8 +18323,8 @@ msgstr "Звезди"
msgid "Motel"
msgstr "Мотел"
-msgid "Guest House/Bed & Breakfast"
-msgstr "Къща за гости/Нощувка & закуска"
+msgid "Guest House/Bed & Breakfast"
+msgstr ""
msgid "Chalet"
msgstr "Бунгало"
@@ -18970,9 +18968,6 @@ msgstr "Тоалетни"
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr "обществен"
-
msgid "seasonal"
msgstr "сезонен"
@@ -19146,6 +19141,18 @@ msgstr "Кошче за отпадъци"
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19893,9 +19900,6 @@ msgstr "Маяк / Светлинен фар"
msgid "Street Lamp"
msgstr "Улична лампа"
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Mo-Fr 22:00-05:00"
@@ -22453,6 +22457,16 @@ msgstr "Неопределен етикет {0}"
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} за точка. Трябва да се ползва за път."
@@ -22619,36 +22633,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr "Порт:"
-
-msgid "refresh the port list"
-msgstr "обнови списъка с портове"
-
-msgid "Configure"
-msgstr "Настройки"
-
-msgid "Connection Error."
-msgstr "Грешка при свързване."
-
-msgid "configure the connected DG100"
-msgstr "конфигуриране на свързаното DG100"
-
-msgid "delete data after import"
-msgstr "изтриване на данните след импорт"
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23769,6 +23753,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Име на улица:"
@@ -23823,6 +23813,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24453,6 +24471,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "Настройки"
+
msgid "Configure conflation options"
msgstr ""
@@ -24769,9 +24790,24 @@ msgstr "Изключване на натрупването на данни ак
msgid "Unknown logFormat"
msgstr "Неизвестен формат за натрупване"
+msgid "Port:"
+msgstr "Порт:"
+
+msgid "refresh the port list"
+msgstr "обнови списъка с портове"
+
msgid "Configure Device"
msgstr "Конфигуриране на устройство"
+msgid "Connection Error."
+msgstr "Грешка при свързване."
+
+msgid "configure the connected DG100"
+msgstr "конфигуриране на свързаното DG100"
+
+msgid "delete data after import"
+msgstr "изтриване на данните след импорт"
+
msgid "Importing data from device."
msgstr "Импортиране на данни от устройство."
@@ -25827,6 +25863,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr "Измерване на стойности"
@@ -27939,6 +27978,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr "SeaMap Редактор"
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr "Автоматичен запис на данни на живо"
diff --git a/i18n/po/bn.po b/i18n/po/bn.po
index 92ca523..1032e98 100644
--- a/i18n/po/bn.po
+++ b/i18n/po/bn.po
@@ -7,20 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2013-06-13 16:28+0000\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:34+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:35+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: bn\n"
msgid "{0}: option ''{1}'' is ambiguous"
-msgstr ""
+msgstr "{0}: বিকল্প '' {1} '' দ্ব্যর্থক"
msgid "{0}: option ''--{1}'' does not allow an argument"
msgstr ""
@@ -53,10 +53,10 @@ msgid "Background Terms of Use"
msgstr "পটভূমি ব্যবহারের শর্তাবলী"
msgid "Opening link not supported on current platform (''{0}'')"
-msgstr ""
+msgstr "লিঙ্ক খোলার বর্তমান প্ল্যাটফর্ম সমর্থিত নয় ('' {0} '')"
msgid "ERROR: {0}"
-msgstr ""
+msgstr "ত্রুটি: {0}"
msgid "WARNING: {0}"
msgstr ""
@@ -447,15 +447,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "OSM থেকে ডাউনলোড করুন।"
@@ -470,6 +473,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -964,6 +970,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "ঠিক আছে"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1708,6 +1720,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1717,6 +1751,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2299,134 +2336,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2466,6 +2375,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2481,12 +2396,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2523,7 +2432,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2535,6 +2449,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3868,7 +3785,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4508,6 +4425,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4566,6 +4486,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5956,9 +5879,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr "ঠিক আছে"
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6827,9 +6747,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6845,6 +6775,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6975,6 +6911,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7701,18 +7647,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7721,6 +7670,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8743,6 +8695,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10707,6 +10662,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11344,6 +11305,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14072,6 +14041,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14175,6 +14147,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14302,6 +14277,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14924,11 +14902,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15245,6 +15218,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15948,15 +15926,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17204,6 +17201,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17602,22 +17605,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17829,6 +17832,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17884,9 +17890,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18013,7 +18016,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18658,9 +18661,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18834,6 +18834,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19581,9 +19593,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22139,6 +22148,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22305,36 +22324,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23453,6 +23442,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23507,6 +23502,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24116,6 +24139,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24430,9 +24456,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25471,6 +25512,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27575,6 +27619,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/br.po b/i18n/po/br.po
index 7ee96ab..2a6b05a 100644
--- a/i18n/po/br.po
+++ b/i18n/po/br.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2011-10-17 12:11+0000\n"
"Last-Translator: Fulup <Unknown>\n"
"Language-Team: Breton <br at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:35+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:36+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: br\n"
msgid "License"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/bs.po b/i18n/po/bs.po
index 94c64f9..d5ff8b2 100644
--- a/i18n/po/bs.po
+++ b/i18n/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2012-11-03 23:07+0000\n"
"Last-Translator: Alen Mahovic <eyeofthestorm at windowslive.com>\n"
"Language-Team: Bosnian <bs at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:35+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:35+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: bs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -447,15 +447,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -470,6 +473,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -964,6 +970,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1708,6 +1720,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1717,6 +1751,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2299,134 +2336,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2466,6 +2375,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2481,12 +2396,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2523,7 +2432,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2535,6 +2449,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3868,7 +3785,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4508,6 +4425,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4566,6 +4486,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5956,9 +5879,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6827,9 +6747,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6845,6 +6775,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6975,6 +6911,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7701,18 +7647,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7721,6 +7670,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8743,6 +8695,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10707,6 +10662,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11344,6 +11305,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14072,6 +14041,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14175,6 +14147,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14302,6 +14277,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14924,11 +14902,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15245,6 +15218,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15948,15 +15926,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17204,6 +17201,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17602,22 +17605,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17829,6 +17832,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17884,9 +17890,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18013,7 +18016,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18658,9 +18661,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18834,6 +18834,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19581,9 +19593,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22139,6 +22148,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22305,36 +22324,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23453,6 +23442,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23507,6 +23502,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24116,6 +24139,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24430,9 +24456,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25471,6 +25512,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27575,6 +27619,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ca.po b/i18n/po/ca.po
index 79e39c9..7ce53a3 100644
--- a/i18n/po/ca.po
+++ b/i18n/po/ca.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-03-27 07:51+0000\n"
-"Last-Translator: pitort <pitort at eclipso.eu>\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-18 21:18+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: 2015-04-01 04:36+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:36+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: ca\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -465,9 +465,6 @@ msgstr "Commuta les finestres"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Commuta les finestres, maximitza la vista del mapa"
-msgid "Distribute Nodes"
-msgstr "Distribueix els nodes"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Distribueix els nodes seleccionats en distàncies iguals a llarg d''una línia"
@@ -475,6 +472,12 @@ msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Ignorant {0} nodes amb coordenades nul·les"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Baixa des de l''OSM..."
@@ -491,6 +494,9 @@ msgstr ""
msgid "Download data"
msgstr "Baixa dades"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Baixa l''objecte..."
@@ -1036,6 +1042,12 @@ msgstr "Tanca el diàleg i cancel·la la baixada"
msgid "Download Data"
msgstr "Baixa dades"
+msgid "Which tasks to perform?"
+msgstr "Quines tasques s’han de fer?"
+
+msgid "Ok"
+msgstr "D''acord"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1861,6 +1873,28 @@ msgstr "S''estan baixant les notes"
msgid "Notes"
msgstr "Notes"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr "Descarrega notes OSM a dins dels límits"
+
+msgid "Download OSM Note by ID"
+msgstr "Descarrega notes OSM per ID"
+
msgid "Download Compressed OSM Change"
msgstr "Baixa modificacions OSM comprimides"
@@ -1870,6 +1904,9 @@ msgstr "Baixa modificacions OSM"
msgid "Download Compressed OSM"
msgstr "Baixa OSM comprimit"
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "Baixar OSM"
@@ -2514,169 +2551,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "L''expressió de cerca no és vàlida"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>carrer Major</b> - ''carrer'' i ''Major'' a qualsevol clau"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"carrer Major\"</b> - ''carrer Major'' a qualsevol clau"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Maj</b> - ''Maj'' a qulasevol lloc de la clau ''key''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Maj</b> - ''Maj'' absent a la clau ''key''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - clau ''key'' amb el valor exacte ''value''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - clau ''key'' amb qualsevol valor. Provar també "
-"<b>*=value</b>, <b>key=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>clau:</b> - la clau ''clau'' no té cap valor assignat"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>clau?</b> - la clau ''clau'' amb els valor ''yes'', ''true'', ''1'' o "
-"''on''"
-
-msgid "Special targets"
-msgstr "destins especials"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>tipus:</b>... - objectes amb el tipus corresponent (<b>node</b>, "
-"<b>via</b>, <b>relació</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>usuari:</b>... - objectes canviats per l''usuari"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>usuari:anònim</b> - objectes modificats per un usuari anònim"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - objectes amb l''ID donat (0 per als nous objectes)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>versió:</b>... - objectes amb la versió donada (0 objectes sense versió "
-"assignada)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>conjunt de canvis:</b>... - objectes amb el conjunt de canvis amb l''ID "
-"donat (0 objectes sense un conjunt de canvis assignat)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - objectes amb un nombre donat de nodes "
-"(<b>nodes:</b>comptatge, <b>nodes:</b>mín-màx, <b>nodes:</b>mín- or "
-"<b>nodes:</b>-màx)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>etiquetes:</b>... - objectes amb un nombre donat d''etiquetes "
-"(<b>etiquetes:</b>comptatge, <b>etiquetes:</b>mín-màx, <b>etiquetes:</b>mín- "
-"o <b>tags:</b>-màx)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>rol:</b>... - objectes amb un rol donat a una relació"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>data i hora:</b>data i hora - objectes amb la darrera modificació en data "
-"i hora (2009-11-12T14:51:09Z, 2009-11-12 o T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr "<b>data i hora:</b>mín/màx - objectes modificats a l''interval"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>superfície:</b>... - vies tancades amb una superfície donada en m² "
-"(<b>superfície:</b>mín-màx o <b>superfície:</b>màx)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modificat</b> - tots els objectes modificats"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>seleccionats</b> - tots els objectes seleccionats"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplets</b> - tots els objectes incomplets"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>sense etiqueta</b> - tots els objectes sense etiqueta"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-"<b>tancats</b> - totes les vies tancades (un node no és considerat una via "
-"tancada)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>fill <i>expr</i></b> - tots els fills dels objectes que acompleixin amb "
-"l''expressió"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - tots els parents dels objectes que acompleixin "
-"amb l''expressió"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(tot)dins_zona_baixada</b> - objectes (i tots els seus nodes / relacions "
-") de la zona baixada"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(tot)a_la_vista</b> - objectes (i tots els seus nodes / relacions) a la "
-"vista actual"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Utilitzeu <b>|</b> o <b>OR</b> per combinar amb un OR lògic"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Utilitzeu <b>\"</b> per delimitar els operadors (p.ex. si la clau conté "
-"<b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"A les cadenes de text delimitades els caràcter <b>\"</b> i <b>\\</b> han de "
-"ser finalitzats precedint-los per <b>\\</b> (p.ex. <b>\\\"</b> i <b>\\\\"
-"</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Utilitzeu <b>(</b> and <b>)</b> per agrupar expressions"
-
msgid "basic examples"
msgstr "exemples bàsics"
@@ -2717,6 +2591,15 @@ msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
"es correspon si \"key\" és més gran que \"value\" (anàleg a menor que)"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"per delimimtar els operadors.<br>Dins cadenes de text amb els caràcters "
+"<b>\"</b> i <b>\\</b> caldrà finalitzar precedint-los <b>\\</b> (p.ex. <b>\\"
+"\"</b> i <b>\\\\</b>)."
+
msgid "combinators"
msgstr "combinadors"
@@ -2732,15 +2615,6 @@ msgstr "no lògic"
msgid "use parenthesis to group expressions"
msgstr "utilitzar parèntesis per agrupar expressions"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"per delimimtar els operadors.<br>Dins cadenes de text amb els caràcters "
-"<b>\"</b> i <b>\\</b> caldrà finalitzar precedint-los <b>\\</b> (p.ex. <b>\\"
-"\"</b> i <b>\\\\</b>)."
-
msgid "objects"
msgstr "objectes"
@@ -2777,8 +2651,13 @@ msgstr "objectes amb data de modificació dins l''interval"
msgid "properties"
msgstr "propietats"
-msgid "objects with at least 20 nodes"
-msgstr "objectes amb un mínim de 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "objectes que tenen entre 5 i 10 etiquetes"
@@ -2789,6 +2668,9 @@ msgstr "objectes amb el paper donat a una relació"
msgid "closed ways with an area of 100 m²"
msgstr "vies tancades amb una superfície de 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr "vies amb una longitud de 200m o més"
+
msgid "state"
msgstr "estat"
@@ -4274,8 +4156,8 @@ msgstr ""
"correspon a cap dels atributs ''name:*'' ni a una composició del tipus "
"Itàlia - Italien - Italy."
-msgid "A name:* translation is missing."
-msgstr "Nom: * manca la traducció."
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "Manca una clau nom, fins i tot si existeix la clau nom:*"
@@ -4944,6 +4826,9 @@ msgstr "Mostra la versió del JOSM i sortir"
msgid "Print debugging messages to console"
msgstr "Mostra els missatges de depuració del codi a la consola"
+msgid "Skip loading plugins"
+msgstr "Ignora la càrrega de connectors"
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr "Deshabilita l''accés als recursos indicats, separats per coma"
@@ -5012,6 +4897,9 @@ msgstr "Assegureu-vos que carregueu dades si utilitzeu --selection."
msgid "Printing debugging messages to console"
msgstr "Imprimint missatges de depuració a la consola"
+msgid "Plugin loading skipped"
+msgstr "Ignorada la càrrega del connector"
+
msgid "Enabled detailed debug level (trace)"
msgstr "Activat el nivell de depuració detallat (traça)"
@@ -6569,9 +6457,6 @@ msgstr "Lat/Lon"
msgid "East/North"
msgstr "Nord-est"
-msgid "Ok"
-msgstr "D''acord"
-
msgid "Please enter a GPS coordinates"
msgstr "Si us plau introduïu les coordenades GPS"
@@ -7521,8 +7406,18 @@ msgstr "Clau descartable: selecció en primer pla"
msgid "Discardable key: background"
msgstr "Clau descartable: selecció en el fons"
-msgid "<different>"
-msgstr "<diferent>"
+msgid "{0} ''{1}''"
+msgstr "{0} ''{1}''"
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] "{0} diferent"
+msgstr[1] "{0} differents"
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ", {0} no establert"
+msgstr[1] ", {0} no establert"
msgid "Select objects for which to change tags."
msgstr "Seleccioneu els objectes del quals voleu modificar les etiquetes"
@@ -7539,6 +7434,12 @@ msgstr "Membre de"
msgid "Position"
msgstr "Posició"
+msgid "<different>"
+msgstr "<diferent>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr "Objectes: {2} / Etiquetes: {0} / Membres: {1}"
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Etiquetes: {0} / Pertinença: {1}"
@@ -7673,6 +7574,16 @@ msgstr "Estableix el nombre de les etiquetes afegides recentment"
msgid "Remember last used tags after a restart"
msgstr "Recorda les darreres etiquetes utilitzades en reiniciar."
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
"Si us plau, establiu el nombre de les etiquetes recentment afegides a "
@@ -8490,18 +8401,21 @@ msgstr "Objecte"
msgid "not present"
msgstr "No present"
-msgid "Changeset:"
-msgstr "Conjunt de canvis:"
-
msgid "Changeset comment"
msgstr "Comentari del conjunt de canvis"
msgid "Changeset source"
msgstr "Font del conjunt de canvis"
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr "<b>Font</b>:"
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8513,6 +8427,9 @@ msgstr ""
"<html>La versió <strong>{0}</strong> ha estat creada a "
"<strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "Informació del conjunt de canvis"
@@ -9688,6 +9605,9 @@ msgstr "Escala de píxel: {0}"
msgid "Best zoom: {0}"
msgstr "Millor ampliació: {0}"
+msgid "Cache stats: {0}"
+msgstr "Estats memòria cau: {0}"
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "La capa TMS ({0}) està sent baixada amb un nivell d''ampliació {1}"
@@ -11918,6 +11838,12 @@ msgstr "Afegir al selector de mapes lliscants: "
msgid "Tile cache directory: "
msgstr "Directori de la memòria cau de tessel·les: "
+msgid "Maximum concurrent downloads: "
+msgstr "Nombre màxim de descàrregues concurrents: "
+
+msgid "Maximum elements in disk cache: "
+msgstr "Nombre màxim d''lements a la memòria cau de disc: "
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12633,6 +12559,14 @@ msgstr "Comprova periòdicament si hi ha nous missatges"
msgid "Check interval (minutes):"
msgstr "Interval de comprovació (minuts):"
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
"Ha fallat l''obtenció del testimoni d''accés OAuth del gestor de credencials"
@@ -15798,6 +15732,9 @@ msgstr "Geoimage.at MaxRes"
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr "basemap.at Ortofoto"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (mapa base)"
@@ -15903,6 +15840,9 @@ msgstr "Estònia Cadastre (Maaamet)"
msgid "Estonia Forestry (Maaamet)"
msgstr "Estònia Silvicultura (Maaamet)"
+msgid "BANO"
+msgstr "BANO"
+
msgid "Bordeaux - 2012"
msgstr "Bordeus - 2012"
@@ -16035,6 +15975,9 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metròpoli del Ruhr: imatgeria aèria (10 cm)"
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr "Imatges aèries SN, xarxa de carreteres, fronteres administratives"
+
msgid "Drone Imagery (Haiti)"
msgstr "Imatgeria de drones (Haiti)"
@@ -16657,13 +16600,6 @@ msgid "Landsat 233055"
msgstr "Landsat 233055"
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"Permet modificar la informació del trànsit i exportar-la al simulador de "
-"mobilitat urbana SUMO"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -17073,6 +17009,13 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "Modifica funcions per OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Permet modificar la informació del trànsit i exportar-la al simulador de "
+"mobilitat urbana SUMO"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Permet d''afegir marcadors/nodes a una posició gps"
@@ -17805,15 +17748,38 @@ msgstr "Cicle"
msgid "deciduous"
msgstr "caduc"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr "Plantes que no tenen fulles durant certs períodes de l''any"
+
msgid "evergreen"
msgstr "perenne"
+msgid "Plants that are never entirely without green foliage."
+msgstr "Plantes que mai es queden sense fulles."
+
msgid "semi_deciduous"
msgstr "semicaducifoli"
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+"Plantes que perden les fulles durant un període molt curt de temps, quan les "
+"fulles velles cauen immediatament comencen a sortir les noves."
+
msgid "semi_evergreen"
msgstr "semiperennifoli"
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+"Plantes que perden la major part de les seves fulles durant una part de "
+"l’any, però en conserven una part."
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr "Hàbitat amb getetació de fulla caduca i de fulla perenne."
+
msgid "bahai"
msgstr "bahai"
@@ -19090,6 +19056,12 @@ msgstr "Ruta de ferri"
msgid "Marina"
msgstr "Port esportiu"
+msgid "Dump Station"
+msgstr "Estació de buidat"
+
+msgid "public"
+msgstr "públic"
+
msgid "Pier"
msgstr "Embarcador"
@@ -19490,6 +19462,12 @@ msgstr "Rentat"
msgid "Car Dealer"
msgstr "Concessionari de cotxes"
+msgid "Second hand"
+msgstr "Segona mà"
+
+msgid "only"
+msgstr "només"
+
msgid "Repair"
msgstr "Taller mecànic"
@@ -19502,12 +19480,6 @@ msgstr "Pneumàtics"
msgid "Rental"
msgstr "Lloguer"
-msgid "Second hand"
-msgstr "Segona mà"
-
-msgid "only"
-msgstr "només"
-
msgid "Sharing"
msgstr "Compartició"
@@ -19719,6 +19691,9 @@ msgstr "Situació de la parada"
msgid "Platform"
msgstr "Andana"
+msgid "Subway Entrance"
+msgstr "Boca de metro"
+
msgid "Station or amenities"
msgstr "Estació o atractiu"
@@ -19774,9 +19749,6 @@ msgstr "Estació"
msgid "Building"
msgstr "Edifici"
-msgid "Subway Entrance"
-msgstr "Boca de metro"
-
msgid "Ticket Machine"
msgstr "Màquina Expenedora de bitllets"
@@ -19903,8 +19875,8 @@ msgstr "Estrelles"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
-msgstr "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
+msgstr "Guest House/Bed & Breakfast"
msgid "Chalet"
msgstr "Cabana / Bungalou"
@@ -20550,9 +20522,6 @@ msgstr "Lavabos"
msgid "Access rights"
msgstr "Drets d''accés"
-msgid "public"
-msgstr "públic"
-
msgid "seasonal"
msgstr "estacional"
@@ -20726,6 +20695,18 @@ msgstr "Paperera"
msgid "Waste Disposal/Dumpster"
msgstr "Contenidor de residus"
+msgid "Sanitary Dump Station"
+msgstr "Estació sanitària de buidat"
+
+msgid "Suction pumpout"
+msgstr "Buidat per succió"
+
+msgid "Gravity dump station"
+msgstr "Estació de buidat per gravetat"
+
+msgid "Operation times"
+msgstr "Horari de funcionament"
+
msgid "Backrest"
msgstr "respatller"
@@ -21473,9 +21454,6 @@ msgstr "Far"
msgid "Street Lamp"
msgstr "Enllumenat públic"
-msgid "Operation times"
-msgstr "Horari de funcionament"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Dll-Dv 22:00-05:00"
@@ -24066,6 +24044,17 @@ msgstr "Etiqueta no especificada {0}"
msgid "Definition of {0} is unclear"
msgstr "La definició de {0} no és clara"
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+"{0} no es recomana. Utilitzeu la funció Vies inverses del menú Eines."
+
+msgid "key with uncommon character"
+msgstr "clau amb caràcter estrany"
+
+msgid "uncommon short key"
+msgstr "clau massa curta"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} a un node. Ha de ser utilitzat a una via."
@@ -24239,36 +24228,6 @@ msgid "Use alternative turn restriction icon set"
msgstr ""
"Utilitzeu alternativament el conjunt d''icones de prohibicions de gir"
-msgid "OSM Export"
-msgstr "Exporta OSM"
-
-msgid "Export traffic data to SUMO network file."
-msgstr "Exporta dades de trànsit a un fitxer SUMO"
-
-msgid "SUMO Export"
-msgstr "Exportació SUMO"
-
-msgid "Export"
-msgstr "Exporta"
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "refrescar la llista de ports"
-
-msgid "Configure"
-msgstr "Configura"
-
-msgid "Connection Error."
-msgstr "S''ha produït un error en la connexió."
-
-msgid "configure the connected DG100"
-msgstr "configura el DG100 connectat"
-
-msgid "delete data after import"
-msgstr "suprimir les dades després d''importar"
-
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 fitxers CSV"
@@ -25543,6 +25502,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr "Iteracions d''esqueletització"
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Nom del carrer:"
@@ -25597,6 +25562,34 @@ msgstr "Punt a l''extrem oposat de l''edifici"
msgid "Set width of the building"
msgstr "Establiu l''amplada de l''edifici"
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr "al polígon"
@@ -26286,6 +26279,9 @@ msgstr "Només referència ({0})"
msgid "Subject only ({0})"
msgstr "Només el subjecte ({0})"
+msgid "Configure"
+msgstr "Configura"
+
msgid "Configure conflation options"
msgstr "Configura les opcions de combinació"
@@ -26609,9 +26605,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr "Format de registre desconegut"
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "refrescar la llista de ports"
+
msgid "Configure Device"
msgstr "Configura dispositiu"
+msgid "Connection Error."
+msgstr "S''ha produït un error en la connexió."
+
+msgid "configure the connected DG100"
+msgstr "configura el DG100 connectat"
+
+msgid "delete data after import"
+msgstr "suprimir les dades després d''importar"
+
msgid "Importing data from device."
msgstr "Important dades del dispositiu"
@@ -27750,6 +27761,9 @@ msgstr "Mapillary"
msgid "Create Mapillary layer."
msgstr "Crea una capa Mapillary"
+msgid "Export"
+msgstr "Exporta"
+
msgid "Measured values"
msgstr "Valors mesurats"
@@ -30008,6 +30022,15 @@ msgstr "Llindar per fusionar nodes propers"
msgid "SeaMap Editor"
msgstr "Editor de cartes nàutiques"
+msgid "OSM Export"
+msgstr "Exporta OSM"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Exporta dades de trànsit a un fitxer SUMO"
+
+msgid "SUMO Export"
+msgstr "Exportació SUMO"
+
msgid "AutoSave LiveData"
msgstr "Desament automàtic de LiveData"
diff --git a/i18n/po/ca at valencia.po b/i18n/po/ca at valencia.po
index f2dd7fd..f7eda16 100644
--- a/i18n/po/ca at valencia.po
+++ b/i18n/po/ca at valencia.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2013-10-22 10:01+0000\n"
-"Last-Translator: pitort <pitort at eclipso.eu>\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 05:06+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 05:05+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: ca at valencia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -455,9 +455,6 @@ msgstr "Commuta les finestres"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Commuta les finestres, maximitza la vista del mapa"
-msgid "Distribute Nodes"
-msgstr "Distribueix els nodes"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Distribueix els nodes seleccionats en distàncies iguals a llarg d''una línia"
@@ -465,6 +462,12 @@ msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Ignorant {0} nodes amb coordenades nul·les"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Baixa des de l''OSM..."
@@ -481,6 +484,9 @@ msgstr ""
msgid "Download data"
msgstr "Baixa dades"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Baixa l''objecte..."
@@ -1026,6 +1032,12 @@ msgstr "Tanca el diàleg i cancel·la la baixada"
msgid "Download Data"
msgstr "Baixa dades"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "D''acord"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1056,7 +1068,7 @@ msgid "Orthogonalize Shape / Undo"
msgstr "Normalitza formes / Desfà"
msgid "Undo orthogonalization for certain nodes"
-msgstr "Desfà la normalització d'a certs nodes"
+msgstr "Desfà la normalització d’a certs nodes"
msgid "Orthogonalize / Undo"
msgstr "Normalitza / Desfés"
@@ -1851,6 +1863,28 @@ msgstr ""
msgid "Notes"
msgstr "Notes"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr "Descarrega modificacions OSM comprimides"
@@ -1860,6 +1894,9 @@ msgstr "Descarrega modificacions OSM"
msgid "Download Compressed OSM"
msgstr "Descarrega OSM comprimit"
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "Descarregar OSM"
@@ -2491,169 +2528,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "L''expressió de cerca no és vàlida"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>carrer Major</b> - ''carrer'' i ''Major'' a qualsevol clau"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"carrer Major\"</b> - ''carrer Major'' a qualsevol clau"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Maj</b> - ''Maj'' a qulasevol lloc de la clau ''key''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Maj</b> - ''Maj'' absent a la clau ''key''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - clau ''key'' amb el valor exacte ''value''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - clau ''key'' amb qualsevol valor. Provar també "
-"<b>*=value</b>, <b>key=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>clau:</b> - la clau ''clau'' no té cap valor assignat"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>clau?</b> - la clau ''clau'' amb els valor ''yes'', ''true'', ''1'' o "
-"''on''"
-
-msgid "Special targets"
-msgstr "destins especials"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>tipus:</b>... - objectes amb el tipus corresponent (<b>node</b>, "
-"<b>via</b>, <b>relació</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>usuari:</b>... - objectes canviats per l''usuari"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>usuari:anònim</b> - objectes modificats per un usuari anònim"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - objectes amb l''ID donat (0 per als nous objectes)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>versió:</b>... - objectes amb la versió donada (0 objectes sense versió "
-"assignada)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>conjunt de canvis:</b>... - objectes amb el conjunt de canvis amb l''ID "
-"donat (0 objectes sense un conjunt de canvis assignat)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - objectes amb un nombre donat de nodes "
-"(<b>nodes:</b>comptatge, <b>nodes:</b>mín-màx, <b>nodes:</b>mín- or "
-"<b>nodes:</b>-màx)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>etiquetes:</b>... - objectes amb un nombre donat d''etiquetes "
-"(<b>etiquetes:</b>comptatge, <b>etiquetes:</b>mín-màx, <b>etiquetes:</b>mín- "
-"o <b>tags:</b>-màx)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>rol:</b>... - objectes amb un rol donat a una relació"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>data i hora:</b>data i hora - objectes amb la darrera modificació en data "
-"i hora (2009-11-12T14:51:09Z, 2009-11-12 o T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr "<b>data i hora:</b>mín/màx - objectes modificats a l''interval"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>superfície:</b>... - vies tancades amb una superfície donada en m² "
-"(<b>superfície:</b>mín-màx o <b>superfície:</b>màx)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modificat</b> - tots els objectes modificats"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>seleccionats</b> - tots els objectes seleccionats"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplets</b> - tots els objectes incomplets"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>sense etiqueta</b> - tots els objectes sense etiqueta"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-"<b>tancats</b> - totes les vies tancades (un node no és considerat una via "
-"tancada)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>fill <i>expr</i></b> - tots els fills dels objectes que acomplisquen amb "
-"l''expressió"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - tots els parents dels objectes que acomplisquen "
-"amb l''expressió"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(tot)dins_zona_descarregada</b> - objectes (i tots els seus nodes / "
-"relacions ) de la zona descarregada"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(tot)a_la_vista</b> - objectes (i tots els seus nodes / relacions) a la "
-"vista actual"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Utilitzeu <b>|</b> o <b>OR</b> per combinar amb un OR lògic"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Utilitzeu <b>\"</b> per delimitar els operadors (p.ex. si la clau conté "
-"<b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"A les cadenes de text delimitades els caràcter <b>\"</b> i <b>\\</b> han de "
-"ser finalitzats precedint-los per <b>\\</b> (p.ex. <b>\\\"</b> i <b>\\\\"
-"</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Utilitzeu <b>(</b> and <b>)</b> per agrupar expressions"
-
msgid "basic examples"
msgstr "exemples bàsics"
@@ -2693,6 +2567,15 @@ msgstr "s''acompleix si la ''clau'' existeix"
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"per delimimtar els operadors.<br>Dins cadenes de text amb els caràcters "
+"<b>\"</b> i <b>\\</b> caldrà finalitzar precedint-los <b>\\</b> (p.ex. <b>\\"
+"\"</b> i <b>\\\\</b>)."
+
msgid "combinators"
msgstr "combinadors"
@@ -2708,15 +2591,6 @@ msgstr "no lògic"
msgid "use parenthesis to group expressions"
msgstr "utilitzar parèntesis per agrupar expressions"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"per delimimtar els operadors.<br>Dins cadenes de text amb els caràcters "
-"<b>\"</b> i <b>\\</b> caldrà finalitzar precedint-los <b>\\</b> (p.ex. <b>\\"
-"\"</b> i <b>\\\\</b>)."
-
msgid "objects"
msgstr "objectes"
@@ -2753,8 +2627,13 @@ msgstr "objectes amb data de modificació dins l''interval"
msgid "properties"
msgstr "propietats"
-msgid "objects with at least 20 nodes"
-msgstr "objectes amb un mínim de 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "objectes que tenen entre 5 i 10 etiquetes"
@@ -2765,6 +2644,9 @@ msgstr "objectes amb el paper donat a una relació"
msgid "closed ways with an area of 100 m²"
msgstr "vies tancades amb una superfície de 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr "estat"
@@ -4226,8 +4108,8 @@ msgstr ""
"correspon a cap dels atributs ''name:*'' ni a una composició del tipus "
"Itàlia - Italien - Italy."
-msgid "A name:* translation is missing."
-msgstr "Nom: * manca la traducció."
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "Manca una clau nom, fins i tot si existeix la clau nom:*"
@@ -4886,6 +4768,9 @@ msgstr "Mostra la versió de JOSM i eixir"
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4950,6 +4835,9 @@ msgstr "Assegureu-vos que carregueu dades si utilitzeu --selection."
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -6441,9 +6329,6 @@ msgstr "Lat/Lon"
msgid "East/North"
msgstr "Nord-est"
-msgid "Ok"
-msgstr "D''acord"
-
msgid "Please enter a GPS coordinates"
msgstr "Per favor introduïu les coordenades GPS"
@@ -7340,10 +7225,10 @@ msgid "Query and download changesets"
msgstr "Consultar i descarregar conjunts de canvis"
msgid "Please enter a valid changeset query URL first."
-msgstr "Per favor, indiqueu una consulta d'URL de conjunts de canvis vàlida"
+msgstr "Per favor, indiqueu una consulta d’URL de conjunts de canvis vàlida"
msgid "Illegal changeset query URL"
-msgstr "Consulta d'URL de conjunts de canvis incorecta"
+msgstr "Consulta d’URL de conjunts de canvis incorecta"
msgid "Close the dialog and abort querying of changesets"
msgstr "Tancar la finestra i anular la consulta de conjunts de canvis"
@@ -7391,8 +7276,18 @@ msgstr "Clau descartable: selecció en primer pla"
msgid "Discardable key: background"
msgstr "Clau descartable: selecció en el fons"
-msgid "<different>"
-msgstr "<diferent>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr ""
@@ -7409,6 +7304,12 @@ msgstr "Membre de"
msgid "Position"
msgstr "Posició"
+msgid "<different>"
+msgstr "<diferent>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -7542,6 +7443,16 @@ msgstr "Estableix el nombre de les etiquetes afegides recentment"
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
"Per favor, establiu el nombre de les etiquetes recentment afegides a "
@@ -8356,18 +8267,21 @@ msgstr "Objecte"
msgid "not present"
msgstr "No present"
-msgid "Changeset:"
-msgstr "Conjunt de canvis:"
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8379,6 +8293,9 @@ msgstr ""
"<html>La versió <strong>{0}</strong> ha estat creada a "
"<strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "Informació del conjunt de canvis"
@@ -8875,7 +8792,7 @@ msgstr ""
"perdran."
msgid "Perform actions before exiting"
-msgstr "Fer accions abans d'eixir"
+msgstr "Fer accions abans d’eixir"
msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
msgstr ""
@@ -9560,6 +9477,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
"La capa TMS ({0}) està sent descarregada amb un nivell d''ampliació {1}"
@@ -11787,6 +11707,12 @@ msgstr "Afegir al selector de mapes lliscants: "
msgid "Tile cache directory: "
msgstr "Directori de la memòria cau de tessel·les: "
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11949,6 +11875,9 @@ msgid ""
"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
"it?<br><br><table width=400>Error is: [{1}:{2}] {3}</table></html>"
msgstr ""
+"<html>L’anàlisi d’a font d’etiquetes predefindes {0} no és possible. Segur "
+"que la voleu utilitzar?<br><br><table width=400>L’error és: [{1}:{2}] "
+"{3}</table></html>"
msgid ""
"<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
@@ -12493,6 +12422,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
"Ha fallat l''obtenció del testimoni d''accés OAuth del gestor de credencials"
@@ -13393,7 +13330,7 @@ msgstr ""
"per a cada objecte."
msgid "Downloading OSM data..."
-msgstr "Descarregant dades des d'OSM..."
+msgstr "Descarregant dades des d’OSM..."
msgid "Fetching node with id {0} from ''{1}''"
msgstr "Recuperant el node amb ID {0} de ''{1}''"
@@ -15633,6 +15570,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -15736,6 +15676,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -15863,6 +15806,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -16485,13 +16431,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"Permet modificar la informació del trànsit i exportar-la al simulador de "
-"mobilitat urbana SUMO"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -16883,6 +16822,13 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "Modifica funcions per OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Permet modificar la informació del trànsit i exportar-la al simulador de "
+"mobilitat urbana SUMO"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Permet d''afegir marcadors/nodes a una posició gps"
@@ -17609,15 +17555,34 @@ msgstr ""
msgid "deciduous"
msgstr "caduc"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahai"
@@ -18880,6 +18845,12 @@ msgstr "Ruta de ferri"
msgid "Marina"
msgstr "Port esportiu"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "públic"
+
msgid "Pier"
msgstr "Embarcador"
@@ -19278,6 +19249,12 @@ msgstr "Rentat"
msgid "Car Dealer"
msgstr "Concessionari de cotxes"
+msgid "Second hand"
+msgstr "Segona mà"
+
+msgid "only"
+msgstr "només"
+
msgid "Repair"
msgstr "Taller mecànic"
@@ -19290,12 +19267,6 @@ msgstr ""
msgid "Rental"
msgstr "Lloguer"
-msgid "Second hand"
-msgstr "Segona mà"
-
-msgid "only"
-msgstr "només"
-
msgid "Sharing"
msgstr "Compartició"
@@ -19507,6 +19478,9 @@ msgstr "Situació de la parada"
msgid "Platform"
msgstr "Andana"
+msgid "Subway Entrance"
+msgstr "Boca de metro"
+
msgid "Station or amenities"
msgstr "Estació o atractiu"
@@ -19562,9 +19536,6 @@ msgstr "Estació"
msgid "Building"
msgstr "Edifici"
-msgid "Subway Entrance"
-msgstr "Boca de metro"
-
msgid "Ticket Machine"
msgstr "Màquina Expenedora de bitllets"
@@ -19691,7 +19662,7 @@ msgstr "Estrelles"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -20336,9 +20307,6 @@ msgstr ""
msgid "Access rights"
msgstr "Drets d''accés"
-msgid "public"
-msgstr "públic"
-
msgid "seasonal"
msgstr "estacional"
@@ -20512,6 +20480,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr "Horari de funcionament"
+
msgid "Backrest"
msgstr "respatller"
@@ -21259,9 +21239,6 @@ msgstr "Far"
msgid "Street Lamp"
msgstr "Enllumenat públic"
-msgid "Operation times"
-msgstr "Horari de funcionament"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Dll-Dv 22:00-05:00"
@@ -21610,7 +21587,7 @@ msgid "Inertial Confinement Fusion (ICF)"
msgstr "Fusió en confinament inercial"
msgid "Pressurized water reactor (PWR)"
-msgstr "Reactor d'aigua pressuritzada (PWR)"
+msgstr "Reactor d’aigua pressuritzada (PWR)"
msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
@@ -23817,6 +23794,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -23985,36 +23972,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr "Exporta OSM"
-
-msgid "Export traffic data to SUMO network file."
-msgstr "Exporta dades de trànsit a un fitxer SUMO"
-
-msgid "SUMO Export"
-msgstr "Exportació SUMO"
-
-msgid "Export"
-msgstr "Exporta"
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "refrescar la llista de ports"
-
-msgid "Configure"
-msgstr "Configura"
-
-msgid "Connection Error."
-msgstr "S''ha produït un error en la connexió."
-
-msgid "configure the connected DG100"
-msgstr "configura el DG100 connectat"
-
-msgid "delete data after import"
-msgstr "suprimir les dades després d''importar"
-
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 fitxers CSV"
@@ -24133,7 +24090,7 @@ msgid "Download Track ..."
msgstr "Descarrega Recorregut ..."
msgid "Download GPX track from openstreetmap.org"
-msgstr "Descarrega recorregut en GPX des d'openstreetmap.org"
+msgstr "Descarrega recorregut en GPX des d’openstreetmap.org"
msgid ""
"Error occurred while parsing gpx file {0}. Only a part of the file will be "
@@ -25273,6 +25230,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Nom del carrer:"
@@ -25327,6 +25290,34 @@ msgstr "Punt a l''extrem oposat de l''edifici"
msgid "Set width of the building"
msgstr "Establiu l''amplada de l''edifici"
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr "al polígon"
@@ -26016,6 +26007,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "Configura"
+
msgid "Configure conflation options"
msgstr ""
@@ -26340,9 +26334,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr "Format de registre desconegut"
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "refrescar la llista de ports"
+
msgid "Configure Device"
msgstr "Configura dispositiu"
+msgid "Connection Error."
+msgstr "S''ha produït un error en la connexió."
+
+msgid "configure the connected DG100"
+msgstr "configura el DG100 connectat"
+
+msgid "delete data after import"
+msgstr "suprimir les dades després d''importar"
+
msgid "Importing data from device."
msgstr "Important dades del dispositiu"
@@ -27479,6 +27488,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr "Exporta"
+
msgid "Measured values"
msgstr "Valors mesurats"
@@ -29734,6 +29746,15 @@ msgstr "Llindar per fusionar nodes propers"
msgid "SeaMap Editor"
msgstr "Editor de cartes nàutiques"
+msgid "OSM Export"
+msgstr "Exporta OSM"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Exporta dades de trànsit a un fitxer SUMO"
+
+msgid "SUMO Export"
+msgstr "Exportació SUMO"
+
msgid "AutoSave LiveData"
msgstr "Desament automàtic de LiveData"
diff --git a/i18n/po/cs.po b/i18n/po/cs.po
index 5162e9f..9c3344a 100644
--- a/i18n/po/cs.po
+++ b/i18n/po/cs.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-03-27 11:28+0000\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-24 14:19+0000\n"
"Last-Translator: Dalibor Jelínek <launchpad.net at dalibor.cz>\n"
"Language-Team: Czech <cs at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:37+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: cs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -464,15 +464,21 @@ msgstr "Přepínat panely dialogů"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Přepínat panely dialogů, maximalizovat zobrazení mapy"
-msgid "Distribute Nodes"
-msgstr "Rozdělit uzly"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Rozdělit zvolené uzly ve stejné vzdálenosti podél přímky."
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Ignoruji {0} uzlů bez souřadnic"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+"Zvolte, prosím:\n"
+"* Jedna sebe nekřížící cesta s maximálně dvěma svými uzly;\n"
+"* Tři uzly."
+
msgid "Download from OSM..."
msgstr "Stáhnout z OSM..."
@@ -489,6 +495,9 @@ msgstr ""
msgid "Download data"
msgstr "Stahování dat"
+msgid "Download notes in current view"
+msgstr "Stáhnout poznámky v aktuálním zorném poli"
+
msgid "Download object..."
msgstr "Stáhnout objekt..."
@@ -1032,6 +1041,12 @@ msgstr "Zavřít dialog a ukončit stahování"
msgid "Download Data"
msgstr "Stáhnout data"
+msgid "Which tasks to perform?"
+msgstr "Jakou akci provést?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1844,6 +1859,32 @@ msgstr "Stahuji poznámky"
msgid "Notes"
msgstr "Poznámky"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] "{0} poznámka byla stažena."
+msgstr[1] "{0} poznámky byly staženy."
+msgstr[2] "{0} poznámek bylo staženo."
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+"Jelikož limit stahování byl {0}, mohou existovat ještě další poznámky ke "
+"stažení."
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+"Požadujte menší oblast, abyste měli jistotu, že se stáhnou všechny poznámky."
+
+msgid "More notes to download"
+msgstr "Více poznámek ke stažení"
+
+msgid "Download OSM Notes within Bounds"
+msgstr "Stáhnout poznámky k OSM uvnitř hranic"
+
+msgid "Download OSM Note by ID"
+msgstr "Stánout poznámku OSM podle ID"
+
msgid "Download Compressed OSM Change"
msgstr "Stáhnout komprimovanou změnu OSM"
@@ -1853,6 +1894,9 @@ msgstr "Stáhnout změnu OSM"
msgid "Download Compressed OSM"
msgstr "Stáhnout komprimované OSM"
+msgid "Download OSM object by ID"
+msgstr "Stáhnout objekt OSM podle ID"
+
msgid "Download OSM"
msgstr "Stáhnout OSM"
@@ -2503,163 +2547,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Neplatný vyhledávaný výraz"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Pekařská ulice</b> - ''Pekařská'' a ''ulice'' v jakémkoliv klíči"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Pekařská ulice\"</b> - ''Pekařská ulice'' v jakémkoliv klíči"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>klíč:Pek</b> - ''Pek''kdekoliv v klíči ''klíč''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-klíč:Pek</b> - ''Pek'' nikde v klíči ''klíč''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>klíč=hodnota</b> - klíč ''klíč'' s přesnou hodnotou ''hodnota''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>klíč=*</b> - klíč ''klíč'' s jakoukoliv hodnou. Zkuste také "
-"<b>*=hodnota</b>, <b>klíč=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>klíč:</b> - klíč ''klíč'' nastavený na jakoukoliv hodnotu"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>klíč?</b> - klíč ''klíč'' s hodnotami ''yes'', ''true'', ''1'' or ''on''"
-
-msgid "Special targets"
-msgstr "Zvláštní hledání"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - objekty odpovídajícího typu (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - objekty změněné uživatelem"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - objekty změněné anonymními uživateli"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - objekty s daným id (0 odpovídá novým objektům)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - objekty s danou verzí (0 odpovídá objektům bez "
-"přiřazené verze)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - objekty s daným id sady změn (0 odpovídá objektům bez "
-"přiřazené sady změn)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - objekty s daným počtem uzlů (<b>nodes:</b>počet, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- nebo <b>nodes:</b>-max)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - objekty s daným počtem značek (<b>tags:</b>počet, "
-"<b>tags:</b>min-max, <b>tags:</b>min- nebo <b>tags:</b>-max)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - objekty s danou rolí v relaci"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>čas - objekty s datem poslední změny (2009-11-"
-"12T14:51:09Z, 2009-11-12 nebo T14:51 …)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-"<b>timestamp:</b>min/max - objekty naposledy změměné v časovém intervalu"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - uzavřené cesty s daným plošným obsahem v m² "
-"(<b>areasize:</b>min-max nebo <b>areasize:</b>max)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - všechny změněné objekty"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - všechny vybrané objekty"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - všechny nekompletní objekty"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - všechny objekty bez značek"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-"<b>closed</b> - všechny uzavřené cesty (uzel není považován za uzavřenou "
-"cestu)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>expr</i></b> - všechny podobjekty objektů odpovídajících výrazu"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - všechny rodiče objektů odpovídajících výrazu"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - objekty (a všechny jejich uzly / členy "
-"relací) ve stažené oblasti"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - objekty (a všechny jejich uzly / členy relací) v "
-"zobrazené oblasti"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Použijte <b>|</b> nebo <b>OR</b> ke kombinaci s logickým \"nebo\""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Použíjte <b>\"</b> k uvození operátorů (např. když klíč obsahuje <b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"V uvozených řetězcích mají být znaky <b>\"</b> a <b>\\</b> označeny "
-"předřazeným <b>\\</b> (t.j.. <b>\\\"</b> a <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Použijte <b>(</b> a <b>)</b> k seskupení výrazů"
-
msgid "basic examples"
msgstr "Základní příklady"
@@ -2701,6 +2588,15 @@ msgstr ""
"vyhovuje pokud je ''klíč'' větší než ''hodnota'' (a analogicky pro \"méně "
"než\")"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"pro deaktivaci operátorů.<br>V rámci řetězců v uvozovkách musí být znaky "
+"<b>\"</b> a <b>\\</b> uvozené pomocí předcházejícího <b>\\</b> (např. <b>\\"
+"\"</b> a <b>\\\\</b>)."
+
msgid "combinators"
msgstr "Kombinace"
@@ -2716,15 +2612,6 @@ msgstr "logické NOT (logická negace; opačná hodnota)"
msgid "use parenthesis to group expressions"
msgstr "použijte závorky k seskupení výrazů"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"pro deaktivaci operátorů.<br>V rámci řetězců v uvozovkách musí být znaky "
-"<b>\"</b> a <b>\\</b> uvozené pomocí předcházejícího <b>\\</b> (např. <b>\\"
-"\"</b> a <b>\\\\</b>)."
-
msgid "objects"
msgstr "Objekty"
@@ -2761,8 +2648,15 @@ msgstr "objekty s datem poslední úpravy v daném rozsahu"
msgid "properties"
msgstr "Vlastnosti"
-msgid "objects with at least 20 nodes"
-msgstr "objekty s nejméně 20 uzly"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr "cesty s nejméně 20ti uzly, nebo relace obsahující alespoň 20 uzlů"
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
+"uzly s nejméně třemi odkazujícími se cestami, nebo relaci obsahující alespoň "
+"tři cesty"
msgid "objects having 5 to 10 tags"
msgstr "objekty s pěti až deseti značkami"
@@ -2773,6 +2667,9 @@ msgstr "objekty s danou rolí v relaci"
msgid "closed ways with an area of 100 m²"
msgstr "uzavřené cesty s plochou 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr "cesty dlouhé 200 m a delší"
+
msgid "state"
msgstr "Stav"
@@ -4242,8 +4139,8 @@ msgstr ""
"shodnou s žádnou hodnotou značky ''name:*\" a ani není složený z hodnot "
"klíčů ''name:*''. Například: Italia - Itálie - Italy."
-msgid "A name:* translation is missing."
-msgstr "Chybí překlad značky name:*"
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr "Chybějící name:*={0}. Přidejte značku se správným kódem jazyka."
msgid "A name is missing, even though name:* exists."
msgstr "Chybí značka name, ačkoliv name:* existuje."
@@ -4903,6 +4800,9 @@ msgstr "Zobrazí JOSM verzi a skončí"
msgid "Print debugging messages to console"
msgstr "Vypisovat ladící informace na konzoli"
+msgid "Skip loading plugins"
+msgstr "Přeskočit načítání doplňků"
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr "Zakázat přístup k uvedeným zdrojům, odděleným čárkou"
@@ -4969,6 +4869,9 @@ msgstr "Pokud používáte --selection, ujistěte se, že nahrajete nějaká dat
msgid "Printing debugging messages to console"
msgstr "Vypisuji ladící informace na konzoli"
+msgid "Plugin loading skipped"
+msgstr "Načítání doplňků přeskočeno"
+
msgid "Enabled detailed debug level (trace)"
msgstr "Povolena podrobná úroveň ladících informací (trasování)"
@@ -6513,9 +6416,6 @@ msgstr "šířka/délka"
msgid "East/North"
msgstr "východ/západ"
-msgid "Ok"
-msgstr "Ok"
-
msgid "Please enter a GPS coordinates"
msgstr "Prosím, zadejte GPS souřadnice"
@@ -7441,8 +7341,20 @@ msgstr "Nepotřebné klíče: popředí"
msgid "Discardable key: background"
msgstr "Nepotřebné klíče: pozadí"
-msgid "<different>"
-msgstr "<různé>"
+msgid "{0} ''{1}''"
+msgstr "{0} ''{1}''"
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] "{0} různý"
+msgstr[1] "{0} různé"
+msgstr[2] "{0} různých"
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ", {0} nenastavený"
+msgstr[1] ", {0} nenastavené"
+msgstr[2] ", {0} nenastavených"
msgid "Select objects for which to change tags."
msgstr "Zvolte objekty, jejichž značky chcete měnit."
@@ -7459,6 +7371,12 @@ msgstr "Člen"
msgid "Position"
msgstr "Pozice"
+msgid "<different>"
+msgstr "<různé>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr "Objektů: {2} / Značek: {0} / Členství: {1}"
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "značek: {0} / Členství: {1}"
@@ -7595,6 +7513,16 @@ msgstr "Nastavte počet novo pridaných značiek"
msgid "Remember last used tags after a restart"
msgstr "Pamatovat si napodle použité značky po restartu"
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr "<code>Ctrl-1</code> aplikovat první návrh"
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr "<code>Shift-Enter</code> přidat bez uzavření dialogu"
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr "<code>Shift-Ctrl-1</code> přidat první návrh bez uzavření dialogu"
+
msgid "Please enter the number of recently added tags to display"
msgstr "Zadajte prosím počet nedávno pridaných značiek pre zobrazenie"
@@ -8390,18 +8318,21 @@ msgstr "Objekt"
msgid "not present"
msgstr "nepřítomno"
-msgid "Changeset:"
-msgstr "Sada změn:"
-
msgid "Changeset comment"
msgstr "Komentář k sadě změn"
msgid "Changeset source"
msgstr "Zdroj sady změn"
+msgid "Imagery used"
+msgstr "Použité snímky"
+
msgid "<b>Source</b>:"
msgstr "<b>Zdroj</b>:"
+msgid "<b>Imagery</b>:"
+msgstr "<b>Snímky</b>"
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8412,6 +8343,9 @@ msgid ""
msgstr ""
"<html>Verze <strong>{0}</strong> vytvořená <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr "Sada změn"
+
msgid "Changeset info"
msgstr "Informace o sadě změn"
@@ -9604,6 +9538,9 @@ msgstr "Měřítko bodů: {0}"
msgid "Best zoom: {0}"
msgstr "Nejlepší zvětšení: {0}"
+msgid "Cache stats: {0}"
+msgstr "Statistika keše: {0}"
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "Vrstva TMS ({0}), stahuji ve zvětšení {1}"
@@ -11777,6 +11714,12 @@ msgstr "Přidat do Stáhnout z OSM->Aktuální mapa: "
msgid "Tile cache directory: "
msgstr "Adresář keše dlaždic: "
+msgid "Maximum concurrent downloads: "
+msgstr "Maximum současných stahování: "
+
+msgid "Maximum elements in disk cache: "
+msgstr "Maximum prvků v diskové keši: "
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12479,6 +12422,15 @@ msgstr "Periodicky zjišťovat nové zprávy"
msgid "Check interval (minutes):"
msgstr "Interval kontroly (minuty)"
+msgid "Max age for closed notes (days):"
+msgstr "Maximální stáří uzavřené poznámky (dní):"
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+"Určuje počet dní po které musí být poznámka uzavřena, aby se již nestahovala"
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
"Nepodařilo se získat přístupový token OAuth od správce přihlašovacích údajů."
@@ -15601,6 +15553,9 @@ msgstr "Geoimage.at MaxRes"
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr "basemap.at Orthofoto"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (základní mapa)"
@@ -15705,6 +15660,9 @@ msgstr "Estonia Cadastre (Maaamet)"
msgid "Estonia Forestry (Maaamet)"
msgstr "Estonia Forestry (Maaamet)"
+msgid "BANO"
+msgstr "BANO"
+
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
@@ -15836,6 +15794,9 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr "SN Luftbilder, Straßennetz, Administrative Grenzen"
+
msgid "Drone Imagery (Haiti)"
msgstr "Drone Imagery (Haiti)"
@@ -16458,13 +16419,6 @@ msgid "Landsat 233055"
msgstr "Landsat 233055"
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"Umožňuje editaci informací o dopravě a jejich export do simulátoru dopravy "
-"po městě SUMO"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -16863,6 +16817,13 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "Editace prvků OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Umožňuje editaci informací o dopravě a jejich export do simulátoru dopravy "
+"po městě SUMO"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Umožní přidat ukazatele/body na současnou GPS polohu."
@@ -17592,15 +17553,38 @@ msgstr "Cyklus"
msgid "deciduous"
msgstr "opadavý"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr "Rostliny, které určitou část roku nemají listy."
+
msgid "evergreen"
msgstr "stálezelené"
+msgid "Plants that are never entirely without green foliage."
+msgstr "Rostliny, které nikdy nejsou bez zelených listů."
+
msgid "semi_deciduous"
msgstr "poloopadavé"
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+"Rostliny, které ztrácí listy na velmi krátkou dobu, kdy staré listy odpadnou "
+"a začnou růst nové."
+
msgid "semi_evergreen"
msgstr "polostálezelené"
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+"Rostliny, které ztrácí většinu listů, ale nikoliv všechny, na krátkou dobu v "
+"roce."
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr "Habitat se stálezelenou a opadavou vegetací."
+
msgid "bahai"
msgstr "bahá’í"
@@ -18871,6 +18855,12 @@ msgstr "Trasa přívozu, trajektu"
msgid "Marina"
msgstr "Přístav"
+msgid "Dump Station"
+msgstr "Výpusť odpadních vod"
+
+msgid "public"
+msgstr "veřejný"
+
msgid "Pier"
msgstr "Molo"
@@ -19271,6 +19261,12 @@ msgstr "Myčka"
msgid "Car Dealer"
msgstr "Prodejce automobilů"
+msgid "Second hand"
+msgstr "Second hand"
+
+msgid "only"
+msgstr "výhradně"
+
msgid "Repair"
msgstr "Opravna"
@@ -19283,12 +19279,6 @@ msgstr "Pneumatiky"
msgid "Rental"
msgstr "Půjčovna"
-msgid "Second hand"
-msgstr "Second hand"
-
-msgid "only"
-msgstr "výhradně"
-
msgid "Sharing"
msgstr "Carsharing (sdílené vlastnictví vozidel)"
@@ -19498,6 +19488,9 @@ msgstr "Zastávka"
msgid "Platform"
msgstr "Nástupiště"
+msgid "Subway Entrance"
+msgstr "Vchod do metra"
+
msgid "Station or amenities"
msgstr "Zastávky nebo veřejná zařízení"
@@ -19553,9 +19546,6 @@ msgstr "Vlaková stanice"
msgid "Building"
msgstr "Budova"
-msgid "Subway Entrance"
-msgstr "Vchod do metra"
-
msgid "Ticket Machine"
msgstr "Automat na jízdenky"
@@ -19682,11 +19672,11 @@ msgstr "Počet hvězdiček"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
-msgstr "Penzion"
+msgid "Guest House/Bed & Breakfast"
+msgstr "Penzion/Bed & Breakfast"
msgid "Chalet"
-msgstr "Horská chata"
+msgstr "Chata"
msgid "Hostel"
msgstr "Hostel"
@@ -20327,9 +20317,6 @@ msgstr "WC/Toalety"
msgid "Access rights"
msgstr "Přístupné"
-msgid "public"
-msgstr "veřejný"
-
msgid "seasonal"
msgstr "sezónně"
@@ -20503,6 +20490,18 @@ msgstr "Odpadkový koš"
msgid "Waste Disposal/Dumpster"
msgstr "Odpadkový kontejner"
+msgid "Sanitary Dump Station"
+msgstr "Výpusť odpadních vod"
+
+msgid "Suction pumpout"
+msgstr "Odsávání pumpou"
+
+msgid "Gravity dump station"
+msgstr "Gravitační výpusť"
+
+msgid "Operation times"
+msgstr "Doba provozu"
+
msgid "Backrest"
msgstr "Opěrka zad"
@@ -21250,9 +21249,6 @@ msgstr "Maják"
msgid "Street Lamp"
msgstr "Lampa"
-msgid "Operation times"
-msgstr "Doba provozu"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Po-Pi 22:00-05:00"
@@ -23834,6 +23830,16 @@ msgstr "Nekonkrétní značka {0}"
msgid "Definition of {0} is unclear"
msgstr "Definice {0} je nejasná"
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr "{0} není doporučeno. Použijte funkci otočení cesty z menu nástrojů."
+
+msgid "key with uncommon character"
+msgstr "klíč s neobvyklým znakem"
+
+msgid "uncommon short key"
+msgstr "neobvyklá klávesová zkratka"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} na uzlu. Mělo by být použito na cestě."
@@ -24011,36 +24017,6 @@ msgstr "Zobrazit popisky ulic (ve vysokém přiblížení)"
msgid "Use alternative turn restriction icon set"
msgstr "Použít alternativní sadu ikon zákazů odbočení"
-msgid "OSM Export"
-msgstr "OSM Export"
-
-msgid "Export traffic data to SUMO network file."
-msgstr "Exportovat dat o dopravním provozu do souboru sítě SUMO."
-
-msgid "SUMO Export"
-msgstr "SUMO Export"
-
-msgid "Export"
-msgstr "Export"
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "aktualizovat seznam portů"
-
-msgid "Configure"
-msgstr "Nastavit"
-
-msgid "Connection Error."
-msgstr "Chyba při připojování."
-
-msgid "configure the connected DG100"
-msgstr "nastavit připojené DG100"
-
-msgid "delete data after import"
-msgstr "smazat data po importu"
-
msgid "Columbus V-900 CSV Files"
msgstr "CSV soubory Columbus V-900"
@@ -25298,6 +25274,12 @@ msgstr "Jak často má být být provedena operace ztenčování (výchozí {0})
msgid "Thinning Iterations"
msgstr "Iterace ztenčování"
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr "Použít odstín a saturaci namísto rozlišení RGB"
+
+msgid "use HSV based algorithm"
+msgstr "použít algoritmus založený na HSV"
+
msgid "Street Name:"
msgstr "Jméno ulice:"
@@ -25352,6 +25334,36 @@ msgstr "Ukažte na opačný konec budovy"
msgid "Set width of the building"
msgstr "Nastavte šířku budovy"
+msgid "Merge address points"
+msgstr "Sloučit body adres"
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr "Přesunout značky z uzlů adres uvnitř budov na cestu budovy"
+
+msgid "Select both address nodes and building ways to merge"
+msgstr "Vybrat jak uzly adres tak cesty budov ke sloučení"
+
+msgid "No address nodes found in the selection"
+msgstr "Ve výběru nebyly nalezeny uzly adres"
+
+msgid "No building ways found in the selection"
+msgstr "Ve výběru nebyly nalezeny cesty budov"
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] "Existuje {0} budova s více adresními body uvnitř"
+msgstr[1] "Existují {0} budovy s více adresními body uvnitř"
+msgstr[2] "Existuje {0} budov s více adresními body uvnitř"
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] "Existuje {0} budova s konfliktem adres"
+msgstr[1] "Existují {0} budovy s konfliktem adres"
+msgstr[2] "Existuje {0} budov s konfliktem adres"
+
+msgid "No address nodes inside buildings found"
+msgstr "Nebyly nalezeny žádné uzly adres uvnitř budov"
+
msgid "on polygon"
msgstr "na polygonu"
@@ -26028,6 +26040,9 @@ msgstr "Pouze referenční ({0})"
msgid "Subject only ({0})"
msgstr "Pouze cílová ({0})"
+msgid "Configure"
+msgstr "Nastavit"
+
msgid "Configure conflation options"
msgstr "Nastavit možnosti sloučení"
@@ -26348,9 +26363,24 @@ msgstr "Přestat logovat data, když vzdálenost klesne pod"
msgid "Unknown logFormat"
msgstr "Neznámý formát logu"
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "aktualizovat seznam portů"
+
msgid "Configure Device"
msgstr "Konfigurovat zařízení"
+msgid "Connection Error."
+msgstr "Chyba při připojování."
+
+msgid "configure the connected DG100"
+msgstr "nastavit připojené DG100"
+
+msgid "delete data after import"
+msgstr "smazat data po importu"
+
msgid "Importing data from device."
msgstr "Importovat data ze zařízení."
@@ -27477,6 +27507,9 @@ msgstr "Mapillary"
msgid "Create Mapillary layer."
msgstr "Vytvořit vrstvu Mapillary."
+msgid "Export"
+msgstr "Export"
+
msgid "Measured values"
msgstr "Naměřené hodnoty"
@@ -29690,6 +29723,15 @@ msgstr "Práh sloučení blízkých uzlů"
msgid "SeaMap Editor"
msgstr "SeaMap Editor"
+msgid "OSM Export"
+msgstr "OSM Export"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Exportovat dat o dopravním provozu do souboru sítě SUMO."
+
+msgid "SUMO Export"
+msgstr "SUMO Export"
+
msgid "AutoSave LiveData"
msgstr "Automatické ukládání LiveData"
@@ -31698,3 +31740,6 @@ msgstr "Vyjet"
msgid "Drive a race car on this layer"
msgstr "Řídit závodní speciál na této vrstvě"
+
+#~ msgid "Note comment background"
+#~ msgstr "Pozadí komentáře poznámky"
diff --git a/i18n/po/cy.po b/i18n/po/cy.po
index 51b6eff..7d3a84d 100644
--- a/i18n/po/cy.po
+++ b/i18n/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2009-07-17 21:45+0000\n"
"Last-Translator: iggy23 <Unknown>\n"
"Language-Team: Welsh <cy at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
"2 : 3;\n"
-"X-Launchpad-Export-Date: 2015-04-01 05:02+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 05:01+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: cy\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -445,15 +445,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -468,6 +471,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -962,6 +968,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1706,6 +1718,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1715,6 +1749,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2297,134 +2334,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2464,6 +2373,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2479,12 +2394,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2521,7 +2430,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2533,6 +2447,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3866,7 +3783,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4506,6 +4423,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4564,6 +4484,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5954,9 +5877,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6825,9 +6745,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6843,6 +6773,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6973,6 +6909,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7699,18 +7645,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7719,6 +7668,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8741,6 +8693,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10705,6 +10660,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11342,6 +11303,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14070,6 +14039,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14173,6 +14145,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14300,6 +14275,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14922,11 +14900,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15243,6 +15216,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15946,15 +15924,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17202,6 +17199,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17600,22 +17603,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17827,6 +17830,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17882,9 +17888,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18011,7 +18014,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18656,9 +18659,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18832,6 +18832,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19579,9 +19591,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22137,6 +22146,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22303,36 +22322,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23451,6 +23440,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23505,6 +23500,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24114,6 +24137,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24428,9 +24454,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25469,6 +25510,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27573,6 +27617,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/da.po b/i18n/po/da.po
index f8acc49..2d0586f 100644
--- a/i18n/po/da.po
+++ b/i18n/po/da.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-03-30 18:56+0000\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-26 22:06+0000\n"
"Last-Translator: Jørn <joern.map at gmail.com>\n"
"Language-Team: Dansk <kde-i18n-doc at kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:37+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:37+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: da_DK\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -471,15 +471,21 @@ msgstr "Vis/skjul dialog panel"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Vis/skjul dialog panel, maksimer kortvisning"
-msgid "Distribute Nodes"
-msgstr "Fordel punkter"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Fordel de valgte punkter med ens afstande langs en linje"
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Ignorerer {0} punkter med null koordinater"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+"Vælg :\n"
+"* Højst to punkter på en ikke selvkrydsende vej, eller;\n"
+"* Tre punkter."
+
msgid "Download from OSM..."
msgstr "Download fra OSM..."
@@ -496,11 +502,14 @@ msgstr ""
msgid "Download data"
msgstr "Download data"
+msgid "Download notes in current view"
+msgstr "Download noter i aktuel visning"
+
msgid "Download object..."
msgstr "Download objekt..."
msgid "Download OSM object by ID."
-msgstr "Download OSM objekter efter ID"
+msgstr "Download OSM objekter udfra ID"
msgid "Download parent ways/relations..."
msgstr "Download forældreveje/-relationer"
@@ -579,7 +588,7 @@ msgid "Adjust the position of this imagery layer"
msgstr "Justér positionen af dette billedlag"
msgid "Adjust imagery offset"
-msgstr "Justér forskydningen for billedlaget"
+msgstr "Juster forskydningen for billedlaget"
msgid "OK"
msgstr "OK"
@@ -1028,6 +1037,12 @@ msgstr "Luk dialog og annuller download"
msgid "Download Data"
msgstr "Download data"
+msgid "Which tasks to perform?"
+msgstr "Hvilke opgaver skal udføres?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1271,7 +1286,7 @@ msgid "Search for notes"
msgstr "Søg efter noter"
msgid "You must enter a search term"
-msgstr "Du skal intaste et søgeord"
+msgstr "Du skal indtaste et søgeord"
msgid "Select All"
msgstr "Vælg alt"
@@ -1837,6 +1852,29 @@ msgstr "Downloader noter"
msgid "Notes"
msgstr "Noter"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] "{0} note er blevet downloadet."
+msgstr[1] "{0} noter er blevet downloadet."
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr "Da downloadgrænsen er {0}, kan der være flere noter at downloade."
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+"Anmod om et mindre område for at sikre at alle noter bliver downloadet."
+
+msgid "More notes to download"
+msgstr "Flere noter til download"
+
+msgid "Download OSM Notes within Bounds"
+msgstr "Download OSM noter indenfor grænser"
+
+msgid "Download OSM Note by ID"
+msgstr "Download OSM note udfra ID"
+
msgid "Download Compressed OSM Change"
msgstr "Download komprimeret OSM ændring"
@@ -1846,6 +1884,9 @@ msgstr "Download OSM ændring"
msgid "Download Compressed OSM"
msgstr "Download komprimeret OSM"
+msgid "Download OSM object by ID"
+msgstr "Download OSM objekt udfra ID"
+
msgid "Download OSM"
msgstr "Download OSM"
@@ -2201,7 +2242,7 @@ msgstr ""
"oprette en parallel kopi (Alt aktivere tag bevaring)"
msgid "Hold Ctrl to toggle snapping"
-msgstr "Hold Ctrl nede to skifte snapping"
+msgstr "Hold Ctrl nede for at skifte fastgørelse"
msgid ""
"ParallelWayAction\n"
@@ -2290,8 +2331,8 @@ msgid ""
"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
"move zoom with right button"
msgstr ""
-"Zoom ved at trække eller trykke Ctrl+. Flyt med Ctrl+op, venstre, ned, "
-"højre; Flyt zoom med højre museknap"
+"Zoom ved at trække eller trykke Ctrl+. eller Ctrl+,; flyt med Ctrl+op, "
+"venstre, ned, højre; flyt zoom med højre museknap"
msgid "Add all objects selected in the current dataset after the last member"
msgstr ""
@@ -2307,7 +2348,7 @@ msgstr[0] "Tilføj markeringen til {0} relation"
msgstr[1] "Tilføj markeringen til {0} relationer"
msgid "Delete the selected relation"
-msgstr "Slet de nvalgte relation"
+msgstr "Slet den valgte relation"
msgid "Download all members of the selected relations"
msgstr "Download alle medlemmer af de markerede relationer"
@@ -2477,166 +2518,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Ugyldigt søgeudtryk"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Baker Street</b> - ''Baker'' og ''Street'' i en vilkårlig nøgle"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' i en vilkårlig nøgle"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>nøgle:Bak</b> - ''Bak'' hvorsomhelst i nøglen ''nøgle''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-nøgle:Bak</b> - ''Bak'' findes ikke i nøglen ''nøgle''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-"<b>nøgle=værdi</b> - nøglen ''nøgle'' med den præcise værdi ''værdi''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>nøgle=*</b> - nøglen ''nøgle'' med en vilkårlig værdi. Prøv også "
-"<b>*=værdi</b>, <b>nøgle=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>nøgle:</b> - nøglen ''nøgle'' med en vilkårlig værdi"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>nøgle?</b> - nøglen ''nøgle'' med værdien ''yes'', ''true'', ''1'' eller "
-"''on''"
-
-msgid "Special targets"
-msgstr "Specielle mål"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - objekter med tilhørende type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - objekter ændret af bruger"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - objekter ændret af anonyme brugere"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - objekter med given ID (0 for nye objekter)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - objekter med given version (0 objekter uden en tildelt "
-"version)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - objekter med det angivne rettesæt ID (0 objekter uden "
-"et tilknyttet rettesæt)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - objekter med givent antal punkter (<b>nodes:</b>antal, "
-"<b>nodes:</b>min-maks, <b>nodes:</b>min- eller <b>nodes:</b>-maks)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - objekter med givent antal tags (<b>tags:</b>antal, "
-"<b>tags:</b>min-maks, <b>tags:</b>min- eller <b>tags:</b>-maks)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - objekter med given rolle i en relation"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>tidsstempel - objekter med sidste ændrings tidsstempel "
-"(2009-11-12T14:51:09Z, 2009-11-12 eller T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-"<b>timestamp:</b>min/maks - objekter med sidste ændring inden for område"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - lukkede veje med et givent areal i m² "
-"(<b>areasize:</b>min-maks eller <b>areasize:</b>maks)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - alle ændrede objekter"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - alle valgte objekter"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - alle ufuldstændige objekter"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - alle utaggede objekter"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr "<b>closed</b> - alle lukkede veje (et punkt er ikke lukket)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>udtryk</i></b> - alle børn af objekter der matcher udtrykket"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>udtryk</i></b> - alle forældre til objekter der matcher "
-"udtrykket"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - objekter (og alle dets vejpunkter / "
-"relationsmedlemmer) i downloadet område"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - objekter (og alle det vejpunkter / relationsmedlemmer) "
-"i den aktuelle visning"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-"Brug <b>|</b> eller <b>OR</b> for at forbinde med et logisk \"eller\""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Brug <b>\"</b> til at anføre operatorer (f.eks. hvis nøgle indeholder "
-"<b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Mellem anførselstegn i strenge skal tegnene <b>\"</b> og <b>\\</b> have en "
-"<b>\\</b> (f.eks. <b>\\\"</b> og <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Brug <b>(</b> og <b>)</b> for at gruppere udtryk"
-
msgid "basic examples"
msgstr "nemme eksempler"
@@ -2677,6 +2558,15 @@ msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
"passer hvis ''nøgle'' er større end ''værdi'' (tilsvarende, mindre end)"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"til at anføre operatorer.<br>Inden for citerede strenge skal <b>\"</b> og "
+"<b>\\</b> tegnene afgrænses af et foranstillet <b>\\</b> (f.eks. <b>\\\"</b> "
+"og <b>\\\\</b>)."
+
msgid "combinators"
msgstr "kombinationer"
@@ -2692,15 +2582,6 @@ msgstr "logisk ikke"
msgid "use parenthesis to group expressions"
msgstr "brug paranteser for at gruppére udtryk"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"til at anføre operatorer.<br>Inden for citerede strenge skal <b>\"</b> og "
-"<b>\\</b> tegnene afgrænses af et foranstillet <b>\\</b> (f.eks. <b>\\\"</b> "
-"og <b>\\\\</b>)."
-
msgid "objects"
msgstr "objekter"
@@ -2737,8 +2618,16 @@ msgstr "objekter med sidste ændrings-tidsstempel indenfor område"
msgid "properties"
msgstr "egenskaber"
-msgid "objects with at least 20 nodes"
-msgstr "objekter med mindst 20 punkter"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+"veje med mindst 20 punkter eller relationer der indeholder mindst 20 punkter"
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
+"punkter med mindst 3 henvisende veje eller relationer der indeholder mindst "
+"3 veje"
msgid "objects having 5 to 10 tags"
msgstr "objekter med 5 til 10 tags"
@@ -2749,6 +2638,9 @@ msgstr "objekter med en given rolle i en relation"
msgid "closed ways with an area of 100 m²"
msgstr "lukkede områder med et areal på 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr "veje med en længde på 200 m eller derover"
+
msgid "state"
msgstr "tilstand"
@@ -3056,7 +2948,7 @@ msgstr[0] "objekt"
msgstr[1] "objekter"
msgid "Change relation member role for {0} {1}"
-msgstr "Ændr relationsmedlemsskabsrolle for {0} {1}"
+msgstr "Ændre relationsmedlemskabsrolle for {0} {1}"
msgid "At least one object to delete required, got empty collection"
msgstr "Mindst et objekt at slette påkrævet. Har tom markering."
@@ -3949,10 +3841,10 @@ msgid "Crossing buildings"
msgstr "Krydsende bygninger"
msgid "Crossing waterways"
-msgstr "Krydsende vandveje"
+msgstr "Krydsende vandløb"
msgid "Crossing waterway/highway"
-msgstr "Krydsende veje til lands/vands"
+msgstr "Krydsende vandløb/vej"
msgid "Crossing boundaries"
msgstr "Krydsende grænser"
@@ -3964,8 +3856,8 @@ msgid ""
"This test checks if two roads, railways, waterways or buildings crosses in "
"the same layer, but are not connected by a node."
msgstr ""
-"Denne test tjekker om to veje, jernbaner, vandveje eller bygninger skærer "
-"hinanden i det samme lag, uden at være forbundet af et punkt."
+"Denne test tjekker om to veje, jernbaner, vandløb eller bygninger skærer "
+"hinanden i det samme lag, uden at være forbundet med et punkt."
msgid "Duplicated nodes"
msgstr "Dublet-punkter"
@@ -3985,7 +3877,7 @@ msgid "Railway duplicated nodes"
msgstr "Duplikerede punkter i jernbane"
msgid "Waterway duplicated nodes"
-msgstr "Duplikerede punkter i vandveje"
+msgstr "Duplikerede punkter i vandløb"
msgid "Boundary duplicated nodes"
msgstr "Duplikerede punkter i områder"
@@ -4140,7 +4032,7 @@ msgid "Role for ''{0}'' should be ''{1}''"
msgstr "Rolle for ''{0}'' bør være ''{1}''"
msgid "No area style for multipolygon"
-msgstr ""
+msgstr "Ingen område-stil for multipolygon"
msgid ""
"Multipolygon relation should be tagged with area tags and not the outer way"
@@ -4194,8 +4086,8 @@ msgstr ""
"til nogen \"name:*\" attributter og som ikke er en sammensætning af "
"\"name:*\" attributter, f.eks Italia - Italien - Italy."
-msgid "A name:* translation is missing."
-msgstr "En name:* oversættelse mangler."
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "Et navn mangler, selvom name:* eksisterer."
@@ -4247,7 +4139,7 @@ msgid "Areas share segment"
msgstr "Områder deler segment"
msgid "Highways share segment with area"
-msgstr "Highways deler segment med område"
+msgstr "Veje deler segment med område"
msgid "Railways share segment with area"
msgstr "Jernbaner deler segment med område"
@@ -4539,7 +4431,7 @@ msgid "leisure type {0}"
msgstr "rekreationstype {0}"
msgid "waterway type {0}"
-msgstr "vandvejstype {0}"
+msgstr "vandløbstype {0}"
msgid "boundary type {0}"
msgstr "grænsetype {0}"
@@ -4557,7 +4449,7 @@ msgid "Unconnected railways"
msgstr "Uforbundne jernbaner"
msgid "Unconnected waterways"
-msgstr "Uforbundne vandveje"
+msgstr "Uforbundne vandløb"
msgid "Unconnected natural lands and landuses"
msgstr "Uforbundne natur- og landområder"
@@ -4570,7 +4462,7 @@ msgstr ""
"Denne test undersøger om en vej har et slutpunkt meget tæt på en anden vej."
msgid "Way end node near other highway"
-msgstr "Vejens slutpunkt tæt på anden landevej."
+msgstr "Vejens slutpunkt tæt på anden vej."
msgid "Way end node near other way"
msgstr "Vejens slutpunkt nær anden vej."
@@ -4684,13 +4576,13 @@ msgid "House number {0}"
msgstr "Husnummer {0}"
msgid "highway"
-msgstr "landevej"
+msgstr "vej"
msgid "railway"
msgstr "jernbane"
msgid "waterway"
-msgstr "vandvej"
+msgstr "vandløb"
msgid "landuse"
msgstr "brug af jord"
@@ -4849,8 +4741,11 @@ msgstr "Viser JOSM versionen og afslutter"
msgid "Print debugging messages to console"
msgstr "Skriv debug besked til skærm"
+msgid "Skip loading plugins"
+msgstr "Spring over indlæsning af udvidelser"
+
msgid "Disable access to the given resource(s), separated by comma"
-msgstr ""
+msgstr "Hindre adgangen til den givne ressource (er), adskilt af komma"
msgid "options provided as Java system properties"
msgstr "options givet som Java systemegenskaber"
@@ -4859,19 +4754,19 @@ msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
-msgstr ""
+msgstr "Sæt indstillingsmappen"
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
msgid "Set the user data directory"
-msgstr ""
+msgstr "Set brugerdatamappen"
msgid "/PATH/TO/JOSM/CACHE "
msgstr ""
msgid "Set the cache directory"
-msgstr ""
+msgstr "Sæt cachemappen"
msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
@@ -4879,12 +4774,14 @@ msgstr ""
msgid ""
"Relocate all 3 directories to homedir. Cache directory will be in "
"homedir/cache"
-msgstr ""
+msgstr "Flyt alle 3 mapper til homedir. Cachemappe vil være i homedir/cache"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
"general one"
msgstr ""
+"-Djosm.home har lavere forrang, dvs. den specifikke indstilling "
+"tilsidesætter den generelle"
msgid ""
"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4913,6 +4810,9 @@ msgstr "Vær sikker på at du indlæser nogle data hvis du bruger --selection."
msgid "Printing debugging messages to console"
msgstr "Skriver debug beskeder til skærm"
+msgid "Plugin loading skipped"
+msgstr "Udvidelsesindlæsningen sprunget over"
+
msgid "Enabled detailed debug level (trace)"
msgstr "Aktivere detaljeret debug niveau (trace)"
@@ -4941,6 +4841,8 @@ msgid ""
"''{0}'' is not a valid value for argument ''{1}''. Possible values are {2}, "
"possibly delimited by commas."
msgstr ""
+"''{0}'' er ikke en gyldig værdi for argumentet ''{1}''. Mulige værdier {2}, "
+"eventuelt afgrænset af komma."
msgid ""
"JOSM is running in offline mode. This resource will not be available: {0}"
@@ -4980,6 +4882,9 @@ msgid ""
"so, because of the following proxy errors:<br>{1}Would you like to change "
"your proxy settings now?"
msgstr ""
+"JOSM forsøgte at få adgang til følgende ressourcer: <br> {0}, men det "
+"<b>mislykkedes</b> at gøre det, på grund af følgende proxy fejl:<br>{1} Vil "
+"du ændre dine proxy-indstillinger nu?"
msgid "Network errors occurred"
msgstr "Netværksfejl opstod"
@@ -4990,6 +4895,10 @@ msgid ""
"missing proxy configuration.<br>Would you like to change your proxy settings "
"now?"
msgstr ""
+"JOSM forsøgte at få adgang til følgende ressourcer: <br> {0}, men det "
+"<b>mislykkedes</b> at gøre det, på grund af følgende netværksfejl:<br>{1} "
+"Det kan skyldes en manglende proxy konfiguration.<br>Vil du ændre dine proxy-"
+"indstillinger nu?"
msgid "File"
msgstr "Filer"
@@ -5755,7 +5664,7 @@ msgid "Conflicts when combining ways - combined way is ''{0}''"
msgstr "Konflikter ved kombination af veje - kombineret vej er \"{0}\""
msgid "Conflicts when merging nodes - target node is ''{0}''"
-msgstr "Konflikter ved sammenlægning af punkter - målpunkt er \"{0}\""
+msgstr "Konflikter ved sammenlægning af punkter - slutpunkt er \"{0}\""
msgid "No conflicts to resolve"
msgstr "Ingen konflikter at løse"
@@ -5919,7 +5828,7 @@ msgid "Role:"
msgstr "Rolle:"
msgid "Enter a role for all relation memberships"
-msgstr "Indtast en rolle for alle relationsmedlemsskaber"
+msgstr "Indtast en rolle for alle relationsmedlemskaber"
msgid "Tag modified relations with "
msgstr "Tag modificerede relationer med "
@@ -5956,6 +5865,12 @@ msgid ""
"ways that are members of the same relation: the combined way will take the "
"place of the original way in the relation.</html>"
msgstr ""
+"<html>De kombinerede veje er medlemmer i en eller flere relationer. Beslut "
+"om du vil <strong>beholde</strong> disse medlemskaber for den kombinerede "
+"vej, eller om du vil <strong>fjerne</strong> dem.<br>Standarden er at "
+"<strong>beholde</ strong> den første vej, og <strong>fjerne</strong>de andre "
+"veje, der er medlemmer af den samme relation: den kombinerede vej vil træde "
+"i stedet for den oprindelige vej i relationen.</html>"
msgid ""
"<html>The merged nodes are members in one or more relations. Please decide "
@@ -5965,6 +5880,12 @@ msgid ""
"other nodes that are members of the same relation: the target node will take "
"the place of the original node in the relation.</html>"
msgstr ""
+"<html>De sammenlagte punkter er medlemmer i en eller flere relationer. "
+"Beslut om du vil <strong>beholde</strong> disse medlemskaber for slutpunktet "
+"eller om du vil <strong>fjerne</strong> dem.<br>Standarden er at "
+"<strong>beholde</strong> det første punkt og <strong>fjerne</strong> de "
+"andre punkter, der er medlemmer af den samme relation: slutpunktet vil træde "
+"i stedet for det oprindelige punkt i relationen.</html>"
msgid "Apply this role to all members"
msgstr "Anvend denne rolle for alle medlemmer"
@@ -6159,7 +6080,7 @@ msgid "Add filter."
msgstr "tilføj filter."
msgid "Edit filter."
-msgstr "Redigér filter."
+msgstr "Rediger filter."
msgid "Delete filter."
msgstr "Slet filter."
@@ -6422,9 +6343,6 @@ msgstr "Bred./Læng."
msgid "East/North"
msgstr "Øst/Nord"
-msgid "Ok"
-msgstr "O.k."
-
msgid "Please enter a GPS coordinates"
msgstr "Indtast venligst et GPS koordinat"
@@ -7352,8 +7270,18 @@ msgstr "Kasserbar nøgle: forgrund"
msgid "Discardable key: background"
msgstr "Kasserbar nøgle: baggrund"
-msgid "<different>"
-msgstr "<forskellige>"
+msgid "{0} ''{1}''"
+msgstr "{0} ''{1}''"
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] "{0} forskellig"
+msgstr[1] "{0} forskellige"
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ", {0} uangivet"
+msgstr[1] ", {0} uangivet"
msgid "Select objects for which to change tags."
msgstr "Vælg objekter som skal have ændret tags."
@@ -7370,6 +7298,12 @@ msgstr "Medlem af"
msgid "Position"
msgstr "Placering"
+msgid "<different>"
+msgstr "<forskellige>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr "Objekter: {2} / Tags: {0} / Medlemskaber: {1}"
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Tags: {0} / Medlemskaber: {1}"
@@ -7502,6 +7436,18 @@ msgstr "Indstil antallet af nyligt tilføjede tags"
msgid "Remember last used tags after a restart"
msgstr "Husk seneste brugte tags efter en genstart"
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr "<code>Ctrl-1</code> for at anvende første forslag"
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr "<code>Shift-Enter</code> for at tilføje uden at lukke dialogen"
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+"<code>Shift-Ctrl-1</code> for at tilføje første forslag uden at lukke "
+"dialogen"
+
msgid "Please enter the number of recently added tags to display"
msgstr "Indtast venligst antallet af nyligt tilføjede tags der skal vises"
@@ -7834,7 +7780,7 @@ msgid "Confirm empty role"
msgstr "Bekræft tom rolle"
msgid "Edit the relation the currently selected relation member refers to"
-msgstr "Redigér den relation det nu markerede relationsmedlem refererer til"
+msgstr "Rediger den relation det nu markerede relationsmedlem refererer til"
msgid ""
"Members from paste buffer cannot be added because they are not included in "
@@ -8209,7 +8155,7 @@ msgid "Go to the JOSM help home page"
msgstr "Gå til JOSM’s Hjælp-hjemmeside"
msgid "Bad location in HTML document. Exception was: {0}"
-msgstr ""
+msgstr "Dårlig placering i HTML-dokument. Handlingen var: {0}"
msgid "Failed to open help page. The target URL is empty."
msgstr "Kunne ikke åbne Hjælp-side. URL’en er tom."
@@ -8301,18 +8247,21 @@ msgstr "Objekt"
msgid "not present"
msgstr "ikke tilgængelig"
-msgid "Changeset:"
-msgstr "Rettesæt:"
-
msgid "Changeset comment"
msgstr "Rettesæt kommentar"
msgid "Changeset source"
msgstr "Rettesæt kilde"
+msgid "Imagery used"
+msgstr "Billedlag anvendt"
+
msgid "<b>Source</b>:"
msgstr "<b>Kilde</b>:"
+msgid "<b>Imagery</b>:"
+msgstr "<b>Billedlag</b>:"
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr "<html>Version <strong>{0}</strong> nu redigeret i lag ''{1}''</html>"
@@ -8322,6 +8271,9 @@ msgid ""
msgstr ""
"<html>Version <strong>{0}</strong> oprettet den <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr "Rettesæt"
+
msgid "Changeset info"
msgstr "Rettesætsinfo"
@@ -9472,6 +9424,9 @@ msgstr "Pixel skala: {0}"
msgid "Best zoom: {0}"
msgstr "Bedste zoom: {0}"
+msgid "Cache stats: {0}"
+msgstr "Cache statistik: {0}"
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "TMS lag ({0}), downloader i zoom {1}"
@@ -11170,7 +11125,7 @@ msgstr ""
"udseende."
msgid "Hightlight target nodes and ways while drawing or selecting"
-msgstr "Fremhæv destinations punkter og veje mens der tegnes eller markeres"
+msgstr "Fremhæv slutpunkter og veje mens der tegnes eller markeres"
msgid ""
"This option suppresses the filling of areas, overriding anything specified "
@@ -11542,7 +11497,7 @@ msgid "Imagery Preferences"
msgstr "Indstillinger for billedlag"
msgid "Modify list of imagery layers displayed in the Imagery menu"
-msgstr "Redigér listen af billedlag vist i Billedlag-menuen"
+msgstr "Rediger listen af billedlag vist i Billedlag-menuen"
msgid "Common Settings"
msgstr "Fælles indstillinger"
@@ -11631,6 +11586,12 @@ msgstr "Tilføj til flytbart kort vælger: "
msgid "Tile cache directory: "
msgstr "Tern-cache mappe: "
+msgid "Maximum concurrent downloads: "
+msgstr "Højest antal samtidige downloads: "
+
+msgid "Maximum elements in disk cache: "
+msgstr "Højest antal elementer i disk cache: "
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12032,7 +11993,7 @@ msgid "Datum name"
msgstr "Datum navn"
msgid "3 or 7 term datum transform parameters"
-msgstr ""
+msgstr "3 eller 7 ords datum parameter oversættelse"
msgid "NTv2 grid file"
msgstr "NTv2 gitterfil"
@@ -12044,7 +12005,7 @@ msgid "Projection bounds (in degrees)"
msgstr "Projektionsgrænser (i grader)"
msgid "Sets the SRS=... parameter in the WMS request"
-msgstr ""
+msgstr "Sæt SRS = ... parameter i WMS forespørgselen"
msgid "Gauß-Krüger"
msgstr "Gauß-Krüger"
@@ -12334,6 +12295,16 @@ msgstr "Periodisk tjek for nye beskeder"
msgid "Check interval (minutes):"
msgstr "Kontrolinterval (minutter):"
+msgid "Max age for closed notes (days):"
+msgstr "Maks alder for lukkede noter (dage):"
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+"Angiver antallet af dage en note skal være lukket for ikke længere at blive "
+"downloadet"
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr "Kunne ikke hente OAuth adgangsudtryk fra legitimationsstyring"
@@ -12428,7 +12399,7 @@ msgstr ""
"Djava.net.useSystemProxies=true</tt> for at slå til)"
msgid "Manually configure a HTTP proxy"
-msgstr "Konfigurér en HTTP-proxy manuelt"
+msgstr "Konfigurer en HTTP-proxy manuelt"
msgid "Use a SOCKS proxy"
msgstr "Brug en SOCKS proxy"
@@ -12542,7 +12513,7 @@ msgid "Checks for geometry errors"
msgstr "Kontrollerer for geometri fejl"
msgid "Checks for errors on highways"
-msgstr "Kontrollerer for fejl på motorveje"
+msgstr "Kontrollerer for fejl på veje"
msgid "Multiple values"
msgstr "Flere værdier"
@@ -14005,7 +13976,7 @@ msgid "Skip update"
msgstr "Spring over opdatering"
msgid "Click to skip updating the activated plugins"
-msgstr "Klik for springe over opdatering af aktiverede udvidelser"
+msgstr "Klik for at springe over opdatering af aktiverede udvidelser"
msgid ""
"Skipping plugin update after JOSM upgrade. Automatic update at startup is "
@@ -14122,10 +14093,10 @@ msgid "Plugin update failed"
msgstr "Udvidelsesopdatering mislykkedes"
msgid "Failed to find plugin {0}"
-msgstr ""
+msgstr "Kunne ikke finde udvidelse {0}"
msgid "Failed to download plugin information list"
-msgstr ""
+msgstr "Kunne ikke download udvidelse information list"
msgid "Disable plugin"
msgstr "Slå udvidelse fra."
@@ -14140,27 +14111,34 @@ msgid "Click to keep the plugin ''{0}''"
msgstr "Klik for at beholde udvidelsen \"{0}\""
msgid "Failed to delete outdated plugin ''{0}''."
-msgstr ""
+msgstr "Kunne ikke slette forældet udvidelse ''{0}''."
msgid ""
"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
"JOSM is still going to load the old plugin version."
msgstr ""
+"Kunne ikke at installere allerede downloadet udvidelse ''{0}''. Springer "
+"over installation. JOSM bliver stadig ved med at indlæse den gamle version "
+"af udvidelsen."
msgid ""
"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
+"Kunne ikke installere udvidelse ''{0}'' fra midlertidig downloadet fil "
+"''{1}''. {2}"
msgid ""
"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
"Renaming failed."
msgstr ""
+"Kunne ikke installere udvidelse ''{0}'' fra midlertidig downloadet fil "
+"''{1}''. Omdøbning mislykkedes."
msgid "Update plugin"
msgstr "Opdaterer udvidelse"
msgid "Click to update the plugin ''{0}''"
-msgstr ""
+msgstr "Klik for at opdatere udvidelsen ''{0}''"
msgid "Click to disable the plugin ''{0}''"
msgstr "Klik for at deaktivere udvidelsen \"{0}\""
@@ -14240,6 +14218,7 @@ msgstr "Behandler filen \"{0}\""
msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
+"Kunne ikke scanne fil ''{0}'' for udvidelse oplysninger. Springer over."
msgid "Processing plugin files..."
msgstr "Behandler udvidelsesfiler..."
@@ -14291,7 +14270,7 @@ msgid "Do nothing"
msgstr "Foretag intet"
msgid "Report Bug"
-msgstr "Rapportér fejl"
+msgstr "Rapporter fejl"
msgid ""
"An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -15050,7 +15029,7 @@ msgstr "tunnel"
msgctxt "Relation type"
msgid "waterway"
-msgstr "vandvej"
+msgstr "vandløb"
msgctxt "Place type"
msgid "city"
@@ -15338,6 +15317,9 @@ msgstr "Geoimage.at MaxRes"
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr "basemap.at Orthofoto"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (base map)"
@@ -15442,6 +15424,9 @@ msgstr "Estonia Cadastre (Maaamet)"
msgid "Estonia Forestry (Maaamet)"
msgstr "Estonia Forestry (Maaamet)"
+msgid "BANO"
+msgstr "BANO"
+
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
@@ -15479,7 +15464,7 @@ msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgid "SIG L-R - Languedoc-Roussillon 2012 - 20 cm"
-msgstr ""
+msgstr "SIG L-R - Languedoc-Roussillon 2012 - 20 cm"
msgid "Toulouse - Orthophotoplan 2013"
msgstr "Toulouse - Orthophotoplan 2013"
@@ -15573,6 +15558,9 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr "SN Luftbilder, Straßennetz, Administrative Grenzen"
+
msgid "Drone Imagery (Haiti)"
msgstr "Drone Imagery (Haiti)"
@@ -15808,10 +15796,10 @@ msgid "Slovakia Historic Maps"
msgstr "Slovakia Historic Maps"
msgid "RABA-KGZ: Slovenia farmland use"
-msgstr ""
+msgstr "RABA-KGZ: Slovenia farmland use"
msgid "RABA-KGZ: Slovenia built-up areas"
-msgstr ""
+msgstr "RABA-KGZ: Slovenia built-up areas"
msgid "South Africa CD:NGI Aerial"
msgstr "South Africa CD:NGI Aerial"
@@ -16195,11 +16183,6 @@ msgid "Landsat 233055"
msgstr "Landsat 233055"
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -16556,6 +16539,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "Rediger funktioner til OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
"Tillad tilføjelse af markører/punkter på de nuværende gps-positioner."
@@ -16612,6 +16600,8 @@ msgid ""
"The turnrestrictions plugin allows to enter maintain information about turn "
"restrictions in the OpenStreetMap database."
msgstr ""
+"Udvidelsen gør det muligt at indtaste og vedligeholde oplysninger om "
+"svingbegrænsninger i OpenStreetMap databasen."
msgid "Allows undeleting object from OSM database"
msgstr "Muliggør gendannelse af objekt fra OSM database"
@@ -17139,7 +17129,7 @@ msgstr "15-mands-rugby"
msgctxt "sport"
msgid "running"
-msgstr ""
+msgstr "løb"
msgctxt "sport"
msgid "shooting"
@@ -17258,31 +17248,54 @@ msgid "Symbol description"
msgstr "Symbol beskrivelse"
msgid "broadleaved"
-msgstr ""
+msgstr "bredbladet"
msgid "needleleaved"
-msgstr ""
+msgstr "nålebladet"
msgid "mixed"
msgstr "blandet"
msgid "leafless"
-msgstr ""
+msgstr "bladløse"
msgid "Cycle"
-msgstr ""
+msgstr "Cyklus"
msgid "deciduous"
-msgstr "Løvskov"
+msgstr "løvfældende"
+
+msgid "Plants that are leafless for a certain period during the year."
+msgstr "Planter der er bladløse i en vis periode i løbet af året."
msgid "evergreen"
-msgstr ""
+msgstr "stedsegrøn"
+
+msgid "Plants that are never entirely without green foliage."
+msgstr "Planter der aldrig er helt uden løv."
msgid "semi_deciduous"
+msgstr "delvis løvfældende"
+
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
msgstr ""
+"Planter der mister deres blade for en meget kort periode, hvor gamle blade "
+"falder af og ny vækst af blade er begyndt."
msgid "semi_evergreen"
+msgstr "delvis stedsegrøn"
+
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
msgstr ""
+"Planter der mister de fleste, men ikke alle, deres blade i en brøkdel af "
+"året."
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr "Naturtype med stedsegrønne og løvfældende vegetation."
msgid "bahai"
msgstr "bahai"
@@ -17601,7 +17614,7 @@ msgid "driveway"
msgstr "indkørsel"
msgid "parking_aisle"
-msgstr "Vej mellem parkeringsbåse"
+msgstr "vej mellem parkeringsbåse"
msgid "drive-through"
msgstr "køre igennem"
@@ -17952,10 +17965,10 @@ msgid "Oneway (bicycle)"
msgstr "Ensrettet (cykel)"
msgid "Edit Highway Attributes:"
-msgstr ""
+msgstr "Rediger vej attributter:"
msgid "Highway"
-msgstr "Hovedvej"
+msgstr "Vej"
msgid "Dedicated Cycleway"
msgstr "Dedikeret cykelsti"
@@ -17979,37 +17992,37 @@ msgid "Amount of Steps"
msgstr "Antal trin"
msgid "Ramp"
-msgstr ""
+msgstr "Rampe"
msgid "Stroller ramp"
-msgstr ""
+msgstr "Klapvognsrampe"
msgid "Bicycle ramp"
-msgstr ""
+msgstr "Cykelrampe"
msgid "Wheelchair ramp"
-msgstr ""
+msgstr "Kørestolsrampe"
msgid "Luggage ramp"
-msgstr ""
+msgstr "Baggagerampe"
msgid "automatic"
-msgstr ""
+msgstr "automatisk"
msgid "manual"
-msgstr ""
+msgstr "manuel"
msgid "Handrail"
-msgstr ""
+msgstr "Gelænder"
msgid "Left handrail"
-msgstr ""
+msgstr "Venstregelænder"
msgid "Center handrail"
-msgstr ""
+msgstr "Midtergelænder"
msgid "Right handrail"
-msgstr ""
+msgstr "Højregelænder"
msgid "Waypoints"
msgstr "Waypoints"
@@ -18039,7 +18052,7 @@ msgid "Traffic Signal"
msgstr "Lysregulering"
msgid "Optional crossing attributes:"
-msgstr ""
+msgstr "Valgfri passage attributter:"
msgid "Pedestrian crossing type"
msgstr "Type af fodgængerfelt"
@@ -18048,7 +18061,7 @@ msgid "uncontrolled"
msgstr "ukontrolleret"
msgid "traffic_signals"
-msgstr "traffic_signals"
+msgstr "lysregulering"
msgid "island"
msgstr "helleanlæg"
@@ -18057,7 +18070,7 @@ msgid "unmarked"
msgstr "uden markering"
msgid "Crossing type name (UK)"
-msgstr ""
+msgstr "Passage typenavn (UK):"
msgid "zebra"
msgstr "fodgængerfelt"
@@ -18066,16 +18079,16 @@ msgid "pelican"
msgstr "fodgængerfelt med trafikstyring"
msgid "toucan"
-msgstr "toucan"
+msgstr "overgang for cyklister"
msgid "puffin"
-msgstr ""
+msgstr "intelligent overgang"
msgid "pegasus"
-msgstr "pegasus"
+msgstr "overgang for ryttere"
msgid "tiger"
-msgstr "tiger"
+msgstr "gul-sort overgang for cyklister"
msgid "Button operated"
msgstr "Knap betjent"
@@ -18084,7 +18097,7 @@ msgid "Sound signals"
msgstr "Lydsignaler"
msgid "Crossing attendant"
-msgstr ""
+msgstr "Skolepatrulje"
msgid "Cross by bicycle"
msgstr "Overkørsel for cykler"
@@ -18093,7 +18106,7 @@ msgid "Cross on horseback"
msgstr "Overgangssted for ridende"
msgid "Optional values for specific countries"
-msgstr ""
+msgstr "Valgfri værdier for specifikke lande"
msgid "Stop"
msgstr "Stop"
@@ -18236,7 +18249,7 @@ msgid "Species"
msgstr "Arter"
msgid "Taxon"
-msgstr ""
+msgstr "Takson"
msgid "Fence"
msgstr "Hegn"
@@ -18317,10 +18330,10 @@ msgid "ladder"
msgstr "stige"
msgid "squeezer"
-msgstr ""
+msgstr "sprække"
msgid "stepover"
-msgstr ""
+msgstr "trin over"
msgid "Turnstile"
msgstr "Tælleapparat"
@@ -18374,6 +18387,8 @@ msgid ""
"A point where groundwater naturally flows to the surface of the earth from "
"underground."
msgstr ""
+"Et punkt hvor grundvandet naturligt strømmer til jordoverfladen fra "
+"undergrunden."
msgid "Waterfall"
msgstr "Vandfald"
@@ -18430,14 +18445,14 @@ msgid "river"
msgstr "flod"
msgid "Salt Water"
-msgstr ""
+msgstr "Saltvand"
msgid "Coastline"
msgstr "Kystlinje"
msgid ""
"Line between the sea and land (with the water on the right side of the way)."
-msgstr ""
+msgstr "Linje mellem hav og land (med vandet på højre side af vejen)."
msgid "Riverbank"
msgstr "Flodbred"
@@ -18447,6 +18462,7 @@ msgstr "Vådområde"
msgid "Waterlogged area, either permanently or seasonally with vegetation."
msgstr ""
+"Vandmættet område, enten permanent eller sæsonmæssigt med vegetation."
msgid "swamp"
msgstr "Sump"
@@ -18493,14 +18509,17 @@ msgstr "Bugt"
msgid ""
"A large body of water partially enclosed by land but with a wide mouth."
msgstr ""
+"En stor mængde vand delvis omsluttet af jord, men med en bred munding."
msgid "Cliff"
-msgstr "Klippe"
+msgstr "Klippevæg"
msgid ""
"A steep rock face exposure, with a significant vertical, or near vertical "
"(leave the lower face to the right of the way)."
msgstr ""
+"En stejl klippevæg der er betydelig lodret eller næsten lodret (lad den "
+"nedre flade være på højre side af vejen)."
msgid "Shipping"
msgstr "Vandfart"
@@ -18537,6 +18556,12 @@ msgstr "Færgerute"
msgid "Marina"
msgstr "Lystbådehavn"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "offentlig"
+
msgid "Pier"
msgstr "Bådebro"
@@ -18937,6 +18962,12 @@ msgstr "Vask"
msgid "Car Dealer"
msgstr "Bilforhandler"
+msgid "Second hand"
+msgstr "Brugt"
+
+msgid "only"
+msgstr "kun"
+
msgid "Repair"
msgstr "Bilmekaniker"
@@ -18949,12 +18980,6 @@ msgstr "Dæk"
msgid "Rental"
msgstr "Udlejning"
-msgid "Second hand"
-msgstr "Brugt"
-
-msgid "only"
-msgstr "kun"
-
msgid "Sharing"
msgstr "Deling"
@@ -19164,6 +19189,9 @@ msgstr "Stopposition"
msgid "Platform"
msgstr "Platform"
+msgid "Subway Entrance"
+msgstr "Indgang til undergrundsbane"
+
msgid "Station or amenities"
msgstr ""
@@ -19204,7 +19232,7 @@ msgid "Shelter"
msgstr "Læskur"
msgid "Highway platform (legacy)"
-msgstr ""
+msgstr "Vejplatform (gammel)"
msgid "Railway platform (legacy)"
msgstr "Jernbaneplatform (gammel)"
@@ -19219,9 +19247,6 @@ msgstr "Station"
msgid "Building"
msgstr "Bygning"
-msgid "Subway Entrance"
-msgstr "Indgang til undergrundsbane"
-
msgid "Ticket Machine"
msgstr "Billetautomat"
@@ -19229,10 +19254,10 @@ msgid "Reference Number"
msgstr "Referencenummer"
msgid "Public Transport (Legacy)"
-msgstr ""
+msgstr "Offentlig transport (gammel)"
msgid "Public transport route (Legacy)"
-msgstr ""
+msgstr "Offentlig transportrute (gammel)"
msgid "forward segment"
msgstr "fremad segment"
@@ -19348,7 +19373,7 @@ msgstr "Stjerner"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr "Pensionat/Bed & Breakfast"
msgid "Chalet"
@@ -19439,7 +19464,7 @@ msgid "Microbrewery"
msgstr "Mikrobryggeri"
msgid "Outdoor seating"
-msgstr ""
+msgstr "Udendørsservering"
msgid "Fast Food"
msgstr "Fastfood"
@@ -19616,16 +19641,16 @@ msgid "Movie Theater/Cinema"
msgstr "Biograf"
msgid "Drive-in theater"
-msgstr ""
+msgstr "Køre-ind teater"
msgid "3D"
-msgstr ""
+msgstr "3D"
msgid "Number of screens"
-msgstr ""
+msgstr "Antal skærme"
msgid "Minimum age"
-msgstr ""
+msgstr "Minimumsalder"
msgid "Zoo"
msgstr "Zoo"
@@ -19995,9 +20020,6 @@ msgstr "Toiletter"
msgid "Access rights"
msgstr "Adgangsrettigheder"
-msgid "public"
-msgstr "offentlig"
-
msgid "seasonal"
msgstr "sæsonmæssige"
@@ -20038,13 +20060,13 @@ msgid "Collection times"
msgstr "Tømningstidspunkt"
msgid "Mo-Sa 09:00"
-msgstr ""
+msgstr "Mo-Sa 09:00"
msgid "Mo-Fr 17:30; Sa 12:00"
-msgstr ""
+msgstr "Mo-Fr 17:30; Sa 12:00"
msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
-msgstr ""
+msgstr "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
msgid "Drive through"
msgstr "Køre igennem"
@@ -20171,6 +20193,18 @@ msgstr "Affaldskurv/affaldsspand"
msgid "Waste Disposal/Dumpster"
msgstr "Skraldespand/container"
+msgid "Sanitary Dump Station"
+msgstr "Toilet tømmested"
+
+msgid "Suction pumpout"
+msgstr "Udsugningspumpe"
+
+msgid "Gravity dump station"
+msgstr "Tyngdekraft tømmested"
+
+msgid "Operation times"
+msgstr "Betjeningstider"
+
msgid "Backrest"
msgstr "Ryglæn"
@@ -20606,79 +20640,79 @@ msgstr "Menneskeskabt"
msgctxt "building"
msgid "roof"
-msgstr ""
+msgstr "halvtag"
msgctxt "building"
msgid "garage"
-msgstr ""
+msgstr "garage"
msgctxt "building"
msgid "garages"
-msgstr ""
+msgstr "garageanlæg"
msgctxt "building"
msgid "industrial"
-msgstr ""
+msgstr "industri"
msgctxt "building"
msgid "school"
-msgstr ""
+msgstr "skole"
msgctxt "building"
msgid "commercial"
-msgstr ""
+msgstr "erhverv"
msgctxt "building"
msgid "barn"
-msgstr ""
+msgstr "lade"
msgctxt "building"
msgid "farm_auxiliary"
-msgstr ""
+msgstr "gårdlænge"
msgctxt "building"
msgid "transportation"
-msgstr ""
+msgstr "transport"
msgctxt "building"
msgid "greenhouse"
-msgstr "Drivhus"
+msgstr "drivhus"
msgctxt "building"
msgid "office"
-msgstr ""
+msgstr "kontor"
msgctxt "building"
msgid "university"
-msgstr ""
+msgstr "universitet"
msgctxt "building"
msgid "hospital"
-msgstr ""
+msgstr "hospital"
msgctxt "building"
msgid "warehouse"
-msgstr ""
+msgstr "lager"
msgctxt "building"
msgid "retail"
-msgstr ""
+msgstr "detail"
msgctxt "building"
msgid "shed"
-msgstr ""
+msgstr "skur"
msgctxt "building"
msgid "cowshed"
-msgstr ""
+msgstr "kostald"
msgctxt "building"
msgid "construction"
-msgstr ""
+msgstr "under udførelse"
msgctxt "building"
msgid "Levels"
-msgstr ""
+msgstr "Etager"
msgid "Residential Building"
msgstr "Boligbebyggelse"
@@ -20689,41 +20723,41 @@ msgstr "beboelse"
msgctxt "building"
msgid "apartments"
-msgstr ""
+msgstr "lejligheder"
msgctxt "building"
msgid "house"
-msgstr ""
+msgstr "hus"
msgctxt "building"
msgid "hut"
-msgstr ""
+msgstr "hytte"
msgctxt "building"
msgid "dormitory"
-msgstr ""
+msgstr "sovesal"
msgctxt "building"
msgid "terrace"
-msgstr ""
+msgstr "rækkehus"
msgctxt "building"
msgid "detached"
-msgstr ""
+msgstr "parcelhus"
msgctxt "building"
msgid "farm"
-msgstr ""
+msgstr "gård"
msgid "Building part"
msgstr "Bygningsdel"
msgctxt "building"
msgid "Skipped Levels"
-msgstr ""
+msgstr "Manglende etager"
msgid "Skipped height (meters)"
-msgstr ""
+msgstr "Manglende højde (meter)"
msgid "Entrance"
msgstr "Indgang"
@@ -20734,15 +20768,15 @@ msgstr "ja"
msgctxt "entrance"
msgid "main"
-msgstr ""
+msgstr "hovedindgang"
msgctxt "entrance"
msgid "service"
-msgstr "service"
+msgstr "serviceindgang"
msgctxt "entrance"
msgid "exit"
-msgstr "udgang"
+msgstr "kun udgang"
msgctxt "entrance"
msgid "emergency"
@@ -20918,9 +20952,6 @@ msgstr "Fyrtårn"
msgid "Street Lamp"
msgstr "Gadelampe"
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Mo-Fr 22:00-05:00"
@@ -22585,6 +22616,7 @@ msgid ""
"Bare upper lying uncultivated land principally covered with grass and often "
"grazed."
msgstr ""
+"Bart øvre liggende udyrket jord hovedsagelig dækket af græs og ofte græssede."
msgid "Scrub"
msgstr "Krat"
@@ -22592,6 +22624,8 @@ msgstr "Krat"
msgid ""
"Bare lower lying uncultivated land with bushes but little or no tree cover."
msgstr ""
+"Bart lavere liggende udyrkede areal med buske, men kun lidt eller ingen "
+"trædække."
msgid "Heath"
msgstr "Hede"
@@ -22601,6 +22635,9 @@ msgid ""
"free-draining infertile, acidic soils, and is characterised by open, low-"
"growing woody vegetation."
msgstr ""
+"Bart lavere liggende udyrket jord med en kratbevoksning findes hovedsageligt "
+"på frit-drænende ufrugtbar, sur jord, og er kendetegnet ved åben, "
+"lavtvoksende træagtig vegetation."
msgid "Sand"
msgstr "Sand"
@@ -22609,7 +22646,7 @@ msgid "Large area covered with sand."
msgstr "Stort område dækket med sand."
msgid "Bare Rock"
-msgstr "Klippe"
+msgstr "Klippeområde"
msgid ""
"For areas of solid visible rock that is sparsely vegetated or not vegetated "
@@ -22619,7 +22656,7 @@ msgstr ""
"bevoksede overhovedet."
msgid "Rock"
-msgstr ""
+msgstr "Fast klippe"
msgid ""
"A notable rock or group of rocks, with at least one of them firmly attached "
@@ -23164,10 +23201,10 @@ msgid "traffic light or barrier that stops you"
msgstr "traffiklys eller barriere der stopper dig"
msgid "Routes"
-msgstr ""
+msgstr "Ruter"
msgid "Bicycle Route"
-msgstr ""
+msgstr "Cykelrute"
msgid "icn"
msgstr ""
@@ -23182,10 +23219,10 @@ msgid "lcn"
msgstr ""
msgid "Mountain Biking Route"
-msgstr ""
+msgstr "Mountainbikerute"
msgid "Hiking Route"
-msgstr ""
+msgstr "Vandrerute"
msgid "iwn"
msgstr ""
@@ -23206,7 +23243,7 @@ msgid "natural"
msgstr "naturlig"
msgid "Piste Route"
-msgstr ""
+msgstr "Pisterute"
msgid "link segment"
msgstr ""
@@ -23221,34 +23258,34 @@ msgid "entry points"
msgstr ""
msgid "Ski Route"
-msgstr ""
+msgstr "Skirute"
msgid "alpine"
msgstr ""
msgid "Detour Route"
-msgstr ""
+msgstr "Omkørselsrute"
msgid "Destination"
msgstr ""
msgid "Ref of the way this is a detour to"
-msgstr ""
+msgstr "Ref på vejen dette er en omvej til"
msgid "fork node for alternative routes"
-msgstr ""
+msgstr "forgreningsnode for alternative ruter"
msgid "Power Route"
-msgstr ""
+msgstr "Strømrute"
msgid "Railway Route"
-msgstr ""
+msgstr "Jernbanerute"
msgid "Road Route"
-msgstr ""
+msgstr "Vejrute"
msgid "Route Network"
-msgstr ""
+msgstr "Rutenetværk"
msgid "member"
msgstr "medlem"
@@ -23305,10 +23342,10 @@ msgid "position of sign"
msgstr "skilts placering"
msgid "Waterway"
-msgstr "Vandvej"
+msgstr "Vandløb"
msgid "Subtype of waterway (largest one of members)"
-msgstr ""
+msgstr "Undertype af vandløb (den største af medlemmerne)"
msgid "stream"
msgstr "bæk"
@@ -23320,7 +23357,7 @@ msgid "ditch"
msgstr "grøft"
msgid "Name of river/lake/sea/ocean it runs into"
-msgstr ""
+msgstr "Navn på flod/sø/hav/ocean den løber ind i"
msgid "Reference Sandre (FR)"
msgstr "Reference Sandre (FR)"
@@ -23338,13 +23375,13 @@ msgid "Reference GNBC (CA)"
msgstr "Reference GNBC (CA)"
msgid "waterways (no riverbank)"
-msgstr ""
+msgstr "vandløb (ingen flodbred)"
msgid "branch waterways (no riverbank)"
-msgstr ""
+msgstr "sidevandløb (ingen flodbred)"
msgid "spring of waterway"
-msgstr ""
+msgstr "vandløbsudspring"
msgid "Length (meters)"
msgstr "Længde (meter)"
@@ -23491,6 +23528,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} på et punkt. Bør bruges på en vej."
@@ -23531,25 +23578,25 @@ msgid "{0} must be connected to a way"
msgstr "{0} skal være forbundet til en vej"
msgid "node connects waterway and bridge"
-msgstr ""
+msgstr "node forbinder vandløb og bro"
msgid "abbreviated street name"
msgstr "forkortet vejnavn"
msgid "wrong highway tag on a node"
-msgstr "forkert highway tag på et punkt"
+msgstr "forkert vej tag på et punkt"
msgid "wrong crossing tag on a way"
msgstr "forkert krydsnings tag på en vej"
msgid "Unnamed unclassified highway"
-msgstr "Unavngivet uklassificeret highway"
+msgstr "Unavngivet uklassificeret vej"
msgid "highway without a reference"
-msgstr "highway uden en reference"
+msgstr "vej uden en reference"
msgid "temporary highway type"
-msgstr "midlertidig highway type"
+msgstr "midlertidig vejtype"
msgid "street name contains ss"
msgstr "vejnavn indeholder ss"
@@ -23662,36 +23709,6 @@ msgstr "Vis gadenavne (ved høj zoom)"
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr "OSM eksport"
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr "SUMO eksport"
-
-msgid "Export"
-msgstr "Eksporter"
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "opdatér port liste"
-
-msgid "Configure"
-msgstr "Konfigurer"
-
-msgid "Connection Error."
-msgstr "Forbindelsesfejl"
-
-msgid "configure the connected DG100"
-msgstr "konfigurer den forbundne DG100"
-
-msgid "delete data after import"
-msgstr "slet data efter import"
-
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV Filer"
@@ -23828,10 +23845,10 @@ msgid "Invalid URL {0}"
msgstr "Ugyldig URL{0}"
msgid "Error fetching URL {0}"
-msgstr ""
+msgstr "Fejl ved hentning af URL {0}"
msgid "Error parsing data from URL {0}"
-msgstr ""
+msgstr "Fejl ved fortolkning af data fra URL {0}"
msgid "Download Track"
msgstr "Download spor"
@@ -23886,13 +23903,13 @@ msgid "No GPX layer selected. Cannot upload a trace."
msgstr "Intet GPX-lag er valgt. Kan ikke uploade et spor."
msgid "Uploading trace ..."
-msgstr ""
+msgstr "Uploader spor ..."
msgid "Connecting..."
msgstr "Forbinder..."
msgid "Upload canceled"
-msgstr ""
+msgstr "Upload afbrudt"
msgid "Error while uploading"
msgstr "Fejl under upload"
@@ -24834,6 +24851,12 @@ msgstr "Hvor ofte udtyndingshandling bør anvendes (Standard {0})."
msgid "Thinning Iterations"
msgstr "Udtyndingsgennemløb"
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Vejnavn:"
@@ -24888,6 +24911,34 @@ msgstr "Klik på den modsatte ende af bygningen"
msgid "Set width of the building"
msgstr "Indstil bredde for bygningen"
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr "på polygon"
@@ -25510,6 +25561,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "Konfigurer"
+
msgid "Configure conflation options"
msgstr ""
@@ -25827,9 +25881,24 @@ msgstr "Slå datalogning fra hvis afstand falder under"
msgid "Unknown logFormat"
msgstr "Ukendt log format"
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "opdatér port liste"
+
msgid "Configure Device"
msgstr "Konfigurer enhed"
+msgid "Connection Error."
+msgstr "Forbindelsesfejl"
+
+msgid "configure the connected DG100"
+msgstr "konfigurer den forbundne DG100"
+
+msgid "delete data after import"
+msgstr "slet data efter import"
+
msgid "Importing data from device."
msgstr "Importerer data fra enhed"
@@ -26876,6 +26945,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr "Eksporter"
+
msgid "Measured values"
msgstr "Målte værdier"
@@ -26922,14 +26994,14 @@ msgid ""
"<html>A role based relation membership was copied to all new ways.<br>You "
"should verify this and correct it when necessary.</html>"
msgstr ""
-"<html>Et rollebaseret relationsmedlemsskab blev kopieret til alle nye "
+"<html>Et rollebaseret relationsmedlemskab blev kopieret til alle nye "
"veje.<br>Du bør kontrollere dette og om nødvendigt korrigere det.</html>"
msgid ""
"<html>A relation membership was copied to all new ways.<br>You should verify "
"this and correct it when necessary.</html>"
msgstr ""
-"<html>Et relationsmedlemsskab blev kopieret til alle nye veje.<br>Du bør "
+"<html>Et relationsmedlemskab blev kopieret til alle nye veje.<br>Du bør "
"kontrollere dette og om nødvendigt korrigere det.</html>"
msgid "Split way"
@@ -27174,16 +27246,19 @@ msgid ""
msgid_plural ""
"The following {0} modules have been downloaded <strong>successfully</strong>:"
msgstr[0] ""
+"Det følgende modul er blevet downloadet <strong>succesfuldt</strong>:"
msgstr[1] ""
+"De følgende {0} moduler er blevet downloadet <strong>succesfuldt</strong>:"
msgid "Downloading the following module has <strong>failed</strong>:"
msgid_plural ""
"Downloading the following {0} modules has <strong>failed</strong>:"
-msgstr[0] ""
+msgstr[0] "Download af det følgende modul er <strong>mislykkedes</ strong>:"
msgstr[1] ""
+"Download af de følgende {0} moduler er <strong>mislykkedes</strong>:"
msgid "Modules"
-msgstr ""
+msgstr "Moduler"
msgid "Accept the new module sites and close the dialog"
msgstr ""
@@ -29004,6 +29079,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr "Søkort editor"
+msgid "OSM Export"
+msgstr "OSM eksport"
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr "SUMO eksport"
+
msgid "AutoSave LiveData"
msgstr ""
@@ -29658,24 +29742,26 @@ msgid "Copy to the clipboard"
msgstr "Kopier til udklipsholder"
msgid "Cannot find object with id ''{0}'' in layer ''{1}''"
-msgstr ""
+msgstr "Kan ikke finde objekt med id ''{0}'' i lag ''{1}''"
msgid ""
"Cannot add object ''{0}'' as relation member because it is deleted or "
"invisible in layer ''{1}''"
msgstr ""
+"Kan ikke tilføje objekt ''{0}'' som relationsmedlem fordi det er slettet "
+"eller er usynlig i lag ''{1}''"
msgid "Clear the selected roles or delete the selected members"
-msgstr ""
+msgstr "Fjern de valgte roller eller slet de valgte medlemmer"
msgid "Insert new relation members from object in the clipboard"
-msgstr ""
+msgstr "Indsæt nye relationsmedlemmer fra objekt i udklipsholderen"
msgid "Move the selected relation members down by one position"
-msgstr ""
+msgstr "Flyt de valgte relationsmedlemmer en position ned"
msgid "Move the selected relation members up by one position"
-msgstr ""
+msgstr "Flyt de valgte relationsmedlemmer en position op"
msgid "Edit basic attributes of a turn restriction"
msgstr "Ret basale attributter i en svingbegrænsning"
@@ -29690,10 +29776,10 @@ msgid "Show errors and warnings related to this turn restriction"
msgstr "Vis fejl og advarsler der er relateret til denne svingbegrænsning"
msgid "Create a new turn restriction in layer ''{0}''"
-msgstr ""
+msgstr "Opret en ny svingbegrænsning i lag ''{0}''"
msgid "Edit a new turn restriction in layer ''{0}''"
-msgstr ""
+msgstr "Ret en ny svingbegrænsning i lag ''{0}''"
msgid "Edit turn restriction ''{0}'' in layer ''{1}''"
msgstr "Ret svingbegrænsning ''{0}'' i lag ''{1}''"
@@ -29705,7 +29791,11 @@ msgid_plural ""
"There are still {0} errors and/or warnings identified for this turn "
"restriction. You are recommended to resolve these issues first."
msgstr[0] ""
+"Der er stadig en uløst fejl eller advarsel identificeret for denne "
+"svingbegrænsning. Det anbefales at løse problemet først."
msgstr[1] ""
+"Der er stadig {0} fejl og/eller advarsler identificeret for denne "
+"svingbegrænsning. Det anbefales at løse disse problemer først."
msgid "Do you want to save anyway?"
msgstr "Vil du gemme alligevel?"
@@ -29714,16 +29804,16 @@ msgid "Yes, save anyway"
msgstr "Ja, gem alligevel"
msgid "Save the turn restriction despite of errors and/or warnings"
-msgstr ""
+msgstr "Gem svingbegrænsningen på trods af fejl og/eller advarsler"
msgid "No, resolve issues first"
-msgstr ""
+msgstr "Nej, løs problemer først"
msgid "Cancel saving and start resolving pending issues first"
-msgstr ""
+msgstr "Afbryd gem og begynd at løse udestående problemer først"
msgid "Pending errors and warnings"
-msgstr ""
+msgstr "Udestående fejl og advarsler"
msgid ""
"This turn restriction refers to an object which was deleted outside of this "
@@ -29732,36 +29822,45 @@ msgid_plural ""
"This turn restriction refers to {0} objects which were deleted outside of "
"this turn restriction editor:"
msgstr[0] ""
+"Denne svingbegrænsning refererer til et objekt, som blev slettet uden for "
+"denne svingbegrænsningseditor:"
msgstr[1] ""
+"Denne svingbegrænsning refererer til {0} objekter, der blev slettet uden for "
+"denne svingbegrænsningseditor:"
msgid ""
"Updates to this turn restriction can''t be saved unless deleted members are "
"removed.<br>How to you want to proceed?"
msgstr ""
+"Opdateringer til denne svingbegrænsning kan ikke blive gemt, medmindre "
+"slettede medlemmer fjernes.<br>Hvordan vil du fortsætte?"
msgid "Remove deleted members and save"
msgstr "Fjern slettede medlemmer og gem"
msgid "Cancel and return to editor"
-msgstr ""
+msgstr "Afbryd og vend tilbage til editor"
msgid "Deleted members in turn restriction"
-msgstr ""
+msgstr "Slet medlemmer i svingbegrænsning"
msgid "Create a conflict and close this turn restriction editor"
-msgstr ""
+msgstr "Opret en konflikt og luk denne svingbegrænsningseditor"
msgid "Return to the turn restriction editor and resume editing"
-msgstr ""
+msgstr "Retur til svingbegrænsningseditor og genoptag redigering"
msgid ""
"<html>This turn restriction has been changed outside of the editor.<br>You "
"cannot apply your changes and continue editing.<br><br>Do you want to create "
"a conflict and close the editor?</html>"
msgstr ""
+"<html>Denne svingbegrænsning er blevet ændret uden for editoren.<br>Du kan "
+"ikke anvende dine ændringer og fortsætte med at redigere.<br><br>Vil du "
+"oprette en konflikt og lukke editoren?</html>"
msgid "Already participating in a conflict"
-msgstr ""
+msgstr "Allerede del af en konflikt"
msgid "Delete this turn restriction"
msgstr "Slet denne svingbegrænsning"
@@ -29786,7 +29885,7 @@ msgid "no issues"
msgstr "ingen problemer"
msgid "please select a way"
-msgstr "vælg venligst en vej"
+msgstr "vælg en vej"
msgid "multiple objects with role ''{0}''"
msgstr "flere objekter med rollen ''{0}''"
@@ -29795,7 +29894,7 @@ msgid "Delete from turn restriction"
msgstr "Slet fra svingbegrænsning"
msgid "Accept the currently selected way"
-msgstr ""
+msgstr "Accepter den valgte vej"
msgid "Paste from the clipboard"
msgstr "Indsæt fra udklipsholder"
@@ -29805,6 +29904,7 @@ msgstr "Opret ny svingbegrænsning"
msgid "Launch the turn restriction editor to create a new turn restriction"
msgstr ""
+"Start svingbegrænsningseditoren for at oprette en ny svingbegrænsning"
msgid "No Right Turn"
msgstr "Ingen højresving"
@@ -29828,7 +29928,7 @@ msgid "Only Straight On"
msgstr "Kun lige ud"
msgid "Warning: failed to load icon for turn restriction type ''{0}''"
-msgstr ""
+msgstr "Advarsel: kunne ikke indlæse ikon for svingbegrænsningstypen ''{0}''"
msgid "please select a turn restriction type"
msgstr "vælg venligst en svingbegrænsningstype"
@@ -29837,14 +29937,14 @@ msgid ""
"Select the vehicle types this turn restriction is <strong>not</strong> "
"applicable for."
msgstr ""
-"Vælg de køretøjstyper denne vendebegrænsning <strong>ikke</strong> passer "
+"Vælg de køretøjstyper denne svingbegrænsning <strong>ikke</strong> passer "
"for."
msgid "Public Service Vehicles"
-msgstr "Offentlig transport"
+msgstr "Køretøjer til offentlig transport"
msgid "Public service vehicles like buses, tramways, etc."
-msgstr "Offentlig transport såsom busser, sporvogne, etc."
+msgstr "Køretøjer til offentlig transport såsom busser, sporvogne, osv."
msgid "Heavy Goods Vehicles"
msgstr "Lastbiler"
@@ -29859,30 +29959,32 @@ msgid "Mopeds"
msgstr "Knallerter"
msgid "Use standard exceptions"
-msgstr ""
+msgstr "Brug standard handlinger"
msgid "Use non-standard exceptions"
-msgstr ""
+msgstr "Brug ikke-standard handlinger"
msgid "Remove the currently selected vias"
-msgstr ""
+msgstr "Fjern de aktuelt valgte vias"
msgid "Move the selected vias down by one position"
-msgstr ""
+msgstr "Flyt de valgte vias en position ned"
msgid "Move the selected vias up by one position"
-msgstr ""
+msgstr "Flyt de valgte vias en position op"
msgid "Copy the selected vias to the clipboard"
-msgstr ""
+msgstr "Kopier valgte vias til udklipsholderen"
msgid "Insert ''via'' objects from the clipboard"
-msgstr ""
+msgstr "Indsæt ''via'' objekt fra udklipsholderen"
msgid ""
"Failed to retrieve OSM object with id {0} from dataset {1}. Cannot add it as "
"''via''."
msgstr ""
+"Kunne ikke hente OSM objekt med id {0} fra datasæt {1}. Kan ikke tilføje det "
+"som ''via''."
msgctxt "turnrestrictions"
msgid "From:"
@@ -29893,10 +29995,10 @@ msgid "To:"
msgstr "Til:"
msgid "no participating way with role ''from''"
-msgstr ""
+msgstr "ingen deltagende veje med rollen ''fra''"
msgid "no participating way with role ''to''"
-msgstr ""
+msgstr "ingen deltagende veje med rollen ''til''"
msgid "Only participating in selection"
msgstr "Kun hvis del af markering"
@@ -29906,6 +30008,9 @@ msgid ""
"selection only.<br>Deselect to display all turn restrictions in the current "
"data set.</html>"
msgstr ""
+"<html>Vælg for kun at vise svingbegrænsninger for den aktuelle "
+"markering.<br>Fravælg at få vist alle svingbegrænsninger i det aktuelle "
+"datasæt.</html>"
msgid "Turn Restrictions"
msgstr "Svingbegrænsninger"
@@ -29923,7 +30028,7 @@ msgid "Create a new turn restriction"
msgstr "Opret en ny svingbegrænsning"
msgid "Set the current JOSM selection to the selected turn restrictions"
-msgstr ""
+msgstr "Sæt den aktuelle JOSM markering til den valgte svingbegrænsning"
msgid "Select in current data layer"
msgstr "Marker i det aktuelle datalag"
@@ -29978,16 +30083,16 @@ msgid ""
msgstr ""
msgid "Delete ''from''"
-msgstr "Slet ''from''"
+msgstr "Slet ''fra''"
msgid "Removes the member with role ''from''"
-msgstr "Fjern medlemmer med rolle ''from''"
+msgstr "Fjern medlemmer med rollen ''fra''"
msgid "Delete ''to''"
msgstr "Slet \"til\""
msgid "Removes the member with role ''to''"
-msgstr "Fjern medlemmer med rolle ''to''"
+msgstr "Fjern medlemmer med rollen ''til''"
msgid "Fix in editor"
msgstr "Ret i editor"
@@ -30042,10 +30147,10 @@ msgid "Add in editor"
msgstr "Tilføj i editor"
msgid "Add a way with role ''from''"
-msgstr "Tilføj en vej med rolle ''from''"
+msgstr "Tilføj en vej med rollen ''fra''"
msgid "Add a way with role ''to''"
-msgstr "Tilføj en vej med rolle ''to''"
+msgstr "Tilføj en vej med rollen ''til''"
msgid ""
"The two ways participating in the turn restriction <strong>aren''t "
@@ -30132,7 +30237,7 @@ msgid "Undelete object..."
msgstr ""
msgid "Undelete object by id"
-msgstr ""
+msgstr "Gendan objekt udfra id"
msgid "Unable to undelete node {0}. Object has likely been redacted"
msgstr ""
@@ -30883,3 +30988,6 @@ msgstr "Kør afsted"
msgid "Drive a race car on this layer"
msgstr "Kør en racerbil på dette lag"
+
+#~ msgid "Note comment background"
+#~ msgstr "Note kommentar baggrund"
diff --git a/i18n/po/de.po b/i18n/po/de.po
index 870063b..fe8b501 100644
--- a/i18n/po/de.po
+++ b/i18n/po/de.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-03-28 10:22+0000\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-24 11:33+0000\n"
"Last-Translator: Ettore Atalan <atalanttore at googlemail.com>\n"
"Language-Team: JOSM\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:41+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: de\n"
"X-Poedit-SearchPath-0: .\n"
"X-Poedit-Basepath: /home/simon/src/josm.all/i18n\n"
@@ -242,7 +242,7 @@ msgstr ""
"Objekte setzen."
msgid "Add imagery layer {0}"
-msgstr "Hintergrund-Ebene {0} hinzufügen"
+msgstr "Hintergrundbildebene {0} hinzufügen"
msgid "Select image format for WMS layer"
msgstr "Bildformat der WMS-Ebene wählen"
@@ -475,15 +475,21 @@ msgstr "Dialogbedienfeld umschalten"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Dialogbedienfeld umschalten, Kartenanzeige maximieren"
-msgid "Distribute Nodes"
-msgstr "Punkte verteilen"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Gewählte Punkte gleichmäßig auf einer Linie verteilen."
msgid "Ignoring {0} nodes with null coordinates"
msgstr "{0} Punkte mit leeren Koordinaten ignoriert"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+"Bitte auswählen :\n"
+"* Einen nicht-selbstkreuzenden Weg mit maximal zwei seiner Punkte,\n"
+"* Drei Punkte."
+
msgid "Download from OSM..."
msgstr "Vom OSM-Server herunterladen …"
@@ -500,6 +506,9 @@ msgstr ""
msgid "Download data"
msgstr "Daten herunterladen"
+msgid "Download notes in current view"
+msgstr "OSM-Notizen in aktueller Ansicht herunterladen"
+
msgid "Download object..."
msgstr "Objekt herunterladen …"
@@ -585,7 +594,7 @@ msgid "Adjust the position of this imagery layer"
msgstr "Position der Hintergrundebene anpassen"
msgid "Adjust imagery offset"
-msgstr "Bildversatz anpassen"
+msgstr "Hintergrundbildversatz anpassen"
msgid "OK"
msgstr "OK"
@@ -811,7 +820,7 @@ msgid "Download Rectified Images From Various Services"
msgstr "Berichtigte Bilder von verschiedenen Diensten herunterladen"
msgid "Imagery: {0}"
-msgstr "Hintergund: {0}"
+msgstr "Hintergrundbild: {0}"
msgid "Custom WMS Link"
msgstr "Angepasste WMS-URL"
@@ -1053,6 +1062,12 @@ msgstr "Fenster schließen und Herunterladen abbrechen"
msgid "Download Data"
msgstr "Daten herunterladen"
+msgid "Which tasks to perform?"
+msgstr "Welche Arbeitsschritte sollen ausgeführt werden?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1285,7 +1300,7 @@ msgid "Save the current data to a new file."
msgstr "Aktuelle Daten in einer neuen Datei speichern."
msgid "Search Notes..."
-msgstr "OSM-Hinweise suchen…"
+msgstr "Hinweise suchen…"
msgid "Download notes from the note search API"
msgstr "Hinweise von der Such-API herunterladen"
@@ -1645,7 +1660,8 @@ msgstr "Geändertes aktualisieren"
msgid ""
"Updates the currently modified objects from the server (re-downloads data)"
msgstr ""
-"Die geänderten Objekte mittels des Servers aktualisieren (neu herunterladen)"
+"Aktualisiert die aktuell geänderten Objekte mittels des Servers (lädt Daten "
+"erneut herunter)"
msgid "No current dataset found"
msgstr "Aktueller Datensatz wurde nicht gefunden"
@@ -1659,8 +1675,8 @@ msgstr "Auswahl aktualisieren"
msgid ""
"Updates the currently selected objects from the server (re-downloads data)"
msgstr ""
-"Die aktuell ausgewählten Objekte mittels des Servers aktualisieren (neu "
-"herunterladen)"
+"Aktualisiert die aktuell ausgewählten Objekte mittels des Servers (lädt "
+"Daten erneut herunter)"
msgid "There are no selected objects to update."
msgstr "Es sind keine Objekte zur Aktualisierung ausgewählt."
@@ -1878,7 +1894,33 @@ msgid "Downloading Notes"
msgstr "Hinweise werden heruntergeladen"
msgid "Notes"
-msgstr "OSM-Hinweise"
+msgstr "Hinweise"
+
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] "{0} Hinweis wurde heruntergeladen."
+msgstr[1] "{0} Hinweise wurden heruntergeladen."
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+"Weil nur maximal {0} Notizen heruntergeladen werden können, existieren "
+"möglicherweise weiter herunterladbare Notizen."
+
+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."
+
+msgid "More notes to download"
+msgstr "Weitere Hinweise zum Herunterladen"
+
+msgid "Download OSM Notes within Bounds"
+msgstr "OSM-Hinweise innerhalb von Grenzen herunterladen"
+
+msgid "Download OSM Note by ID"
+msgstr "OSM-Hinweis nach Kennung herunterladen"
msgid "Download Compressed OSM Change"
msgstr "Komprimierte OSM-Änderung herunterladen"
@@ -1889,6 +1931,9 @@ msgstr "OSM-Änderung herunterladen"
msgid "Download Compressed OSM"
msgstr "Komprimierte OSM-Daten herunterladen"
+msgid "Download OSM object by ID"
+msgstr "OSM-Objekt mittels Kennung herunterladen"
+
msgid "Download OSM"
msgstr "OSM herunterladen"
@@ -2538,171 +2583,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Ungültiger Suchausdruck"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-"<b>Dresdner Straße</b> - ''Dresdner'' und ''Straße'' in jedem Schlüssel"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Dresdner Straße\"</b> - ''Dresdner Straße'' in jedem Schlüssel"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Dres</b> - ''Dres'' irgendwo im Schlüssel ''key''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Dres</b> - ''Dres'' nirgendwo im Schlüssel ''key''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - Schlüssel ''key'' mit dem exakten Wert ''value''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - Schlüssel ''key'' mit beliebigem Wert. Auch <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - Schlüssel ''key'' mit einem beliebigen Wert"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>key?</b> - Schlüssel ''key'' mit den Werten ''yes'', ''true'', ''1'' oder "
-"''on''"
-
-msgid "Special targets"
-msgstr "Spezialsuchen"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - Typ des Objektes (<b>node</b>, <b>way</b>, <b>relation</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - Von diesem Nutzer geänderten Objekte"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-"<b>user:anonymous</b> - Objekte, die von anonymen Nutzern verändert wurden"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-"<b>id:</b>... - Objekte mit der angegebenen Kennung (0 für neue Objekte)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - Objekte mit angegebener Version (0 für Objekte ohne "
-"Version)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - Objekt mit angegebener Änderungssatzkennung (0 für "
-"Objekte ohne Änderungssatz)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - Objekte mit angegebener Punktanzahl (<b>nodes:</b>anzahl, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- oder <b>nodes:</b>-max)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - Objekte mit gegebener Merkmalsanzahl (<b>tags:</b>anzahl, "
-"<b>tags:</b>min-max, <b>tags:</b>min- oder <b>tags:</b>-max)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - Objekte mit gegebener Rolle in einer Relation"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>zeit - Objekte mit letztem Änderungsdatum (2009-11-"
-"12T14:51:09Z, 2009-11-12 oder T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-"<b>timestamp:</b>min/max - Objekte mit letztem Änderungsdatum im Bereich"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - geschlossene Linie mit Fläche in m². "
-"(<b>areasize:</b>min-max oder <b>areasize:</b>max)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - Alle geänderten Objekte"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - Alle ausgewählten Objekte"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - Alle unvollständigen Objekte"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - Alle Objekte ohne Merkmale"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-"<b>closed</b> - alle geschlossenen Linien (ein Punkt gilt nicht als "
-"geschlossen)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>ausdr</i></b> - Alle untergeordneten Objekte des passenden "
-"Ausdrucks"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>ausdr</i></b> - Alle übergeordneten Objekte des passenden "
-"Ausdrucks"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - Okjekte (und all ihre Linienpunkte / "
-"Relationselemente) im heruntergeladenen Gebiet"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - Okjekte (und all ihre Linienpunkte / Relationselemente) "
-"in der aktuellen Ansicht"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-"Nutzung von <b>|</b> oder <b>OR</b> zum Kombinieren mittels logischem Oder."
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"<b>\"</b> zum Zusammenfassen nutzen (z.B. falls ein Schlüssel <b>:</b> "
-"enthält)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Innerhalb zitierter Zeichenketten müssen die Zeichen <b>\"</b> und <b>\\</b> "
-"mit einem vorangestellten <b>\\</b> entschärft werden (z. B. <b>\\\"</b> "
-"oder <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Nutzung von <b>(</b> und <b>)</b> zum Gruppieren von Ausdrücken."
-
msgid "basic examples"
msgstr "Einfache Beispiele"
@@ -2744,6 +2624,15 @@ msgstr ""
"Übereinstimmung, falls ''Schlüssel'' größer als ''Wert'' ist (analog für "
"kleiner als)"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"Zum Angeben von Operatoren.<br>Innerhalb zitierter Zeichenketten müssen die "
+"Zeichen <b>\"</b> und <b>\\</b> mit einem vorangestellten <b>\\</b> "
+"entschärft werden (z. B. <b>\\\"</b> oder <b>\\\\</b>)."
+
msgid "combinators"
msgstr "Kombinationen"
@@ -2759,15 +2648,6 @@ msgstr "Logische Negation"
msgid "use parenthesis to group expressions"
msgstr "Klammern zum Gruppieren von Ausdrücken verwenden"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"Zum Angeben von Operatoren.<br>Innerhalb zitierter Zeichenketten müssen die "
-"Zeichen <b>\"</b> und <b>\\</b> mit einem vorangestellten <b>\\</b> "
-"entschärft werden (z. B. <b>\\\"</b> oder <b>\\\\</b>)."
-
msgid "objects"
msgstr "Objekte"
@@ -2804,8 +2684,17 @@ msgstr "Objekte mit dem letzten Änderungsdatum innerhalb des Zeitraums"
msgid "properties"
msgstr "Eigenschaften"
-msgid "objects with at least 20 nodes"
-msgstr "Objekte mit mindestens 20 Punkten"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+"Wege mit mindestens 20 Knoten oder Relationen, die mindestens 20 Knoten "
+"enthalten"
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
+"Knotenpunkte mit mindestens 3 zuweisenden Wegen oder Relationen, die "
+"mindestens 3 Wege enthalten"
msgid "objects having 5 to 10 tags"
msgstr "Objekte mit 5 bis 10 Merkmalen"
@@ -2816,6 +2705,9 @@ msgstr "Objekte mit der gegebenen Relationsrolle"
msgid "closed ways with an area of 100 m²"
msgstr "Geschlossene Linien mit einer Fläche von 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr "Wege mit einer Länge von 200 m oder mehr"
+
msgid "state"
msgstr "Zustand"
@@ -4305,8 +4197,9 @@ msgstr ""
"einem ''name:*'' Attribut, noch mit einer Komposition von ''name:*'' "
"Attributen übereinstimmt. Beispiel: Italia - Italien - Italy."
-msgid "A name:* translation is missing."
-msgstr "Ein Merkmal name:* mit einem übersetzten Namen fehlt"
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
+"Merkmal name:*={0} fehlt. Merkmal mit korrekter Sprachangabe hinzufügen."
msgid "A name is missing, even though name:* exists."
msgstr "Ein Name fehlt, obwohl schon name:* vorhanden ist."
@@ -4912,7 +4805,7 @@ msgid "Imagery offset"
msgstr "Hintergrundbild-Versatz"
msgid "Imagery"
-msgstr "Hintergrund"
+msgstr "Hintergrundbild"
msgctxt "layer"
msgid "Offset"
@@ -4975,6 +4868,9 @@ msgstr "JOSM-Versionsnummer anzeigen und beenden"
msgid "Print debugging messages to console"
msgstr "Debug-Nachrichten werden auf der Konsole ausgegeben"
+msgid "Skip loading plugins"
+msgstr "Laden von Plugins überspringen"
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr "Zugriff zu folgende/n Ressource/n verweigern (kommagetrennt)"
@@ -5044,6 +4940,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr "Debug-Nachrichten werden auf der Konsole ausgegeben"
+msgid "Plugin loading skipped"
+msgstr "Plugin-Ladevorgang übersprungen"
+
msgid "Enabled detailed debug level (trace)"
msgstr "Detaillierte Debug-Nachrichten aktiviert (trace)"
@@ -5187,10 +5086,11 @@ msgid "Click to open the tagging presets tab in the preferences"
msgstr "Klicken, um die Objektvorlagen in den Einstellungen zu öffnen"
msgid "Imagery preferences"
-msgstr "Hintergrund-Einstellungen"
+msgstr "Hintergrundbildeinstellungen"
msgid "Click to open the imagery tab in the preferences"
-msgstr "Klicken, um die Hintergrund in den Einstellungen zu öffnen"
+msgstr ""
+"Klicken Sie, um den Hintergrundbildreiter in den Einstellungen zu öffnen"
msgid "Search menu items"
msgstr "Menüeinträge suchen"
@@ -6590,9 +6490,6 @@ msgstr "Breite/Länge"
msgid "East/North"
msgstr "Ost/Nord"
-msgid "Ok"
-msgstr "Ok"
-
msgid "Please enter a GPS coordinates"
msgstr "Bitte eine GPS-Koordinate eingeben"
@@ -6755,7 +6652,7 @@ msgid "Customize the style"
msgstr "Stil anpassen"
msgid "List of notes"
-msgstr "Liste von OSM-Hinweisen"
+msgstr "Liste der Hinweise"
msgid "Add comment"
msgstr "Hinweis hinzufügen"
@@ -7038,7 +6935,9 @@ msgid "Update changeset"
msgstr "Änderungssatz aktualisieren"
msgid "Updates the selected changesets with current data from the OSM server"
-msgstr "Lädt neue Daten für die ausgewählten Änderungssätze vom OSM-Server"
+msgstr ""
+"Aktualisiert die ausgewählten Änderungssätze mit aktuellen Daten vom OSM-"
+"Server"
msgid "Download changeset content"
msgstr "Änderungssatzinhalt herunterladen"
@@ -7540,8 +7439,18 @@ msgstr "Überflüssiger Schlüssel: Vordergrund"
msgid "Discardable key: background"
msgstr "Überflüssiger Schlüssel: Hintergrund"
-msgid "<different>"
-msgstr "<unterschiedlich>"
+msgid "{0} ''{1}''"
+msgstr "{0} ''{1}''"
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] "{0} unterschiedlich"
+msgstr[1] "{0} unterschiedlich"
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ", {0} nicht festgelegt"
+msgstr[1] ", {0} nicht festgelegt"
msgid "Select objects for which to change tags."
msgstr "Bitte Objekte zum Ändern der Merkmale auswählen."
@@ -7558,6 +7467,12 @@ msgstr "Element von"
msgid "Position"
msgstr "Position"
+msgid "<different>"
+msgstr "<unterschiedlich>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr "Objekte: {2} / Schlagwörter: {0} / Mitgliedschaften: {1}"
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Merkmale: {0} / Mitgliedschaften: {1}"
@@ -7693,6 +7608,19 @@ msgstr "Anzahl zuletzt ergänzter Merkmale einstellen"
msgid "Remember last used tags after a restart"
msgstr "Zuletzt verwendete Schlagwörter nach einem Neustart behalten"
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr "<code>Strg-1</code> zum Annehmen des ersten Vorschlags"
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+"<code>Umschalt-Return</code> zum Hinzufügen ohne Schließen des Dialogs"
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+"<code>Umschalt-Strg-1</code> zum Hinzufügen des ersten Vorschlags ohne "
+"Schließen des Dialogs"
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
"Bitte die Anzahl zuletzt ergänzter Mermale für die Anzeige einstellen"
@@ -7961,13 +7889,13 @@ msgstr ""
"versuchen.</html>"
msgid "Apply the current updates"
-msgstr "Aktualisierung übernehmen"
+msgstr "Aktuelle Aktualisierung übernehmen"
msgid "Apply the updates and close the dialog"
-msgstr "Aktualisierung anwenden und den Dialog schließen"
+msgstr "Aktualisierungen anwenden und den Dialog schließen"
msgid "Cancel the updates and close the dialog"
-msgstr "Aktualisierung abbrechen und den Dialog schließen"
+msgstr "Aktualisierungen abbrechen und den Dialog schließen"
msgid "Yes, save the changes and close"
msgstr "Ja, Änderungen speichern und schließen"
@@ -8218,8 +8146,7 @@ msgstr ""
"Auswählen, um GPS-Spuren im ausgewählten Ladebereich herunterzuladen."
msgid "Select to download notes in the selected download area."
-msgstr ""
-"Auswählen, um OSM-Hinweise im ausgewählten Ladebereich herunterzuladen."
+msgstr "Auswählen, um Hinweise im ausgewählten Ladebereich herunterzuladen."
msgid "Download as new layer"
msgstr "Als neue Ebene laden"
@@ -8275,7 +8202,7 @@ msgid ""
msgstr ""
"<html>Weder <strong>{0}</strong> noch <strong>{1}</strong> noch "
"<strong>{2}</strong> ist aktiviert.<br>Bitte entweder OSM-Daten, GPX-Daten, "
-"OSM-Hinweise oder mehrere davon zum Herunterladen auswählen.</html>"
+"Hinweise oder mehrere davon zum Herunterladen auswählen.</html>"
msgid "Download referrers (parent relations)"
msgstr "Verweise herunterladen (Eltern-Relationen)"
@@ -8521,18 +8448,21 @@ msgstr "Objekt"
msgid "not present"
msgstr "nicht vorhanden"
-msgid "Changeset:"
-msgstr "Änderungssatz:"
-
msgid "Changeset comment"
msgstr "Änderungssatzkommentar"
msgid "Changeset source"
msgstr "Quelle des Änderungssatzes"
+msgid "Imagery used"
+msgstr "Hintergrundbild verwendet"
+
msgid "<b>Source</b>:"
msgstr "<b>Quelle</b>:"
+msgid "<b>Imagery</b>:"
+msgstr "<b>Hintergrundbild</b>:"
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8544,6 +8474,9 @@ msgid ""
msgstr ""
"<html>Version <strong>{0}</strong> erstellt am <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr "Änderungssatz"
+
msgid "Changeset info"
msgstr "Informationen zum Änderungssatz"
@@ -9117,13 +9050,13 @@ msgid "Update objects"
msgstr "Objekte aktualisieren"
msgid "Initializing nodes to update ..."
-msgstr "Initialisiere Punkte zum Aktualisieren …"
+msgstr "Punkte zum Aktualisieren werden initialisiert …"
msgid "Initializing ways to update ..."
-msgstr "Linien zum Aktualisieren initialisieren …"
+msgstr "Linien zum Aktualisieren werden initialisiert …"
msgid "Initializing relations to update ..."
-msgstr "Initialisiere Relationen zum Aktualisieren …"
+msgstr "Relationen zum Aktualisieren werden initialisiert …"
msgid "Settings"
msgstr "Einstellungen"
@@ -9555,7 +9488,7 @@ msgid "Save GPX file"
msgstr "GPX-Datei speichern"
msgid "Imagery fade"
-msgstr "Hintergrund-Fading"
+msgstr "Hintergrundbild überblenden"
msgid "ERROR"
msgstr "FEHLER"
@@ -9738,6 +9671,9 @@ msgstr "Pixel Skalierung: {0}"
msgid "Best zoom: {0}"
msgstr "Optimaler Zoom: {0}"
+msgid "Cache stats: {0}"
+msgstr "Cache-Statistik: {0}"
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "TMS-Ebene ({0}), herunterladend in Zoomstufe {1}"
@@ -10030,7 +9966,7 @@ msgstr[0] "{0} hat aktualisierte GPS-Daten."
msgstr[1] "{0} haben aktualisierte GPS-Daten."
msgid "Delete image file from disk"
-msgstr "Bilddatei von der Platte löschen"
+msgstr "Bilddatei von der Festplatte löschen"
msgid ""
"<html><h3>Delete the file {0} from disk?<p>The image file will be "
@@ -10067,7 +10003,7 @@ msgid "Remove photo from layer"
msgstr "Photo aus Ebene entfernen"
msgid "Delete File from disk"
-msgstr "Dateien von Platte löschen"
+msgstr "Datei von der Festplatte löschen"
msgid "Copy image path"
msgstr "Bildpfad kopieren"
@@ -10234,16 +10170,16 @@ msgid "Precaching WMS"
msgstr "WMS wird vorgecacht"
msgid "Please select the imagery layer."
-msgstr "Bitte wählen Sie die Bilderebene."
+msgstr "Bitte wählen Sie die Hintergrundbildebene aus."
msgid "Select imagery layer"
-msgstr "Hintergrund-Bildebene wählen"
+msgstr "Hintergrundbildebene auswählen"
msgid "There are no imagery layers."
-msgstr "Es gibt keine Bilderebenen."
+msgstr "Es gibt keine Hintergrundbildebenen."
msgid "No imagery layers"
-msgstr "Keine Bilderebenen"
+msgstr "Keine Hintergrundbildebenen"
msgid "Velocity, km/h"
msgstr "Geschwindigkeit, km/h"
@@ -10784,7 +10720,8 @@ msgid "Allow modifications of notes"
msgstr "Ändern von Hinweisen erlauben"
msgid "Select to grant JOSM the right to modify notes on your behalf"
-msgstr "Auswählen, um JOSM das Ändern von Hinweisen zu erlauben"
+msgstr ""
+"Auswählen, um JOSM das Ändern von Hinweisen in Ihrem Namen zu erlauben"
msgid "Retrieving OAuth Access Token..."
msgstr "OAuth-Zugriffskennung abrufen …"
@@ -10957,7 +10894,8 @@ msgid "Expert mode"
msgstr "Expertenmodus"
msgid "Close the preferences dialog and discard preference updates"
-msgstr "Einstellungsdialog schließen und Änderungen verwerfen"
+msgstr ""
+"Einstellungsdialog schließen und Einstellungsaktualisierungen verwerfen"
msgid "Save the preferences and close the dialog"
msgstr "Einstellungen speichern und Dialog schließen"
@@ -11769,7 +11707,7 @@ msgid "Default (Auto determined)"
msgstr "Standard (Automatisch)"
msgid "Add Imagery URL"
-msgstr "Bilddienst-URL hinzufügen"
+msgstr "Hintergrundbild-URL hinzufügen"
msgid "1. Enter URL"
msgstr "1. URL eingeben"
@@ -11845,7 +11783,7 @@ msgid "No bounding box was found for this layer."
msgstr "Für diese Ebene wurden keine Bereichsgrenzen gefunden."
msgid "imagery fade"
-msgstr "Bildebene verblassen"
+msgstr "Hintergrundbild verblassen"
msgid "Fade Color: "
msgstr "Verblassungsfarbe: "
@@ -11863,11 +11801,11 @@ msgid "Sharpen (requires layer re-add): "
msgstr "Bild schärfen (danach Ebene neu hinzufügen): "
msgid "Imagery Preferences"
-msgstr "Einstellungen für Hintergrundebenen"
+msgstr "Hintergrundbildeinstellungen"
msgid "Modify list of imagery layers displayed in the Imagery menu"
msgstr ""
-"Liste der Hintergrundebenen bearbeiten, die im \"Hintergrund\"-Menü "
+"Liste der Hintergrundbildebenen bearbeiten, die im Hintergundbildmenü "
"angezeigt werden"
msgid "Common Settings"
@@ -11913,13 +11851,13 @@ msgid "Menu Name"
msgstr "Menüname"
msgid "Imagery URL"
-msgstr "Bilddienst-URL"
+msgstr "Hintergrundbild-URL"
msgid "Menu Name (Default)"
msgstr "Menüname (Standard)"
msgid "Imagery URL (Default)"
-msgstr "Bilddienst-URL (Standard)"
+msgstr "Hintergrundbild-URL (Standard)"
msgid "EULA license URL not available: {0}"
msgstr "URL für Endnutzerlizenz nicht verfügbar: {0}"
@@ -11957,6 +11895,12 @@ msgstr "Zum Slippymap Chooser hinzufügen: "
msgid "Tile cache directory: "
msgstr "Kachel-Zwischenspeicher-Verzeichnis "
+msgid "Maximum concurrent downloads: "
+msgstr "Maximale gleichzeitge Herunterladevorgänge: "
+
+msgid "Maximum elements in disk cache: "
+msgstr "Maximale Einträge im Festplattencache: "
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12314,8 +12258,8 @@ msgid ""
"Please decide whether JOSM shall automatically update active plugins at "
"startup after an update of JOSM itself."
msgstr ""
-"Bitte festlegen, ob JOSM aktive Plugins nach Aktualisierung von JOSM beim "
-"Start automatisch aktualisieren soll."
+"Bitte entscheiden, ob JOSM aktive Plugins nach der Aktualisierung von JOSM "
+"beim Start automatisch aktualisieren soll."
msgid "Update interval (in days):"
msgstr "Aktualisierungsintervall (in Tagen):"
@@ -12324,7 +12268,7 @@ msgid ""
"Please decide whether JOSM shall automatically update active plugins after a "
"certain period of time."
msgstr ""
-"Bitte entscheiden, ob JOSM aktive Plugins nach eine gewissen Zeit "
+"Bitte entscheiden, ob JOSM aktive Plugins nach einer gewissen Zeit "
"automatisch aktualisieren soll."
msgid "By Code (EPSG)"
@@ -12679,6 +12623,16 @@ msgstr "Regelmäßig auf neue Nachrichten prüfen"
msgid "Check interval (minutes):"
msgstr "Überprüfungsintervall (Minuten):"
+msgid "Max age for closed notes (days):"
+msgstr "Höchstalter für geschlossene Notizen (Tage):"
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+"Wie lange muss eine Notiz geschlossen sein muss, um nicht mehr "
+"heruntergeladen zu werden"
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
"Empfang der OAuth-Zugangsmarke vom Berechtigungsverwalter fehlgeschlagen."
@@ -13350,7 +13304,7 @@ msgid ""
"''{0}''"
msgstr ""
"Unerwartetes Format der Fehlerkopfzeile für Konflikt beim Aktualisieren des "
-"Änderungssatzes, Wert ist ''{0}''."
+"Änderungssatzes. ''{0}'' erhalten."
msgid "Illegal longitude value for parameter ''{0}'', got {1}"
msgstr ""
@@ -14110,7 +14064,7 @@ msgid "Open local files"
msgstr "Lokale Dateien öffnen"
msgid "Load imagery layers"
-msgstr "Hintergrund-Ebenen laden"
+msgstr "Hintergrundbildebenen laden"
msgid "Change the selection"
msgstr "Auswahl ändern"
@@ -14177,10 +14131,10 @@ msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
msgstr ""
-"Die Fernsteuerung soll eine Hintergrund-Ebene von folgender URL laden:"
+"Die Fernsteuerung soll eine Hintergrundbildebene von folgender URL laden:"
msgid "Remote imagery"
-msgstr "Hintergrund-Fernsteuerung"
+msgstr "Hintergrundbild-Fernsteuerung"
msgid "Remote Control has been asked to import data from the following URL:"
msgstr "Die Fernsteuerung soll Daten von folgender URL herunterladen:"
@@ -14268,8 +14222,8 @@ msgid ""
"Version ''{0}'' of meta data for imagery layer is not supported. Expected: "
"0.1"
msgstr ""
-"Version ''{0}'' der Metadaten für die Bildebene nicht unterstützt. "
-"Erwarteter Wert: 0.1"
+"Version ''{0}'' der Metadaten für die Hintergrundbildebene wird nicht "
+"unterstützt. Erwarteter Wert: 0.1"
msgid ""
"Version ''{0}'' of meta data for marker layer is not supported. Expected: 0.1"
@@ -14443,7 +14397,7 @@ msgid "Last plugin update more than {0} days ago."
msgstr "Letzte Aktualisierung der Plugins vor mehr als {0} Tagen."
msgid "Click to update the activated plugins"
-msgstr "Aktivierte Plugins aktualisieren"
+msgstr "Klicken Sie, um aktivierte Plugins zu aktualisieren"
msgid "Skip update"
msgstr "Aktualisierung überspringen"
@@ -14455,30 +14409,29 @@ msgid ""
"Skipping plugin update after JOSM upgrade. Automatic update at startup is "
"disabled."
msgstr ""
-"Überspringe Plugin-Aktualisierung nach JOSM-Upgrade. Automatische "
-"Aktualisierung beim Start ist deaktiviert."
+"Plugin-Aktualisierung wird nach JOSM-Aktualisierung übersprungen. "
+"Automatische Aktualisierung beim Start ist deaktiviert."
msgid ""
"Skipping plugin update after elapsed update interval. Automatic update at "
"startup is disabled."
msgstr ""
-"Überspringe Plugin-Aktualisierung nach abgelaufenem "
-"Aktualisierungsintervall. Automatische Aktualisierung beim Start ist "
-"deaktiviert."
+"Plugin-Aktualisierung wird nach abgelaufenem Aktualisierungsintervall "
+"übersprungen. Automatische Aktualisierung beim Start ist deaktiviert."
msgid ""
"Running plugin update after JOSM upgrade. Automatic update at startup is "
"enabled."
msgstr ""
-"Führe Plugin-Aktualisierung nach JOSM-Upgrade durch. Automatische "
+"Plugin-Aktualisierung nach JOSM-Aktualisierung läuft. Automatische "
"Aktualisierung beim Start ist aktiviert."
msgid ""
"Running plugin update after elapsed update interval. Automatic update at "
"startup is disabled."
msgstr ""
-"Führe Plugin-Aktualisierung nach abgelaufenem Aktualisierungsintervall "
-"durch. Automatische Aktualisierung beim Start ist deaktiviert."
+"Plugin-Aktualisierung nach abgelaufenem Aktualisierungsintervall läuft. "
+"Automatische Aktualisierung beim Start ist deaktiviert."
msgid ""
"Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''."
@@ -14498,9 +14451,9 @@ msgid ""
"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
msgstr ""
-"<html>Das Plugin {0} erfordert JOSM Version {1}. Die gegenwärtige JOSM-"
-"Version ist {2}.<br>Um dieses Plugin verwenden zu können, muss JOSM "
-"aktualisiert werden.</html>"
+"<html>Das Plugin {0} erfordert JOSM Version {1}. Die aktuelle JOSM-Version "
+"ist {2}.<br>Um dieses Plugin verwenden zu können, muss JOSM aktualisiert "
+"werden.</html>"
msgid "Could not load plugin {0}. Delete from preferences?"
msgstr ""
@@ -14561,7 +14514,7 @@ msgstr[0] ""
"Sie die Aktualisierung manuell durch."
msgstr[1] ""
"Bitte öffnen Sie den Einstellungsdialog, wenn JOSM gestartet ist, und führen "
-"Sie die Aktualisierung manuell durch."
+"Sie deren Aktualisierung manuell durch."
msgid "Plugin update failed"
msgstr "Plugin-Aktualisierung fehlgeschlagen"
@@ -14611,7 +14564,7 @@ msgid "Update plugin"
msgstr "Erweiterung aktualisieren"
msgid "Click to update the plugin ''{0}''"
-msgstr "Klicken um die Erweiterung ''{0}'' zu aktualisieren"
+msgstr "Klicken Sie, um die Erweiterung ''{0}'' zu aktualisieren"
msgid "Click to disable the plugin ''{0}''"
msgstr "Plugin \"{0}\" deaktivieren"
@@ -14777,9 +14730,10 @@ msgid ""
"bug report."
msgstr ""
"Ein unerwarteter Ausnahmefehler ist aufgetreten. Dies ist immer ein "
-"Programmierfehler. <br><br>Wenn Du eine ältere Version von JOSM ({0})<br> "
-"als die aktuelle Version (<b>{1}</b>) verwendest: <br><br><b>Bitte "
-"aktualisiere JOSM</b>, bevor Du einen Fehlerbericht einreichst."
+"Programmierfehler. <br><br>Sie verwenden eine ältere Version von JOSM "
+"({0})<br> anstatt die aktuell geteste Version (<b>{1}</b>) zu verwenden: "
+"<br><br><b>Bitte aktualisieren Sie JOSM</b>, bevor Sie einen Fehlerbericht "
+"einreichen."
msgid "Unexpected Exception"
msgstr "Unerwarteter Fehler"
@@ -14792,16 +14746,16 @@ msgid ""
"sure you have updated to the latest version of JOSM here:"
msgstr ""
"Sie haben einen Fehler in JOSM entdeckt. Bitte stellen Sie sicher, dass Sie "
-"mit der aktuellsten Version von JOSM arbeiten, bevor Sie uns einen "
-"Fehlerbericht schicken:"
+"mit der aktuellsten Version von JOSM arbeiten, bevor Sie einen Fehlerbericht "
+"einreichen:"
msgid ""
"You should also update your plugins. If neither of those help please file a "
"bug report in our bugtracker using this link:"
msgstr ""
"Sie sollten auch Ihre Plugins aktualisieren. Falls auch das nicht hilft, "
-"senden Sie bitte einen Fehlerbericht mit dem Formular unter der folgenden "
-"Adresse:"
+"reichen Sie bitte einen Fehlerbericht mit dem Formular unter der folgenden "
+"Adresse ein:"
msgid ""
"There the error information provided below should already be filled in for "
@@ -15164,10 +15118,10 @@ msgid ""
"server or you are using an invalid URL to access<br>it. Please carefully "
"check the server''s address ''{0}'' for typos."
msgstr ""
-"Der OSM-Server ''{0}'' kennt ein Objekt, das Sie lesen, verändern oder "
-"löschen wollten, nicht.<br>Es existiert entweder nicht auf dem Server oder "
-"Sie benutzen eine ungültige URL,<br>um auf den Server zuzugreifen.<br>Bitte "
-"überprüfen Sie die Server-Adresse ''{0}'' sorgfältig."
+"Der OSM-Server ''{0}'' kennt ein Objekt, das Sie lesen, aktualisieren oder "
+"löschen wollten, nicht.<br>Es ist entweder nicht auf dem Server vorhanden "
+"oder Sie benutzen eine ungültige URL,<br>um auf den Server "
+"zuzugreifen.<br>Bitte überprüfen Sie die Serveradresse ''{0}'' sorgfältig."
msgid ""
"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -15268,8 +15222,8 @@ msgid ""
"JOSM will soon stop working with this version; we highly recommend you to "
"update to Java {0}."
msgstr ""
-"JOSM wird mit dieser Version bald nicht mehr funktionieren. Wir empfehlen "
-"eine Aktualisierung auf Java {0}."
+"JOSM wird mit dieser Version bald nicht mehr funktionieren; wir empfehlen "
+"eindringlich eine Aktualisierung auf Java {0}."
msgid "Would you like to update now ?"
msgstr "Möchten Sie jetzt die Aktualisierung durchführen?"
@@ -15859,6 +15813,9 @@ msgstr "Geoimage.at Höchste Auflösung"
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr "basemap.at Orthofoto"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte"
@@ -15963,6 +15920,9 @@ msgstr "Estland Kataster (Maaamet)"
msgid "Estonia Forestry (Maaamet)"
msgstr "Estland Forstwirtschaft (Maaamet)"
+msgid "BANO"
+msgstr "BANO (Französische Adressen unter offener Lizenz)"
+
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
@@ -16094,11 +16054,14 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr "SN Luftbilder, Straßennetz, Administrative Grenzen"
+
msgid "Drone Imagery (Haiti)"
-msgstr "Drone Imagery (Haiti)"
+msgstr "Dronenbilder (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
-msgstr "Drone Imagery 2014 (Haiti)"
+msgstr "Dronenbilder 2014 (Haiti)"
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16428,7 +16391,7 @@ msgid "USGS Topographic Maps"
msgstr "USGS Topographische Karten"
msgid "USGS Large Scale Imagery"
-msgstr "USGS Large Scale Imagery"
+msgstr "USGS Großflächige Bilder"
msgid "TIGER 2012 Roads Overlay"
msgstr "TIGER 2012 Straßen Overlay"
@@ -16440,7 +16403,7 @@ msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parzellen"
msgid "NC Latest Orthoimagery"
-msgstr "NC Latest Orthoimagery"
+msgstr "NC Neueste Luftbilder"
msgid "U.S. Forest Service roads"
msgstr "U.S. Waldwege"
@@ -16716,13 +16679,6 @@ msgid "Landsat 233055"
msgstr "Landsat 233055"
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"Erlaubt das Bearbeiten von Verkehrsinformationen und das Exportieren zum "
-"Simulator SUMO"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -17116,7 +17072,7 @@ msgid "Loads data from SDS"
msgstr "Daten werden von SDS geladen"
msgid "Imagery Layer for Sea Charts"
-msgstr "Hintergrund-Bildebene für Seekarten"
+msgstr "Hintergrundbildebene für Seekarten"
msgid "Edit features for Sea Charts"
msgstr "Bearbeitungsfunktionen für Seekarten"
@@ -17132,6 +17088,13 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "Bearbeitungsfunktionen für OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Erlaubt das Bearbeiten von Verkehrsinformationen und das Exportieren zum "
+"Simulator SUMO"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
"Erlaubt Markierungen/Punkte an der aktuellen GPS-Position einzufügen."
@@ -17852,7 +17815,7 @@ msgid "needleleaved"
msgstr "nadelblättrig"
msgid "mixed"
-msgstr "Mischwald"
+msgstr "gemischt"
msgid "leafless"
msgstr "blätterlos"
@@ -17863,15 +17826,38 @@ msgstr "Kreislauf"
msgid "deciduous"
msgstr "laubabwerfend"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr "Pflanzen, die zu manchen Jahreszeiten ohne Blattwerk sind."
+
msgid "evergreen"
msgstr "immergrün"
+msgid "Plants that are never entirely without green foliage."
+msgstr "Pflanzen die nie ohne grünes Blattwerk sind."
+
msgid "semi_deciduous"
msgstr "halblaubabwerfend"
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+"Pflanzen die ihr Blattwerk für einen kurzen Zeitraum verlieren, bevor das "
+"Wachstum des neuen Blattwerks beginnt."
+
msgid "semi_evergreen"
msgstr "halbimmergrün"
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+"Pflanzen die einen Großteil ihres Blattwerks zu einer Jahreszeit verlieren, "
+"aber nicht vollständig."
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr "Lebensraum mit laubabwerfender und immergrüner Vegetation."
+
msgid "bahai"
msgstr "bahaiistisch"
@@ -19147,6 +19133,12 @@ msgstr "Fährroute"
msgid "Marina"
msgstr "Jachthafen"
+msgid "Dump Station"
+msgstr "Entsorgungsstation"
+
+msgid "public"
+msgstr "öffentlich"
+
msgid "Pier"
msgstr "Anlegestelle (Pier)"
@@ -19547,6 +19539,12 @@ msgstr "Autowäsche"
msgid "Car Dealer"
msgstr "Autohändler"
+msgid "Second hand"
+msgstr "Aus zweiter Hand"
+
+msgid "only"
+msgstr "nur"
+
msgid "Repair"
msgstr "Werkstatt"
@@ -19559,12 +19557,6 @@ msgstr "Reifen"
msgid "Rental"
msgstr "Vermietung"
-msgid "Second hand"
-msgstr "Aus zweiter Hand"
-
-msgid "only"
-msgstr "nur"
-
msgid "Sharing"
msgstr "Autotausch / Car Sharing"
@@ -19775,6 +19767,9 @@ msgstr "Halteposition"
msgid "Platform"
msgstr "Plattform"
+msgid "Subway Entrance"
+msgstr "U-Bahn-Eingang"
+
msgid "Station or amenities"
msgstr "Station oder Amenities"
@@ -19830,9 +19825,6 @@ msgstr "Bahnhof"
msgid "Building"
msgstr "Gebäude"
-msgid "Subway Entrance"
-msgstr "U-Bahn-Eingang"
-
msgid "Ticket Machine"
msgstr "Fahrausweisautomat"
@@ -19959,8 +19951,8 @@ msgstr "Sterne"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
-msgstr "Gästehaus/Übernachtung mit Frühstück"
+msgid "Guest House/Bed & Breakfast"
+msgstr "Pension/Übernachtung mit Frühstück"
msgid "Chalet"
msgstr "Ferienhaus"
@@ -20605,9 +20597,6 @@ msgstr "Toiletten"
msgid "Access rights"
msgstr "Zugangsarten"
-msgid "public"
-msgstr "öffentlich"
-
msgid "seasonal"
msgstr "saisonal"
@@ -20781,6 +20770,18 @@ msgstr "Papierkorb/Abfalleimer"
msgid "Waste Disposal/Dumpster"
msgstr "Abfallentsorgung/Müllcontainer"
+msgid "Sanitary Dump Station"
+msgstr "Sanitärentsorgungsstation"
+
+msgid "Suction pumpout"
+msgstr "Absaugpumpe"
+
+msgid "Gravity dump station"
+msgstr "Schwerkraftentsorgungsstation"
+
+msgid "Operation times"
+msgstr "Betriebszeit"
+
msgid "Backrest"
msgstr "Lehne"
@@ -21528,9 +21529,6 @@ msgstr "Leuchtturm"
msgid "Street Lamp"
msgstr "Straßenlampe"
-msgid "Operation times"
-msgstr "Betriebszeit"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Mo-Fr 22:00-05:00"
@@ -24124,6 +24122,18 @@ msgstr "Unspezifisches Merkmal {0}"
msgid "Definition of {0} is unclear"
msgstr "Definition von {0} ist unklar"
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+"{0} wird nicht empfohlen. Verwenden Sie die Funktion Linienrichtung umkehren "
+"aus dem Menü Werkzeuge."
+
+msgid "key with uncommon character"
+msgstr "Schlüssel mit ungewöhnlichem Zeichen"
+
+msgid "uncommon short key"
+msgstr "ungewöhnlich kurzer Schlüssel"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} auf einem Punkt. Sollte auf einer Linie verwendet werden."
@@ -24298,36 +24308,6 @@ msgstr "Straßenbezeichnungen anzeigen (bei hohem Zoom)"
msgid "Use alternative turn restriction icon set"
msgstr "Verwende alternative Symbole für Abbiegebeschränkungen"
-msgid "OSM Export"
-msgstr "OSM-Export"
-
-msgid "Export traffic data to SUMO network file."
-msgstr "Verkehrsdaten in SUMO-Netzwerk-Datei exportieren."
-
-msgid "SUMO Export"
-msgstr "SUMO-Export"
-
-msgid "Export"
-msgstr "Exportieren"
-
-msgid "Port:"
-msgstr "Schnittstelle:"
-
-msgid "refresh the port list"
-msgstr "Schnittstellenliste aktualisieren."
-
-msgid "Configure"
-msgstr "Einstellen"
-
-msgid "Connection Error."
-msgstr "Verbindungsfehler."
-
-msgid "configure the connected DG100"
-msgstr "Angeschlossenen DG100 einstellen"
-
-msgid "delete data after import"
-msgstr "Daten nach Import löschen"
-
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV-Dateien"
@@ -25598,6 +25578,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr "Ausdünnungs-Iterationen"
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr "Farbton und Sättingung anstatt RGB-Unterscheidung nutzen"
+
+msgid "use HSV based algorithm"
+msgstr "HSV-basierten Algorithmus verwenden"
+
msgid "Street Name:"
msgstr "Straße:"
@@ -25653,6 +25639,35 @@ msgstr "Auf gegenüberliegende Gebäudeecke zeigen"
msgid "Set width of the building"
msgstr "Gebäudebreite setzen"
+msgid "Merge address points"
+msgstr "Adresspunkte vereinen"
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+"Merkmale von Adresspunkten im Gebäude auf die Gebäudelinien verschieben"
+
+msgid "Select both address nodes and building ways to merge"
+msgstr "Gebäudelinien und Adresspunkte zum Vereinen auswählen"
+
+msgid "No address nodes found in the selection"
+msgstr "Keine Adresspunkte in Auswahl gefunden"
+
+msgid "No building ways found in the selection"
+msgstr "Keine Gebäudelinien in der Auswahl gefunden"
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] "Es gibt {0} Gebäude mit mehreren Adressknoten im Inneren"
+msgstr[1] "Es gibt {0} Gebäuden mit mehreren Adressknoten im Inneren"
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] "Es gibt {0} Gebäude mit Adresskonflikten"
+msgstr[1] "Es gibt {0} Gebäude mit Adresskonflikten"
+
+msgid "No address nodes inside buildings found"
+msgstr "Keine Adresspunkte im Gebäude gefunden"
+
msgid "on polygon"
msgstr "Auf Polygon"
@@ -26337,6 +26352,9 @@ msgstr "Nur Referenz ({0})"
msgid "Subject only ({0})"
msgstr "Nur Ziel ({0})"
+msgid "Configure"
+msgstr "Einstellen"
+
msgid "Configure conflation options"
msgstr "Zusammenführungsoptionen konfigurieren"
@@ -26659,9 +26677,24 @@ msgstr "Aufzeichnung ausschalten bei Distanz unter"
msgid "Unknown logFormat"
msgstr "Unbekanntes Aufzeichnungsformat"
+msgid "Port:"
+msgstr "Schnittstelle:"
+
+msgid "refresh the port list"
+msgstr "Schnittstellenliste aktualisieren."
+
msgid "Configure Device"
msgstr "Gerät einstellen"
+msgid "Connection Error."
+msgstr "Verbindungsfehler."
+
+msgid "configure the connected DG100"
+msgstr "Angeschlossenen DG100 einstellen"
+
+msgid "delete data after import"
+msgstr "Daten nach Import löschen"
+
msgid "Importing data from device."
msgstr "Daten vom Gerät importieren."
@@ -27787,6 +27820,9 @@ msgstr "Mapillary"
msgid "Create Mapillary layer."
msgstr "Mapillary-Ebene erstellen."
+msgid "Export"
+msgstr "Exportieren"
+
msgid "Measured values"
msgstr "Gemessene Werte"
@@ -28131,7 +28167,7 @@ msgid "Update modules"
msgstr "Module aktualisieren"
msgid "Update the selected modules"
-msgstr "Die ausgewählten Module aktualisieren"
+msgstr "Ausgewählte Module aktualisieren"
msgid "Please restart JOSM to activate the downloaded modules."
msgstr ""
@@ -28395,8 +28431,8 @@ msgid ""
"Running module update after elapsed update interval. Automatic update at "
"startup is disabled."
msgstr ""
-"Modulaktualisierung wird nach Ablauf des Aktualisierungsintervalls "
-"ausgeführt. Automatische Aktualisierung beim Starten ist deaktiviert."
+"Modulaktualisierung nach Ablauf des Aktualisierungsintervalls läuft. "
+"Automatische Aktualisierung beim Starten ist deaktiviert."
msgid "Could not load module {0}. Delete from preferences?"
msgstr ""
@@ -30029,6 +30065,15 @@ msgstr "Schwellwert zum Vereinen naheliegender Punkte"
msgid "SeaMap Editor"
msgstr "SeaMap-Bearbeitung"
+msgid "OSM Export"
+msgstr "OSM-Export"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Verkehrsdaten in SUMO-Netzwerk-Datei exportieren."
+
+msgid "SUMO Export"
+msgstr "SUMO-Export"
+
msgid "AutoSave LiveData"
msgstr "Live-Daten automatisch speichern"
@@ -30423,7 +30468,8 @@ msgid "Show all available signatures for selected attribute."
msgstr "Alle verfügbaren Signaturen für das gewählte Attribut anzeigen."
msgid "Show deleted tags and notes if they were signed before"
-msgstr "Gelöschte Merkmale und Notizen anzeigen, wenn vorher signiert"
+msgstr ""
+"Gelöschte Merkmale und Hinweise anzeigen, wenn sie vorher signiert wurden"
msgid ""
"Use default (and maybe existing) GnuPG directory ({0}) to store new keys and "
@@ -30802,8 +30848,8 @@ msgid ""
"Updates to this turn restriction can''t be saved unless deleted members are "
"removed.<br>How to you want to proceed?"
msgstr ""
-"Aktualisierungen dieser Abbiegebeschränkung können nicht gespeichert werden "
-"bis die gelöschten Mitglieder entfernt wurden.<br>Wie wollen Sie fortfahren?"
+"Aktualisierungen dieser Abbiegeeinschränkung können nicht gespeichert werden "
+"bis die gelöschten Mitglieder entfernt wurden.<br>Wie möchten Sie fortfahren?"
msgid "Remove deleted members and save"
msgstr "Gelöschte Elemente entfernen und speichern"
@@ -32086,3 +32132,6 @@ msgstr "Losfahren"
msgid "Drive a race car on this layer"
msgstr "Ein Rennauto auf dieser Ebene fahren"
+
+#~ msgid "Note comment background"
+#~ msgstr "Hinweiskommentarhintergrund"
diff --git a/i18n/po/de_DE.po b/i18n/po/de_DE.po
index fcc3722..201f7b0 100644
--- a/i18n/po/de_DE.po
+++ b/i18n/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2011-07-10 12:32+0000\n"
"Last-Translator: ralekuja <Unknown>\n"
"Language-Team: German (Germany) <de_DE at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 05:05+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 05:04+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -453,15 +453,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "Knoten verteilen"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Gewählte Knoten gleichmäßig auf einer Linie verteilen."
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Vom OSM-Server herunterladen..."
@@ -476,6 +479,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Objekt herunterladen..."
@@ -970,6 +976,12 @@ msgstr "Fenster schließen und Herunterladen abbrechen"
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1714,6 +1726,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1723,6 +1757,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2305,134 +2342,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2472,6 +2381,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2487,12 +2402,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2529,7 +2438,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2541,6 +2455,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3874,7 +3791,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4514,6 +4431,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4572,6 +4492,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5962,9 +5885,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6833,9 +6753,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6851,6 +6781,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6981,6 +6917,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7707,18 +7653,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7727,6 +7676,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8749,6 +8701,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10713,6 +10668,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11350,6 +11311,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14081,6 +14050,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14184,6 +14156,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14311,6 +14286,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14933,11 +14911,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15254,6 +15227,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15957,15 +15935,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17213,6 +17210,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17611,22 +17614,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17838,6 +17841,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17893,9 +17899,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18022,7 +18025,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18667,9 +18670,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18843,6 +18843,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19590,9 +19602,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22148,6 +22157,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22314,36 +22333,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23462,6 +23451,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23516,6 +23511,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24129,6 +24152,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24443,9 +24469,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25484,6 +25525,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27588,6 +27632,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/el.po b/i18n/po/el.po
index bf7829d..bf2c0db 100644
--- a/i18n/po/el.po
+++ b/i18n/po/el.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-03-29 17:58+0000\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-14 19:43+0000\n"
"Last-Translator: aitolos <Unknown>\n"
"Language-Team: Greek <el at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:42+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:42+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: el\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -459,9 +459,6 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "Κατανομή Κόμβων"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Κατανομή των επιλεγμένων κόμβων σε ίσες αποστάσεις κατά μήκος μιας γραμμής."
@@ -469,6 +466,12 @@ msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Αγνόηση {0} κόμβων με κενές συντεταγμένες"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Λήψη από το OSM..."
@@ -485,6 +488,9 @@ msgstr ""
msgid "Download data"
msgstr "Λήψη δεδομένων"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Λήψη αντικειμένου..."
@@ -1041,6 +1047,12 @@ msgstr "Κλείσιμο διαλόγου και ακύρωση λήψης"
msgid "Download Data"
msgstr "Λήψη δεδομένων"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Εντάξει"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1837,6 +1849,28 @@ msgstr "Λήψη σημειώσεων"
msgid "Notes"
msgstr "Σημειώσεις"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1846,6 +1880,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "Λήψη OSM"
@@ -2454,141 +2491,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Μη έγκυρη έκφραση αναζήτησης"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Baker Street</b> - ''Baker'' and ''Street'' σε οποιοδήποτε κλειδί"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' σε οποιοδήποτε κλειδί"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Bak</b> - ''Bak'' οπουδήποτε στο κλειδί ''key''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Bak</b> - ''Bak'' πουθενά στο κλειδί ''key''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - κλειδί ''key'' με τιμή ακριβώς ''value''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - αντικείμενα που αλλάχτηκαν από τον χρήστη"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-"<b>user:anonymous</b> - αντικείμενα που αλλάχτηκαν από ανώνυμους χρήστες"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-"<b>id:</b>... - αντικείμενα με καθορισμό αναγνωριστικού (0 για νέα "
-"αντικείμενα)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - αντικείμενα με καθορισμό έκδοσης (0 για αντικείμενα "
-"χωρίς ορισμένη έκδοση)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - αντικείμενα με δεδομένο ρόλο σε μια σχέση"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - όλα τα αλλαγμένα αντικείμενα"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - όλα τα επιλεγμένα αντικείμενα"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - όλα τα ημιτελή αντικείμενα"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - όλα τα αντικείμενα χωρίς ετικέτες"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-"<b>closed</b> - όλες τις κλειστές διαδρομές (ένας κόμβος δεν θεωρείται "
-"κλειστός)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Χρησιμοποιήστε <b>(</b> και <b>)</b> για να ομαδοποιήσετε εκφράσεις"
-
msgid "basic examples"
msgstr "βασικά παραδείγματα"
@@ -2628,6 +2530,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2643,12 +2551,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr "αντικείμενα"
@@ -2685,8 +2587,13 @@ msgstr ""
msgid "properties"
msgstr "ιδιότητες"
-msgid "objects with at least 20 nodes"
-msgstr "αντικείμενα με τουλάχιστον 20 κόμβους"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "αντικείμενα με 10 έως 20 ετικέτες"
@@ -2697,6 +2604,9 @@ msgstr "αντικείμενα με δεδομένο ρόλο σε μια σχέ
msgid "closed ways with an area of 100 m²"
msgstr "κλειστές διαδρομές με εμβαδό 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -4061,8 +3971,8 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
-msgstr "Μια μετάφραση name:* λείπει."
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "Ένα όνομα λείπει, παρ’οτι το name:* υπάρχει."
@@ -4719,6 +4629,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4783,6 +4696,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -6198,9 +6114,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr "Εντάξει"
-
msgid "Please enter a GPS coordinates"
msgstr "Παρακαλώ εισάγεται τις συντεταγμένες ενός GPS"
@@ -7086,8 +6999,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<διαφορετικά>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr ""
@@ -7104,6 +7027,12 @@ msgstr "Μέλος του"
msgid "Position"
msgstr "Θέση"
+msgid "<different>"
+msgstr "<διαφορετικά>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -7235,6 +7164,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7974,18 +7913,21 @@ msgstr "Αντικείμενο"
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr "Ομάδα αλλαγών:"
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7996,6 +7938,9 @@ msgstr ""
"<html>Έκδοση <strong>{0}</strong> δημιουργήθηκε στις "
"<strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "Πληροφορίες ομάδας αλλαγών"
@@ -9066,6 +9011,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -11052,6 +11000,12 @@ msgstr "Προσθήκη στον επιλογέα ολισθαίνοντος χ
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11700,6 +11654,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14472,6 +14434,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14575,6 +14540,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14702,6 +14670,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -15324,11 +15295,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15645,6 +15611,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -16351,15 +16322,34 @@ msgstr ""
msgid "deciduous"
msgstr "φυλλοβόλα"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahai"
@@ -17565,7 +17555,7 @@ msgid ""
msgstr ""
msgid "Cliff"
-msgstr "Λόφος"
+msgstr "Γκρεμός"
msgid ""
"A steep rock face exposure, with a significant vertical, or near vertical "
@@ -17607,6 +17597,12 @@ msgstr "Δρομολόγιο Πορθμείου"
msgid "Marina"
msgstr "Μαρίνα"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "δημόσιο"
+
msgid "Pier"
msgstr "Αποβάθρα"
@@ -18005,6 +18001,12 @@ msgstr "Πλυντήριο"
msgid "Car Dealer"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Repair"
msgstr "Συνεργείο Αυτοκινήτων"
@@ -18017,12 +18019,6 @@ msgstr ""
msgid "Rental"
msgstr "Ενοικίαση"
-msgid "Second hand"
-msgstr ""
-
-msgid "only"
-msgstr ""
-
msgid "Sharing"
msgstr "Κοινή χρήση"
@@ -18232,6 +18228,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr "Είσοδος υπογείου σιδηρόδρομου"
+
msgid "Station or amenities"
msgstr ""
@@ -18287,9 +18286,6 @@ msgstr "Σταθμός τρένου"
msgid "Building"
msgstr "Κτήριο"
-msgid "Subway Entrance"
-msgstr "Είσοδος υπογείου σιδηρόδρομου"
-
msgid "Ticket Machine"
msgstr ""
@@ -18416,7 +18412,7 @@ msgstr "Αστέρια"
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -19061,9 +19057,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr "δημόσιο"
-
msgid "seasonal"
msgstr ""
@@ -19237,6 +19230,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19984,9 +19989,6 @@ msgstr "Φάρος"
msgid "Street Lamp"
msgstr "Φωτισμός δρόμου"
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Δε-Πα 22:00-05:00"
@@ -22542,6 +22544,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22708,36 +22720,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr "Θύρα:"
-
-msgid "refresh the port list"
-msgstr "ανανέωση της λίστας θυρών"
-
-msgid "Configure"
-msgstr "Ρύθμιση"
-
-msgid "Connection Error."
-msgstr "Σφάλμα Σύνδεσης."
-
-msgid "configure the connected DG100"
-msgstr "ρύθμιση του συνδεδεμένου DG100"
-
-msgid "delete data after import"
-msgstr "διαγραφή δεδομένων μετά την εισαγωγή"
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23860,6 +23842,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Όνομα Οδού:"
@@ -23914,6 +23902,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24528,6 +24544,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "Ρύθμιση"
+
msgid "Configure conflation options"
msgstr ""
@@ -24846,9 +24865,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr "Θύρα:"
+
+msgid "refresh the port list"
+msgstr "ανανέωση της λίστας θυρών"
+
msgid "Configure Device"
msgstr "Ρύθμιση συσκευής"
+msgid "Connection Error."
+msgstr "Σφάλμα Σύνδεσης."
+
+msgid "configure the connected DG100"
+msgstr "ρύθμιση του συνδεδεμένου DG100"
+
+msgid "delete data after import"
+msgstr "διαγραφή δεδομένων μετά την εισαγωγή"
+
msgid "Importing data from device."
msgstr "Εισαγωγή δεδομένων από την συσκευή."
@@ -25903,6 +25937,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr "Μετρημένες τιμές"
@@ -28012,6 +28049,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/en_AU.po b/i18n/po/en_AU.po
index d7ed8a3..013b333 100644
--- a/i18n/po/en_AU.po
+++ b/i18n/po/en_AU.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2013-03-30 14:03+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: English (Australia) <en_AU at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 05:03+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 05:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -451,15 +451,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "Distribute Nodes"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Distribute the selected nodes to equal distances along a line."
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Download from OSM..."
@@ -476,6 +479,9 @@ msgstr ""
msgid "Download data"
msgstr "Download data"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Download object..."
@@ -971,6 +977,12 @@ msgstr "Close dialogue and cancel downloading"
msgid "Download Data"
msgstr "Download Data"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1746,6 +1758,28 @@ msgstr ""
msgid "Notes"
msgstr "Notes"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1755,6 +1789,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2345,138 +2382,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - all changed objects"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - all selected objects"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - all incomplete objects"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - all untagged objects"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Use <b>|</b> or <b>OR</b> to combine with logical or"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Use <b>(</b> and <b>)</b> to group expressions"
-
msgid "basic examples"
msgstr ""
@@ -2516,6 +2421,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2531,12 +2442,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2573,7 +2478,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2585,6 +2495,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3952,8 +3865,8 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
-msgstr "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "A name is missing, even though name:* exists."
@@ -4599,6 +4512,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4663,6 +4579,9 @@ msgstr "Make sure you load some data if you use --selection."
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -6094,9 +6013,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -7004,8 +6920,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<different>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr ""
@@ -7022,6 +6948,12 @@ msgstr "Member Of"
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr "<different>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -7152,6 +7084,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7908,18 +7850,21 @@ msgstr ""
msgid "not present"
msgstr "not present"
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7930,6 +7875,9 @@ msgid ""
msgstr ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "Changeset info"
@@ -9035,6 +8983,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -11133,6 +11084,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11795,6 +11752,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14671,6 +14636,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14774,6 +14742,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14901,6 +14872,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -15523,11 +15497,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15868,6 +15837,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Allow adding markers/nodes on current gps positions."
@@ -16580,15 +16554,34 @@ msgstr ""
msgid "deciduous"
msgstr "deciduous"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahai"
@@ -17836,6 +17829,12 @@ msgstr "Ferry Route"
msgid "Marina"
msgstr "Marina"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "public"
+
msgid "Pier"
msgstr "Pier"
@@ -18234,6 +18233,12 @@ msgstr "Wash"
msgid "Car Dealer"
msgstr "Car Dealer"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Repair"
msgstr "Repair"
@@ -18246,12 +18251,6 @@ msgstr ""
msgid "Rental"
msgstr "Rental"
-msgid "Second hand"
-msgstr ""
-
-msgid "only"
-msgstr ""
-
msgid "Sharing"
msgstr "Sharing"
@@ -18461,6 +18460,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr "Subway Entrance"
+
msgid "Station or amenities"
msgstr ""
@@ -18516,9 +18518,6 @@ msgstr "Station"
msgid "Building"
msgstr "Building"
-msgid "Subway Entrance"
-msgstr "Subway Entrance"
-
msgid "Ticket Machine"
msgstr ""
@@ -18645,7 +18644,7 @@ msgstr "Stars"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -19290,9 +19289,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr "public"
-
msgid "seasonal"
msgstr ""
@@ -19466,6 +19462,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr "Backrest"
@@ -20213,9 +20221,6 @@ msgstr "Lighthouse"
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22771,6 +22776,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22937,36 +22952,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "refresh the port list"
-
-msgid "Configure"
-msgstr "Configure"
-
-msgid "Connection Error."
-msgstr "Connection Error."
-
-msgid "configure the connected DG100"
-msgstr "configure the connected DG100"
-
-msgid "delete data after import"
-msgstr "delete data after import"
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24090,6 +24075,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Street Name:"
@@ -24144,6 +24135,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24797,6 +24816,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "Configure"
+
msgid "Configure conflation options"
msgstr ""
@@ -25114,9 +25136,24 @@ msgstr "Disable data logging if distance falls below"
msgid "Unknown logFormat"
msgstr "Unknown logFormat"
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "refresh the port list"
+
msgid "Configure Device"
msgstr "Configure Device"
+msgid "Connection Error."
+msgstr "Connection Error."
+
+msgid "configure the connected DG100"
+msgstr "configure the connected DG100"
+
+msgid "delete data after import"
+msgstr "delete data after import"
+
msgid "Importing data from device."
msgstr "Importing data from device."
@@ -26167,6 +26204,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr "Measured values"
@@ -28282,6 +28322,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr "AutoSave LiveData"
diff --git a/i18n/po/en_CA.po b/i18n/po/en_CA.po
index acfbd5b..b1c3249 100644
--- a/i18n/po/en_CA.po
+++ b/i18n/po/en_CA.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2010-09-24 17:25+0000\n"
"Last-Translator: Johann Beda <Unknown>\n"
"Language-Team: English (Canada) <en_CA at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 05:05+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 05:04+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -450,15 +450,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "Distribute Nodes"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Distribute the selected nodes to equal distances along a line."
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Download from OSM..."
@@ -473,6 +476,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Download object..."
@@ -967,6 +973,12 @@ msgstr "Close dialog and cancel downloading"
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1711,6 +1723,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1720,6 +1754,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2302,134 +2339,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2469,6 +2378,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2484,12 +2399,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2526,7 +2435,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2538,6 +2452,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3871,7 +3788,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4511,6 +4428,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4569,6 +4489,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5959,9 +5882,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6830,9 +6750,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6848,6 +6778,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6978,6 +6914,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7704,18 +7650,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7724,6 +7673,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8746,6 +8698,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10710,6 +10665,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11347,6 +11308,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14075,6 +14044,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14178,6 +14150,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14305,6 +14280,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14927,11 +14905,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15248,6 +15221,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15951,15 +15929,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17207,6 +17204,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17605,22 +17608,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17832,6 +17835,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17887,9 +17893,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18016,7 +18019,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18661,9 +18664,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18837,6 +18837,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19584,9 +19596,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22142,6 +22151,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22308,36 +22327,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23456,6 +23445,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23510,6 +23505,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24119,6 +24142,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24433,9 +24459,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25474,6 +25515,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27578,6 +27622,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/en_GB.po b/i18n/po/en_GB.po
index a3a7238..f4b6d7a 100644
--- a/i18n/po/en_GB.po
+++ b/i18n/po/en_GB.po
@@ -10,16 +10,16 @@ msgid ""
msgstr ""
"Project-Id-Version: JOSM\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-03-17 02:18+0000\n"
-"Last-Translator: Robert Ancell <robert.ancell at canonical.com>\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-20 11:30+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
"Language-Team: German <josm-dev at openstreetmap.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 05:03+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 05:02+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: de\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -464,15 +464,18 @@ msgstr "Toggle dialogues panel"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Toggle dialogues panel, maximise mapview"
-msgid "Distribute Nodes"
-msgstr "Distribute Nodes"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Distribute the selected nodes to equal distances along a line."
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Ignoring {0} nodes with null coordinates"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Download from OSM..."
@@ -489,6 +492,9 @@ msgstr ""
msgid "Download data"
msgstr "Download data"
+msgid "Download notes in current view"
+msgstr "Download notes in current view"
+
msgid "Download object..."
msgstr "Download object..."
@@ -1021,6 +1027,12 @@ msgstr "Close dialogue and cancel downloading"
msgid "Download Data"
msgstr "Download Data"
+msgid "Which tasks to perform?"
+msgstr "Which tasks to perform?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1828,6 +1840,30 @@ msgstr "Downloading Notes"
msgid "Notes"
msgstr "Notes"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] "{0} note has been downloaded."
+msgstr[1] "{0} notes have been downloaded."
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+"Since the download limit was {0}, there might be more notes to download."
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+"Request a smaller area to make sure that all notes are being downloaded."
+
+msgid "More notes to download"
+msgstr "More notes to download"
+
+msgid "Download OSM Notes within Bounds"
+msgstr "Download OSM Notes within Bounds"
+
+msgid "Download OSM Note by ID"
+msgstr "Download OSM Note by ID"
+
msgid "Download Compressed OSM Change"
msgstr "Download Compressed OSM Change"
@@ -1837,6 +1873,9 @@ msgstr "Download OSM Change"
msgid "Download Compressed OSM"
msgstr "Download Compressed OSM"
+msgid "Download OSM object by ID"
+msgstr "Download OSM object by ID"
+
msgid "Download OSM"
msgstr "Download OSM"
@@ -2466,160 +2505,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Invalid search expression"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - key ''key'' with value exactly ''value''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - key ''key'' set to any value"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-
-msgid "Special targets"
-msgstr "Special targets"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - objects changed by user"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - objects changed by anonymous users"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - objects with given ID (0 for new objects)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - objects with given role in a relation"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - all changed objects"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - all selected objects"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - all incomplete objects"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - all untagged objects"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr "<b>closed</b> - all closed ways (a node is not considered closed)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Use <b>|</b> or <b>OR</b> to combine with logical or"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Use <b>(</b> and <b>)</b> to group expressions"
-
msgid "basic examples"
msgstr "basic examples"
@@ -2660,6 +2545,15 @@ msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
"matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+
msgid "combinators"
msgstr "combinators"
@@ -2675,15 +2569,6 @@ msgstr "logical not"
msgid "use parenthesis to group expressions"
msgstr "use parenthesis to group expressions"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-
msgid "objects"
msgstr "objects"
@@ -2720,8 +2605,14 @@ msgstr "objects with last modification timestamp within range"
msgid "properties"
msgstr "properties"
-msgid "objects with at least 20 nodes"
-msgstr "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "objects having 5 to 10 tags"
@@ -2732,6 +2623,9 @@ msgstr "objects with given role in a relation"
msgid "closed ways with an area of 100 m²"
msgstr "closed ways with an area of 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr "state"
@@ -4163,8 +4057,8 @@ msgstr ""
"to some ''name:*'' attribute and not a composition of ''name:*'' attributes, "
"e.g., Italia - Italien - Italy."
-msgid "A name:* translation is missing."
-msgstr "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "A name is missing, even though name:* exists."
@@ -4814,6 +4708,9 @@ msgstr "Displays the JOSM version and exits"
msgid "Print debugging messages to console"
msgstr "Print debugging messages to console"
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr "Disable access to the given resource(s), separated by comma"
@@ -4882,6 +4779,9 @@ msgstr "Make sure you load some data if you use --selection."
msgid "Printing debugging messages to console"
msgstr "Printing debugging messages to console"
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr "Enabled detailed debug level (trace)"
@@ -6392,9 +6292,6 @@ msgstr "Lat/Lon"
msgid "East/North"
msgstr "East/North"
-msgid "Ok"
-msgstr "Ok"
-
msgid "Please enter a GPS coordinates"
msgstr "Please enter GPS coordinates"
@@ -7321,8 +7218,18 @@ msgstr "Discardable key: foreground"
msgid "Discardable key: background"
msgstr "Discardable key: background"
-msgid "<different>"
-msgstr "<different>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr "Select objects for which to change tags."
@@ -7339,6 +7246,12 @@ msgstr "Member Of"
msgid "Position"
msgstr "Position"
+msgid "<different>"
+msgstr "<different>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Tags: {0} / Memberships: {1}"
@@ -7471,6 +7384,16 @@ msgstr "Set number of recently added tags"
msgid "Remember last used tags after a restart"
msgstr "Remember last used tags after a restart"
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr "Please enter the number of recently added tags to display"
@@ -8262,18 +8185,21 @@ msgstr "Object"
msgid "not present"
msgstr "not present"
-msgid "Changeset:"
-msgstr "Changeset:"
-
msgid "Changeset comment"
msgstr "Changeset comment"
msgid "Changeset source"
msgstr "Changeset source"
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr "<b>Source</b>:"
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8284,6 +8210,9 @@ msgid ""
msgstr ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "Changeset info"
@@ -9433,6 +9362,9 @@ msgstr "Pixel scale: {0}"
msgid "Best zoom: {0}"
msgstr "Best zoom: {0}"
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "TMS layer ({0}), downloading in zoom {1}"
@@ -11585,6 +11517,12 @@ msgstr "Add to slippymap chooser: "
msgid "Tile cache directory: "
msgstr "Tile cache directory: "
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12278,6 +12216,14 @@ msgstr "Periodically check for new messages"
msgid "Check interval (minutes):"
msgstr "Check interval (minutes):"
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr "Failed to retrieve OAuth Access Token from credential manager"
@@ -15344,6 +15290,9 @@ msgstr "Geoimage.at MaxRes"
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (base map)"
@@ -15448,6 +15397,9 @@ msgstr "Estonia Cadastre (Maaamet)"
msgid "Estonia Forestry (Maaamet)"
msgstr "Estonia Forestry (Maaamet)"
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
@@ -15579,6 +15531,9 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Drone Imagery (Haiti)"
@@ -16201,13 +16156,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -16594,6 +16542,13 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "Edit features for OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Allow adding markers/nodes on current gps positions."
@@ -17320,15 +17275,34 @@ msgstr "Cycle"
msgid "deciduous"
msgstr "deciduous"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr "evergreen"
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr "semi_deciduous"
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr "semi_evergreen"
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahai"
@@ -18593,6 +18567,12 @@ msgstr "Ferry Route"
msgid "Marina"
msgstr "Marina"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "public"
+
msgid "Pier"
msgstr "Pier"
@@ -18991,6 +18971,12 @@ msgstr "Wash"
msgid "Car Dealer"
msgstr "Car Dealer"
+msgid "Second hand"
+msgstr "Second hand"
+
+msgid "only"
+msgstr "only"
+
msgid "Repair"
msgstr "Repair"
@@ -19003,12 +18989,6 @@ msgstr "Tires"
msgid "Rental"
msgstr "Rental"
-msgid "Second hand"
-msgstr "Second hand"
-
-msgid "only"
-msgstr "only"
-
msgid "Sharing"
msgstr "Sharing"
@@ -19218,6 +19198,9 @@ msgstr "Stop position"
msgid "Platform"
msgstr "Platform"
+msgid "Subway Entrance"
+msgstr "Subway Entrance"
+
msgid "Station or amenities"
msgstr "Station or amenities"
@@ -19273,9 +19256,6 @@ msgstr "Station"
msgid "Building"
msgstr "Building"
-msgid "Subway Entrance"
-msgstr "Subway Entrance"
-
msgid "Ticket Machine"
msgstr "Ticket machine"
@@ -19402,8 +19382,8 @@ msgstr "Stars"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
-msgstr "Guest house/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
+msgstr ""
msgid "Chalet"
msgstr "Chalet"
@@ -20048,9 +20028,6 @@ msgstr "Toilets/Restrooms"
msgid "Access rights"
msgstr "Access rights"
-msgid "public"
-msgstr "public"
-
msgid "seasonal"
msgstr "seasonal"
@@ -20224,6 +20201,18 @@ msgstr "Waste basket/Trash can"
msgid "Waste Disposal/Dumpster"
msgstr "Waste disposal/Dumpster"
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr "Backrest"
@@ -20971,9 +20960,6 @@ msgstr "Lighthouse"
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -23535,6 +23521,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -23703,36 +23699,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr "OSM Export"
-
-msgid "Export traffic data to SUMO network file."
-msgstr "Export traffic data to SUMO network file."
-
-msgid "SUMO Export"
-msgstr "SUMO Export"
-
-msgid "Export"
-msgstr "Export"
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "refresh the port list"
-
-msgid "Configure"
-msgstr "Configure"
-
-msgid "Connection Error."
-msgstr "Connection Error."
-
-msgid "configure the connected DG100"
-msgstr "configure the connected DG100"
-
-msgid "delete data after import"
-msgstr "delete data after import"
-
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV Files"
@@ -24947,6 +24913,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Street Name:"
@@ -25001,6 +24973,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -25658,6 +25658,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "Configure"
+
msgid "Configure conflation options"
msgstr ""
@@ -25975,9 +25978,24 @@ msgstr "Disable data logging if distance falls below"
msgid "Unknown logFormat"
msgstr "Unknown logFormat"
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "refresh the port list"
+
msgid "Configure Device"
msgstr "Configure Device"
+msgid "Connection Error."
+msgstr "Connection Error."
+
+msgid "configure the connected DG100"
+msgstr "configure the connected DG100"
+
+msgid "delete data after import"
+msgstr "delete data after import"
+
msgid "Importing data from device."
msgstr "Importing data from device."
@@ -27028,6 +27046,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr "Export"
+
msgid "Measured values"
msgstr "Measured values"
@@ -29155,6 +29176,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr "OSM Export"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Export traffic data to SUMO network file."
+
+msgid "SUMO Export"
+msgstr "SUMO Export"
+
msgid "AutoSave LiveData"
msgstr "AutoSave LiveData"
diff --git a/i18n/po/eo.po b/i18n/po/eo.po
index 06047be..eb2d9a4 100644
--- a/i18n/po/eo.po
+++ b/i18n/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2012-10-03 21:33+0000\n"
"Last-Translator: Michael Moroni <michael.moroni at openmailbox.org>\n"
"Language-Team: Esperanto <eo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:38+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:38+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: eo\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -446,15 +446,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "Distrubui la nodojn"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -469,6 +472,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -963,6 +969,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1707,6 +1719,28 @@ msgstr ""
msgid "Notes"
msgstr "Biletoj"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1716,6 +1750,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2298,134 +2335,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2465,6 +2374,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2480,12 +2395,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2522,7 +2431,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2534,6 +2448,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3867,7 +3784,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4507,6 +4424,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4565,6 +4485,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5955,9 +5878,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6826,9 +6746,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6844,6 +6774,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6974,6 +6910,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7700,18 +7646,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7720,6 +7669,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8742,6 +8694,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10706,6 +10661,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11343,6 +11304,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14075,6 +14044,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14178,6 +14150,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14305,6 +14280,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14927,11 +14905,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15248,6 +15221,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15951,15 +15929,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17207,6 +17204,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17605,22 +17608,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17832,6 +17835,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17887,9 +17893,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18016,7 +18019,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18661,9 +18664,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18837,6 +18837,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19584,9 +19596,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22142,6 +22151,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22308,36 +22327,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23456,6 +23445,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23510,6 +23505,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24119,6 +24142,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24433,9 +24459,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25474,6 +25515,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27578,6 +27622,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/es.po b/i18n/po/es.po
index d855b71..f8dd054 100644
--- a/i18n/po/es.po
+++ b/i18n/po/es.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-03-25 11:36+0000\n"
-"Last-Translator: pertile <leopoldofederico at gmail.com>\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-26 10:10+0000\n"
+"Last-Translator: Adolfo Jayme <fitoschido at gmail.com>\n"
"Language-Team: Spanish <es at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:57+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:57+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: es\n"
"X-Language: es_ES\n"
"X-Source-Language: C\n"
@@ -463,9 +463,6 @@ msgstr "Activar panel de diálogos"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Conmuta el panel de diálogos, maximiza la vista del mapa"
-msgid "Distribute Nodes"
-msgstr "Distribuir nodos"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Distribuir los nodos seleccionados de forma equidistante a lo largo de una "
@@ -474,6 +471,15 @@ msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Ignorando {0} nodos con coordenadas nulas"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+"Por favor seleccione :\n"
+"* Uno que no cruce el camino con un máximo de dos de sus nodos;\n"
+"* Tres nodos."
+
msgid "Download from OSM..."
msgstr "Descargar desde OSM..."
@@ -490,6 +496,9 @@ msgstr ""
msgid "Download data"
msgstr "Descargar datos"
+msgid "Download notes in current view"
+msgstr "Descargar notas en la vista actual"
+
msgid "Download object..."
msgstr "Descargar objeto..."
@@ -1041,6 +1050,12 @@ msgstr "Cerrar cuadro de diálogo y cancelar la descarga"
msgid "Download Data"
msgstr "Descargar datos"
+msgid "Which tasks to perform?"
+msgstr "¿Tareas a realizar?"
+
+msgid "Ok"
+msgstr "Aceptar"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1863,6 +1878,31 @@ msgstr "Descargando notas"
msgid "Notes"
msgstr "Notas"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] "{0} nota ha sido descargada."
+msgstr[1] "{0} notas han sido descargadas."
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+"Desde que el límite de descarga fue {0}, puede haber más notas a descargar."
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+"Petición de un área más pequeña para asegurarse que todas las notas se están "
+"descargando."
+
+msgid "More notes to download"
+msgstr "Más notas para descargar"
+
+msgid "Download OSM Notes within Bounds"
+msgstr "Descargar notas de OSM dentro de límites"
+
+msgid "Download OSM Note by ID"
+msgstr "Descargar notas de OSM por ID"
+
msgid "Download Compressed OSM Change"
msgstr "Descargar cambios a OSM comprimidos"
@@ -1872,6 +1912,9 @@ msgstr "Descargar cambios a OSM"
msgid "Download Compressed OSM"
msgstr "Descargar OSM comprimido"
+msgid "Download OSM object by ID"
+msgstr "Descargar objeto de OSM por ID"
+
msgid "Download OSM"
msgstr "Descargar OSM"
@@ -2514,170 +2557,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Expresión inválida de búsqueda"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Calle Mayor</b> - ''Calle'' y ''Mayor'' en cualquier clave"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Calle Mayor\"</b> - ''Calle Mayor'' en cualquier clave"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:May</b> - ''May'' en cualquier parte de la clave ''key''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:May</b> - ''May''en ninguna parte de la clave ''key''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - la clave ''key'' con el valor exacto ''value''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - la clave ''key'' con cualquier valor. Pruebe también "
-"<b>*=valor</b>, <b>key=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - la clave ''key'' contiene cualquier valor"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>key?</b> - la clave ''key'' contiene el valor ''yes'', ''true'', ''1'' o "
-"''on''"
-
-msgid "Special targets"
-msgstr "Etiquetas especiales"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - objetos con un tipo correspondiente (<b>node</b>, "
-"<b>way</b>, <b>relation</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - objetos cambiados por un usuario"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - objetos cambiados por usuarios anónimos"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... -objetos con ID (0 para nuevos objetos)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - objetos con versión (0 objetos sin una versión asignada)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - objetos con cambios en el ID (0 objetos sin cambios "
-"asignados)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - objetos con un determinado número de nodos "
-"(<b>nodes:</b>contados, <b>nodes:</b>min-max, <b>nodes:</b>min- o "
-"<b>nodes:</b>-max)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - objetos con un determinado número de etiquetas "
-"(<b>tags:</b>contados, <b>tags:</b>min-max, <b>tags:</b>min- o <b>tags:</b>-"
-"max)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - objetos con cierto rol en una relación"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>timestamp - los objetos con esta fecha y hora de la última "
-"modificación (2009-11-12T14:51:09Z, 2009-11-12 o T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-"<b>timestamp:</b>min/max - los objetos con la última modificación dentro del "
-"rango"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - figuras cerradas con un área determinada en m² "
-"(<b>areasize:</b>min-max o <b>areasize:</b>max)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - todos los objetos modificados"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - todos los objetos seleccionados"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - todos los objetos incompletos"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - todos los objetos sin etiquetar"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-"<b>closed</b> - todas las figuras cerradas (un nodo no se considera cerrado)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>expr</i></b> - todos los hijos de todos los objetos que cumplan "
-"la expresión"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - todos los padres de todos los objetos que "
-"cumplan la expresión"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - objetos (y todos sus nodos de vía / "
-"relaciones de miembro) en el área descargada"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - objetos (y todos sus nodos de vía / relaciones de "
-"miembro) en la vista actual"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-"Usar <b>|</b> o <b>OR</b> para realizar búsquedas combinadas con el operador "
-"lógico O (disyunción)"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Usar <b>\"</b> para entrecomillar los operadores (p.e. si una clave contiene "
-"<b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"En las cadenas de texto entrecomilladas los caracteres <b>\"</b> y <b>\\</b> "
-"necesitan ser precedidos de <b>\\</b> (p.e. <b>\\\"</b> y <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Usar <b>(</b> y <b>)</b> para agrupar expresiones"
-
msgid "basic examples"
msgstr "ejemplos básicos"
@@ -2718,6 +2597,15 @@ msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
"concuerda si ''clave'' es menor que ''value'' (en otras palabras, menor que)"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"para operadores entrecomillados.<br>Dentro de las cadensa entrecomillada los "
+"caractereses<b>\"</b> y <b>\\</b> necesitan ser escapados mediante un "
+"procedimiento <b>\\</b> (p.e. <b>\\\"</b> y <b>\\\\</b>)."
+
msgid "combinators"
msgstr "combinadores"
@@ -2734,15 +2622,6 @@ msgstr "operador lógico NOT"
msgid "use parenthesis to group expressions"
msgstr "usar paréntesis para agrupar expresiones"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"para operadores entrecomillados.<br>Dentro de las cadensa entrecomillada los "
-"caractereses<b>\"</b> y <b>\\</b> necesitan ser escapados mediante un "
-"procedimiento <b>\\</b> (p.e. <b>\\\"</b> y <b>\\\\</b>)."
-
msgid "objects"
msgstr "objetos"
@@ -2779,8 +2658,16 @@ msgstr "objetos con la última fecha y hora de modificación dentro del rango"
msgid "properties"
msgstr "propiedades"
-msgid "objects with at least 20 nodes"
-msgstr "objetos con al menos 20 nodos"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+"vías con al menos 20 nodos, o relaciones que contienen al menos 20 nodos"
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
+"nodos con al menos 3 vías referidas, o relaciones que contienen al menos 3 "
+"vías"
msgid "objects having 5 to 10 tags"
msgstr "objetos que tienen de 5 a 10 etiquetas"
@@ -2791,6 +2678,9 @@ msgstr "objetos con un rol determinado en una relación"
msgid "closed ways with an area of 100 m²"
msgstr "vías cerradas con una área de 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr "vías con una longitud de 200 m o más"
+
msgid "state"
msgstr "estado"
@@ -4277,8 +4167,8 @@ msgstr ""
"coinciden con alguno de los atributos \"name:*\" introducidos (por ejemplo, "
"España - Spanien - Spain)."
-msgid "A name:* translation is missing."
-msgstr "No se encuentra la traducción de name:*"
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "Falta un nombre, a pesar de que existe:*."
@@ -4950,6 +4840,9 @@ msgstr "Mostrar la versión de JOSM y salir"
msgid "Print debugging messages to console"
msgstr "Imprimir los mensajes de depuración a la consola"
+msgid "Skip loading plugins"
+msgstr "Omitir carga de plugins"
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr "Deshabilitar el acceso al recurso(s) dado(s), separados por comas"
@@ -5018,6 +4911,9 @@ msgstr "Hay que cargar algún dato si se usa --selección."
msgid "Printing debugging messages to console"
msgstr "Visualización de mensajes de depuración en consola"
+msgid "Plugin loading skipped"
+msgstr "Carga de plugins omitida"
+
msgid "Enabled detailed debug level (trace)"
msgstr "Activado nivel de depuración detallada (trazas)"
@@ -6588,9 +6484,6 @@ msgstr "Lat/Lon"
msgid "East/North"
msgstr "Este/Norte"
-msgid "Ok"
-msgstr "Aceptar"
-
msgid "Please enter a GPS coordinates"
msgstr "Por favor, introduzca unas coordenadas GPS"
@@ -7548,8 +7441,18 @@ msgstr "Clave descartable: frente"
msgid "Discardable key: background"
msgstr "Clave descartable: fondo"
-msgid "<different>"
-msgstr "<diferente>"
+msgid "{0} ''{1}''"
+msgstr "{0} ''{1}''"
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] "{0} diferente"
+msgstr[1] "{0} diferentes"
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ", {0} sin definir"
+msgstr[1] ", {0} sin definir"
msgid "Select objects for which to change tags."
msgstr "Seleccione los objetos a los que cambiar las etiquetas."
@@ -7566,6 +7469,12 @@ msgstr "Miembro de"
msgid "Position"
msgstr "Posición"
+msgid "<different>"
+msgstr "<diferente>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr "Objectos: {2} / Etiquetas: {0} / Miembros: {1}"
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Etiquetas: {0} / Miembros: {1}"
@@ -7701,6 +7610,19 @@ msgstr "Establecer el número de etiquetas añadidas recientemente"
msgid "Remember last used tags after a restart"
msgstr "Recordar últimas etiquetas usadas después de reiniciar"
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr "<code>Ctrl+1</code> para aplicar la primera sugerencia"
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+"<code>Mayús+Entrar</code> para añadir sin cerrar el cuadro de diálogo"
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+"<code>Mayús+Ctrl+1</code> para añadir la primera sugerencia sin cerrar el "
+"cuadro de diálogo"
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
"Por favor, introduzca el número de etiquetas añadidas recientemente a mostrar"
@@ -8531,18 +8453,21 @@ msgstr "Objeto"
msgid "not present"
msgstr "no presente"
-msgid "Changeset:"
-msgstr "Conjunto de cambios:"
-
msgid "Changeset comment"
msgstr "Comentar Changeset"
msgid "Changeset source"
msgstr "Fuente del conjunto de cambios"
+msgid "Imagery used"
+msgstr "Imágenes utilizadas"
+
msgid "<b>Source</b>:"
msgstr "<b>Fuente</b>:"
+msgid "<b>Imagery</b>:"
+msgstr "<b>Imágenes</b>:"
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8554,6 +8479,9 @@ msgid ""
msgstr ""
"<html>Versión <strong>{0}</strong> creada el <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr "Conjunto de cambios"
+
msgid "Changeset info"
msgstr "Información del conjunto de cambios"
@@ -9741,6 +9669,9 @@ msgstr "Escala de píxeles: {0}"
msgid "Best zoom: {0}"
msgstr "Mejor zoom: {0}"
+msgid "Cache stats: {0}"
+msgstr "Estadísticas de caché: {0}"
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "Capa TMS ({0}), descargando en nivel de acercamiento {1}"
@@ -11975,6 +11906,12 @@ msgstr "Añadir al selector del mapa deslizante: "
msgid "Tile cache directory: "
msgstr "Directorio del caché de teselas: "
+msgid "Maximum concurrent downloads: "
+msgstr "Descargas máximas simultáneas: "
+
+msgid "Maximum elements in disk cache: "
+msgstr "Máximos elementos en cache del disco: "
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12688,6 +12625,14 @@ msgstr "Verificar periódicamente si hay nuevos mensajes"
msgid "Check interval (minutes):"
msgstr "Comprobar cada (minutos):"
+msgid "Max age for closed notes (days):"
+msgstr "Antigüedad máxima para notas cerradas (días):"
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
"Error al recuperar el Token de Acceso OAuth desde el administrador de "
@@ -15859,6 +15804,9 @@ msgstr "Geoimage.at MaxRes"
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr "basemap.at Orthofoto"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (mapa base)"
@@ -15963,6 +15911,9 @@ msgstr "Catastral de Estonia (Maaamet)"
msgid "Estonia Forestry (Maaamet)"
msgstr "Bosques de Estonia (Maaamet)"
+msgid "BANO"
+msgstr "BANO"
+
msgid "Bordeaux - 2012"
msgstr "Burdeos - 2012"
@@ -16095,6 +16046,9 @@ msgstr "NRW-Atlas: Mapa topográfico 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Área metropolitana de Rurh: Luftbilder (10 cm)"
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr "Imágenes áreas SN, Red de carreteras, Fronteras administrativas"
+
msgid "Drone Imagery (Haiti)"
msgstr "Imágenes aéreas de drones (Haití)"
@@ -16717,13 +16671,6 @@ msgid "Landsat 233055"
msgstr "Landsat 233055"
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"Permitir editar información de tráfico y exportarlo al simulador de "
-"movilidad urbana SUMO"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -17151,6 +17098,13 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "Editar características de OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Permitir editar información de tráfico y exportarlo al simulador de "
+"movilidad urbana SUMO"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Permite añadir marcadores/nodos a las posiciones GPS actuales."
@@ -17887,15 +17841,34 @@ msgstr "Ciclo"
msgid "deciduous"
msgstr "caducifolio"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr "perennifolio"
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr "semi caducifolio"
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr "semi perennifolio"
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahaísta"
@@ -19176,6 +19149,12 @@ msgstr "Ruta de ferry"
msgid "Marina"
msgstr "Puerto deportivo"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "público"
+
msgid "Pier"
msgstr "Embarcadero"
@@ -19576,6 +19555,12 @@ msgstr "Limpieza"
msgid "Car Dealer"
msgstr "Concesionario de automóviles"
+msgid "Second hand"
+msgstr "Segunda mano"
+
+msgid "only"
+msgstr "solamente"
+
msgid "Repair"
msgstr "Taller"
@@ -19588,12 +19573,6 @@ msgstr "Neumáticos"
msgid "Rental"
msgstr "Alquiler"
-msgid "Second hand"
-msgstr "Segunda mano"
-
-msgid "only"
-msgstr "solamente"
-
msgid "Sharing"
msgstr "Compartido"
@@ -19805,6 +19784,9 @@ msgstr "Punto de detención"
msgid "Platform"
msgstr "Plataforma o andén (parada)"
+msgid "Subway Entrance"
+msgstr "Boca de metro"
+
msgid "Station or amenities"
msgstr "Estación o servicios"
@@ -19860,9 +19842,6 @@ msgstr "Estación de ferrocarril"
msgid "Building"
msgstr "Edificio"
-msgid "Subway Entrance"
-msgstr "Boca de metro"
-
msgid "Ticket Machine"
msgstr "Máquina expendedora de billetes"
@@ -19989,8 +19968,8 @@ msgstr "Estrellas"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
-msgstr "Casa de huéspedes/Cama & desayuno"
+msgid "Guest House/Bed & Breakfast"
+msgstr "Pensión / Cama y desayuno"
msgid "Chalet"
msgstr "Cabaña o bungalow"
@@ -20637,9 +20616,6 @@ msgstr "Baños"
msgid "Access rights"
msgstr "Permisos de acceso"
-msgid "public"
-msgstr "público"
-
msgid "seasonal"
msgstr "estacional"
@@ -20813,6 +20789,18 @@ msgstr "Papelera"
msgid "Waste Disposal/Dumpster"
msgstr "Contenedor de residuos"
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr "Ciclo de funcionamiento"
+
msgid "Backrest"
msgstr "Respaldo"
@@ -21560,9 +21548,6 @@ msgstr "Faro"
msgid "Street Lamp"
msgstr "Farola"
-msgid "Operation times"
-msgstr "Ciclo de funcionamiento"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Lu-Vi 22:00-05:00"
@@ -24164,6 +24149,17 @@ msgstr "Etiqueta sin especificar {0}"
msgid "Definition of {0} is unclear"
msgstr "La definición de {0} no es clara"
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+"{0} no es recomendado. Use la función Invertir vías en el menú Herramientas."
+
+msgid "key with uncommon character"
+msgstr "clave con carácter poco frecuente"
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} sobre un nodo. Debería ser utilizado sobre una vía."
@@ -24336,36 +24332,6 @@ msgstr "Mostrar etiquetas de calles (en niveles altos de acercamiento)"
msgid "Use alternative turn restriction icon set"
msgstr "Utilizar el conjunto de íconos alternativos de restricción de giro"
-msgid "OSM Export"
-msgstr "Exportar a OSM"
-
-msgid "Export traffic data to SUMO network file."
-msgstr "Exportar datos de tráfico a archivo de red SUMO."
-
-msgid "SUMO Export"
-msgstr "Exportar a SUMO"
-
-msgid "Export"
-msgstr "Exportar"
-
-msgid "Port:"
-msgstr "Puerto:"
-
-msgid "refresh the port list"
-msgstr "refrescar la lista de puertos"
-
-msgid "Configure"
-msgstr "Configurar"
-
-msgid "Connection Error."
-msgstr "Error de conexión."
-
-msgid "configure the connected DG100"
-msgstr "Configurar la conexión DG100"
-
-msgid "delete data after import"
-msgstr "Eliminar los datos después de importarlos"
-
msgid "Columbus V-900 CSV Files"
msgstr "Archivos CSV Columbus V-900"
@@ -25648,6 +25614,12 @@ msgstr "Cuán seguido debería aplicarse la operación (por defecto {0})."
msgid "Thinning Iterations"
msgstr "Iteraciones de afinamiento"
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr "Use hue y saturación en lugar de una distinción por RGB"
+
+msgid "use HSV based algorithm"
+msgstr "Use el algoritmo basado en HSV"
+
msgid "Street Name:"
msgstr "Nombre de Calle:"
@@ -25702,6 +25674,34 @@ msgstr "Seleccione en el punto final para terminar la edificación"
msgid "Set width of the building"
msgstr "Establecer ancho de la edificación"
+msgid "Merge address points"
+msgstr "Combinar puntos de dirección"
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr "Sin nodos de dirección encontrados en la selección"
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] "Hay {0} edificio dentro con múltiples nodos de direcciones"
+msgstr[1] "Hay {0} edificios dentro con múltiples nodos de direcciones"
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] "Hay {0} edificio con conflicto de direcciones"
+msgstr[1] "Hay {0} edificios con conflictos de direcciones"
+
+msgid "No address nodes inside buildings found"
+msgstr "Sin nodos de dirección dentro de los edificios encontrados"
+
msgid "on polygon"
msgstr "en polígono"
@@ -26388,6 +26388,9 @@ msgstr "Únicamente referencia ({0})"
msgid "Subject only ({0})"
msgstr "Sujeto solamente ({0})"
+msgid "Configure"
+msgstr "Configurar"
+
msgid "Configure conflation options"
msgstr "Configurar las opciones de combinación"
@@ -26709,9 +26712,24 @@ msgstr "Deshabilitar el registro de datos si la distancia cae por debajo"
msgid "Unknown logFormat"
msgstr "Formato log desconocido"
+msgid "Port:"
+msgstr "Puerto:"
+
+msgid "refresh the port list"
+msgstr "refrescar la lista de puertos"
+
msgid "Configure Device"
msgstr "Configurar dispositivo"
+msgid "Connection Error."
+msgstr "Error de conexión."
+
+msgid "configure the connected DG100"
+msgstr "Configurar la conexión DG100"
+
+msgid "delete data after import"
+msgstr "Eliminar los datos después de importarlos"
+
msgid "Importing data from device."
msgstr "Importando datos desde el dispositivo."
@@ -27848,6 +27866,9 @@ msgstr "Mapillary"
msgid "Create Mapillary layer."
msgstr "Crear capa Mapillary"
+msgid "Export"
+msgstr "Exportar"
+
msgid "Measured values"
msgstr "Valores medidos"
@@ -30015,7 +30036,7 @@ msgid "No object selected"
msgstr "No se seleccionaron objetos."
msgid "SeaChart Editor"
-msgstr ""
+msgstr "Editor SeaChart"
msgid "Seamark Inspector"
msgstr "Seamark Inspector"
@@ -30103,6 +30124,15 @@ msgstr "Umbral de Combinación de Nodos Cercanos"
msgid "SeaMap Editor"
msgstr "Editor SeaMap"
+msgid "OSM Export"
+msgstr "Exportar a OSM"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Exportar datos de tráfico a archivo de red SUMO."
+
+msgid "SUMO Export"
+msgstr "Exportar a SUMO"
+
msgid "AutoSave LiveData"
msgstr "Autograbar LiveData"
diff --git a/i18n/po/et.po b/i18n/po/et.po
index 6046efb..edf0ecf 100644
--- a/i18n/po/et.po
+++ b/i18n/po/et.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2015-02-28 09:53+0000\n"
"Last-Translator: Margus Värton <margus at dakar.ee>\n"
"Language-Team: Estonian <et at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:39+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:39+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: et\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -458,15 +458,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "Jaga sõlmed."
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Aseta valitud sõlmed võrdsete vahemaade tagant mööda joont."
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Ignoreerin {0} null-koordinaatidega sõlme"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Laadi andmed OSMist alla"
@@ -481,6 +484,9 @@ msgstr ""
msgid "Download data"
msgstr "Andmete allalaadimine"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Laadi objekt alla..."
@@ -996,6 +1002,12 @@ msgstr "Sule dialoogiaken ja katkesta allalaadimine"
msgid "Download Data"
msgstr "Andmete allalaadimine"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Ok"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1767,6 +1779,28 @@ msgstr ""
msgid "Notes"
msgstr "Märkused"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1776,6 +1810,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "OSM allalaadimine"
@@ -2369,134 +2406,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Vigane otsinguavaldis"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr "lihtsad näited"
@@ -2536,6 +2445,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2551,12 +2466,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr "kasuta sulgusid avaldiste grupeerimiseks"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2593,8 +2502,13 @@ msgstr "objektid, viimase muutmise ajatempliga vahemikus"
msgid "properties"
msgstr "omadused"
-msgid "objects with at least 20 nodes"
-msgstr "vähemalt 20 sõlmega objektid"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "5 kuni 10 sildiga objektid"
@@ -2605,6 +2519,9 @@ msgstr "kindla rolliga objektid relatsioonis"
msgid "closed ways with an area of 100 m²"
msgstr "kinnised jooned pindalaga 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr "olek"
@@ -3954,7 +3871,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4594,6 +4511,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4652,6 +4572,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -6046,9 +5969,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr "Ok"
-
msgid "Please enter a GPS coordinates"
msgstr "Palun sisest GPS koordinaadid"
@@ -6932,8 +6852,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<erinev>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr "Vali objektid, mille silte soovid muuta"
@@ -6950,6 +6880,12 @@ msgstr "On liikmeks järgnevas"
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr "<erinev>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Silte: {0} / Liikmeid: {1}"
@@ -7080,6 +7016,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7821,18 +7767,21 @@ msgstr "Objekt"
msgid "not present"
msgstr "puudub"
-msgid "Changeset:"
-msgstr "Muutuskogum:"
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7844,6 +7793,9 @@ msgid ""
msgstr ""
"<html>Versioon <strong>{0}</strong> loodud <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8898,6 +8850,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10883,6 +10838,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11540,6 +11501,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14319,6 +14288,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14422,6 +14394,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14549,6 +14524,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -15171,11 +15149,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15499,6 +15472,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -16204,15 +16182,34 @@ msgstr "Tsükkel"
msgid "deciduous"
msgstr "heitlehine"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr "igihaljas"
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr "poolheitlehine"
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr "pooligihaljas"
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17460,6 +17457,12 @@ msgstr "Praamiliin"
msgid "Marina"
msgstr "Jahisadam"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "avalik"
+
msgid "Pier"
msgstr "Kai"
@@ -17858,22 +17861,22 @@ msgstr "Autopesula"
msgid "Car Dealer"
msgstr "Automüüja"
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -18085,6 +18088,9 @@ msgstr "Peatuse asukoht"
msgid "Platform"
msgstr "Platvorm"
+msgid "Subway Entrance"
+msgstr "Metroo sissepääs"
+
msgid "Station or amenities"
msgstr ""
@@ -18140,9 +18146,6 @@ msgstr "Jaam"
msgid "Building"
msgstr "Hoone"
-msgid "Subway Entrance"
-msgstr "Metroo sissepääs"
-
msgid "Ticket Machine"
msgstr "Piletiautomaat"
@@ -18269,7 +18272,7 @@ msgstr "Tähti"
msgid "Motel"
msgstr "Motell"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18914,9 +18917,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr "avalik"
-
msgid "seasonal"
msgstr ""
@@ -19090,6 +19090,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr "Töötamise aeg"
+
msgid "Backrest"
msgstr "Seljatugi"
@@ -19837,9 +19849,6 @@ msgstr "Majakas"
msgid "Street Lamp"
msgstr "Tänavavalgusti"
-msgid "Operation times"
-msgstr "Töötamise aeg"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "E-R 22:00-05:00"
@@ -22395,6 +22404,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22561,36 +22580,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23719,6 +23708,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Tänava nimi:"
@@ -23773,6 +23768,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24383,6 +24406,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24697,9 +24723,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25743,6 +25784,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27855,6 +27899,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/eu.po b/i18n/po/eu.po
index 24dcd15..bbb4d33 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: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2015-03-09 16:55+0000\n"
"Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
"Language-Team: Basque <eu at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:34+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:34+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: eu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -454,9 +454,6 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "Banatu nodoak"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Banatu aukeraturiko nodoak marra batean zehar, distantzia bera mantenduz."
@@ -464,6 +461,12 @@ msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "OSMtik deskargatu..."
@@ -478,6 +481,9 @@ msgstr ""
msgid "Download data"
msgstr "Datuak deskargatu"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Deskargatu objektua..."
@@ -983,6 +989,12 @@ msgstr "Elkarrizketa-koadroa itxi eta deskarga utzi"
msgid "Download Data"
msgstr "Datuak deskargatu"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1778,6 +1790,28 @@ msgstr ""
msgid "Notes"
msgstr "Oharrak"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1787,6 +1821,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2388,143 +2425,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Bilaketa baliogabea"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>aldaturik</b> - aldatu diren objektu guztiak"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>aukeratuak</b> - aukeraturiko objektu guztiak"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>osatu gabea</b> - osatu gabeko objektu guztiak"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>etiketarik gabe</b> - etiketarik gabeko objektu guztiak"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>kumea <i>adierazp</i></b> - adierazpenekin bat egiten duten objektu "
-"guztien kumeak"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>guraso <i>adierazp</i></b> - adierazpenekin bat egiten duten objektu "
-"guztien gurasoak"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Erabili <b>|</b> edo <b>OR</b> logikarekin bat egiteko edo"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Erabili <b>\"</b> operadoreak aipatzeko, (esate baterako, gakoak <b>:</b> "
-"baldin badauka)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Komatxo arteko kateetan, <b>\"</b> eta <b>\\</b> karaktereak eskapatu "
-"beharra dago, aurretik <b>\\</b> jarrita (adibidez <b>\\\"</b> eta <b>\\\\"
-"</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Erabili <b>(</b> eta <b>)</b> adierazpen multzoetarako"
-
msgid "basic examples"
msgstr ""
@@ -2564,6 +2464,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2579,12 +2485,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2621,7 +2521,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2633,6 +2538,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -4014,7 +3922,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4670,6 +4578,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4735,6 +4646,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -6158,9 +6072,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -7030,8 +6941,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<ezberdina>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr ""
@@ -7048,6 +6969,12 @@ msgstr "Partaidea"
msgid "Position"
msgstr "Kokapena"
+msgid "<different>"
+msgstr "<ezberdina>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -7178,6 +7105,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7904,18 +7841,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7924,6 +7864,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8948,6 +8891,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10915,6 +10861,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11552,6 +11504,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14285,6 +14245,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14388,6 +14351,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14515,6 +14481,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -15137,11 +15106,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15482,6 +15446,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Egungo GPS kokapenean markak/nodoak gehitzeko aukera ematen digu."
@@ -16205,15 +16174,34 @@ msgstr ""
msgid "deciduous"
msgstr "hostoerorkorra"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahaista"
@@ -17461,6 +17449,12 @@ msgstr "Ferry-bidea"
msgid "Marina"
msgstr "Kirol-portua"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "publikoa"
+
msgid "Pier"
msgstr "Ontziralekua"
@@ -17859,6 +17853,12 @@ msgstr "Garbiketa"
msgid "Car Dealer"
msgstr "Auto kontzesionarioa"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Repair"
msgstr "Konponketa"
@@ -17871,12 +17871,6 @@ msgstr ""
msgid "Rental"
msgstr "Alokairua"
-msgid "Second hand"
-msgstr ""
-
-msgid "only"
-msgstr ""
-
msgid "Sharing"
msgstr "Partekatzea"
@@ -18086,6 +18080,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr "Metro-sarrera"
+
msgid "Station or amenities"
msgstr ""
@@ -18141,9 +18138,6 @@ msgstr "Estazioa"
msgid "Building"
msgstr "Eraikina"
-msgid "Subway Entrance"
-msgstr "Metro-sarrera"
-
msgid "Ticket Machine"
msgstr ""
@@ -18270,7 +18264,7 @@ msgstr "Izarrak"
msgid "Motel"
msgstr "Motela"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18915,9 +18909,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr "publikoa"
-
msgid "seasonal"
msgstr ""
@@ -19091,6 +19082,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr "Aulkiaren bizkarraldea"
@@ -19838,9 +19841,6 @@ msgstr "Itsasargia"
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22396,6 +22396,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22562,36 +22572,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23710,6 +23690,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23764,6 +23750,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24373,6 +24387,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24687,9 +24704,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25728,6 +25760,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27837,6 +27872,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/fa.po b/i18n/po/fa.po
index 19c5531..b47f8c8 100644
--- a/i18n/po/fa.po
+++ b/i18n/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2014-03-18 07:32+0000\n"
"Last-Translator: Saeed Ghazi Joolaee <Unknown>\n"
"Language-Team: Persian <fa at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:53+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:52+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: fa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -450,15 +450,18 @@ msgstr "میخ پرچ پنل گفتگو"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "میخ پرچ پنل گفتگو، نمای نقشه را حداگثر میکند"
-msgid "Distribute Nodes"
-msgstr "توزیع گره ها"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "توزیع کردن گره های انتخاب شده با فواصل مساوی در طول یک خط"
msgid "Ignoring {0} nodes with null coordinates"
msgstr "نادیده گرفتن {0} گره با مختصات صفر"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "دانلود از OSM..."
@@ -475,6 +478,9 @@ msgstr ""
msgid "Download data"
msgstr "دانلود داده ها"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "دانلود شیئ..."
@@ -1008,6 +1014,12 @@ msgstr "بستن گفتگو و لغو دانلود"
msgid "Download Data"
msgstr "دانلود داده ها"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "تایید"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1774,6 +1786,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1783,6 +1817,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2365,134 +2402,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2532,6 +2441,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2547,12 +2462,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2589,7 +2498,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2601,6 +2515,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3932,7 +3849,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4573,6 +4490,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4631,6 +4551,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -6021,9 +5944,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr "تایید"
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6892,9 +6812,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6910,6 +6840,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -7040,6 +6976,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7766,18 +7712,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7786,6 +7735,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8813,6 +8765,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10777,6 +10732,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11414,6 +11375,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14142,6 +14111,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14245,6 +14217,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14372,6 +14347,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14994,11 +14972,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15315,6 +15288,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -16018,15 +15996,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17274,6 +17271,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17672,22 +17675,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17899,6 +17902,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17954,9 +17960,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18083,7 +18086,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18728,9 +18731,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18904,6 +18904,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19651,9 +19663,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22209,6 +22218,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22375,36 +22394,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23523,6 +23512,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23577,6 +23572,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24186,6 +24209,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24500,9 +24526,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25541,6 +25582,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27645,6 +27689,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/fi.po b/i18n/po/fi.po
index e6cfba2..42d6faf 100644
--- a/i18n/po/fi.po
+++ b/i18n/po/fi.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-03-22 14:26+0000\n"
-"Last-Translator: manuska <manuska at gmail.com>\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-15 14:57+0000\n"
+"Last-Translator: Lauri Kytömaa <Unknown>\n"
"Language-Team: Finnish <fi at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:40+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:40+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: fi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -464,15 +464,18 @@ msgstr ""
"Näytä tai piilota oikean reunan muokkauspaneelit karttanäkymän "
"maksimoimiseksi"
-msgid "Distribute Nodes"
-msgstr "Aseta solmut tasavälein"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Asettaa valitut solmut tasavälein viivan myötäisesti."
msgid "Ignoring {0} nodes with null coordinates"
msgstr "{0} pisteellä ei ole koordinaatteja, joten niitä ei huomioida."
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Lataa OSM:sta..."
@@ -488,6 +491,9 @@ msgstr ""
msgid "Download data"
msgstr "Lataa dataa"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Lataa objekti..."
@@ -1025,6 +1031,12 @@ msgstr "Sulkee ikkunan ja peruuuttaa latauksen"
msgid "Download Data"
msgstr "Lataa dataa"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "OK"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1840,6 +1852,28 @@ msgstr "Ladataan karttailmoituksia"
msgid "Notes"
msgstr "Karttailmoitukset"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr "Lataa pakattu OsmChange-tiedosto"
@@ -1849,6 +1883,9 @@ msgstr "Lataa OsmChange-tiedosto"
msgid "Download Compressed OSM"
msgstr "Lataa pakattua OSM-dataa"
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "Lataa OSM-dataa"
@@ -2485,175 +2522,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Virhe hakulausekkeessa"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-"<b>Baker Street</b> - \"Baker\" ja \"Street\" missä tahansa avaimessa tai "
-"arvossa"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-"<b>\"Baker Street\"</b> - \"Baker Street\" missä tahansa avaimessa tai "
-"arvossa"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-"<b>name:Sörn</b> - \"Sörn\" missä tahansa kohtaa arvoa avaimessa \"name\""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-"<b>-name:Sörn</b> - ei merkkijonoa \"Sörn\" missään kohtaa avainta \"name\""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>type=route</b> - avaimen \"type\" arvo täsmälleen \"route\""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>avain=*</b> - avain \"avain\" jolla on mikä tahansa arvo. Kokeile myös "
-"<b>*=arvo</b>, <b>avain=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>avain:</b> - mikä tahansa arvo avaimella \"avain\""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>oneway?</b> - avaimella \"oneway\" jokin arvoista \"yes\", \"true\", "
-"\"1\" tai \"on\""
-
-msgid "Special targets"
-msgstr "Erityisehdot"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - kohteen tyyppi (<b>node</b> piste, <b>way</b> polku, "
-"<b>relation</b> relaatio))"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - annetun käyttäjän muokkaamat kohteet"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - anonyymin käyttäjän muokkaamat kohteet"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-"<b>id:</b>... - kohde, jolla on annettu tunniste (0 uusille kohteille)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - kohde, jolla on annettu versio (versiottomilla "
-"kohteilla 0)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - kohde, joka on annetussa muutoskokoelmassa "
-"(kokoelmiin kuulumattomilla 0)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - kohteet joissa on annettu määrä pisteitä "
-"(<b>nodes:</b>määrä, <b>nodes:</b>min-max, <b>nodes:</b>min- tai "
-"<b>nodes:</b>-max)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - kohteet joilla on annettu määrä tageja (<b>tags:</b>määrä, "
-"<b>tags:</b>min-max, <b>tags:</b>min- tai <b>tags:</b>-max)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-"<b>role:</b>... - kohteet, joilla on tietty rooli jossain relaatiossa"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>timestamp - kohteet joiden viimeisen muutoshetki täsmää "
-"(2009-11-12T14:51:09Z, 2009-11-12 tai T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-"<b>timestamp:</b>min/max - kohteet joiden viimesin muutoshetki aikarajojen "
-"sisällä"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - suljetut polut joiden ala on väliltä min ja max m² "
-"(<b>areasize:</b>min-max tai <b>areasize:</b>max)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - kaikki muokatut kohteet"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - kaikki valitut kohteet"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - kaikki keskeneräiset kohteet"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - kaikki tagittomat kohteet"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr "<b>closed</b> - suljetut polut (solmua ei lasketa suljetuksi)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>ehdot</i></b> - kaikki hakuehdot täyttävien kohteiden "
-"lapsikohteet"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>ehdot</i></b> - kaikki hakuehdot täyttävien kohteiden emokohteet"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - kaikki ladatun alueen kohteet (''all'' -"
-"lisällä myös näiden tyttäret: polkujen loputkin pisteet/relaatioiden muut "
-"jäsenet)"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - kaikki kohteet näkymän alueelta (''all'' -lisällä myös "
-"näiden polkujen loput pisteet / relaatioiden loput jäsenet)"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "<b>|</b> tai <b>OR</b> yhdistää ehdot (looginen \"tai\"-lause)"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Käytä lainausmerkkejä <b>\"</b>, jos haet erikoismerkkejä sisältäviä "
-"tekstejä (esim. <b>:</b> avaimessa)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Lainausmerkkien sisällä merkkien <b>\"</b> and <b>\\</b> eteen täytyy lisätä "
-"<b>\\</b> (<b>\\\"</b> ja <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Voit ryhmitellä hakuehtoja suluilla <b>(</b> and <b>)</b>."
-
msgid "basic examples"
msgstr "perusesimerkit"
@@ -2693,6 +2561,12 @@ msgstr "Kohteet joilla on tagi avaimella ''key''"
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr "ehtojen yhdistely"
@@ -2708,12 +2582,6 @@ msgstr "looginen ei"
msgid "use parenthesis to group expressions"
msgstr "käytä kaarisulkuja ryhmittääksesi hakulauseita"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr "objektit"
@@ -2750,8 +2618,13 @@ msgstr "kohteet joiden viimeisin muutos aikavälin sisällä"
msgid "properties"
msgstr "ominaisuudet"
-msgid "objects with at least 20 nodes"
-msgstr "kohteet joissa vähintään 20 pistettä"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "kohteet joilla 5-10 tagia"
@@ -2762,6 +2635,9 @@ msgstr "kohteet joilla annettu rooli jossain relaatiossa"
msgid "closed ways with an area of 100 m²"
msgstr "suljettu polku jonka alue on 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr "tila"
@@ -3912,6 +3788,8 @@ msgstr ""
msgid "Tests for the correct usage of ''*:conditional'' tags."
msgstr ""
+"Tarkistaa että ''*:conditional'' -loppuisten avainten arvot noudattavat "
+"määriteltyä merkkaustapaa."
msgid "Does not match pattern ''restriction value @ condition''"
msgstr ""
@@ -4048,10 +3926,10 @@ msgid "Unknown source:maxspeed context: {0}"
msgstr ""
msgid "Internet tags"
-msgstr ""
+msgstr "Internet -tagit"
msgid "Checks for errors in internet-related tags."
-msgstr ""
+msgstr "Etsii virheitä muualle internetiin viittaavista tageista."
msgid " URL cannot be converted to ASCII: {0}"
msgstr ""
@@ -4180,8 +4058,8 @@ msgstr ""
"Testi etsii kohteet, joilla on nimi useammalla kielellä, mutta joiden "
"''name'' -tagia ei vastaa yksikään ''name:*'' -tagi, tai niiden yhdistelmä."
-msgid "A name:* translation is missing."
-msgstr "Jokin name:* kieliversio puuttuu."
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr ""
@@ -4269,7 +4147,7 @@ msgid "Relation checker"
msgstr "Relaatiotarkistin"
msgid "Checks for errors in relations."
-msgstr ""
+msgstr "Etsii virheitä relaatioiden tageista ja relaatiojäsenten rooleista."
msgid ""
"Route scheme is unspecified. Add {0} ({1}=public_transport; {2}=legacy)"
@@ -4448,7 +4326,7 @@ msgid "Turnrestrictions"
msgstr "Kääntymiskiellot"
msgid "This test checks if turnrestrictions are valid."
-msgstr ""
+msgstr "Tarkistaa että kääntymiskieltorelaatiot ovat rakenteeltaan oikein."
msgid "Unknown role"
msgstr "Tuntematon rooli"
@@ -4839,6 +4717,9 @@ msgstr "Näytä JOSMin versionumero ja lopeta"
msgid "Print debugging messages to console"
msgstr "Tulosta suorituksen aikana debug-viestit konsoliin."
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4902,6 +4783,9 @@ msgstr "Muista ladata dataa, jos käytät --selection-valitsinta"
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -6373,9 +6257,6 @@ msgstr "Leveys-/pituusaste"
msgid "East/North"
msgstr "Itä/Pohjoinen"
-msgid "Ok"
-msgstr "OK"
-
msgid "Please enter a GPS coordinates"
msgstr "Syötä GPS-koordinaatit"
@@ -7291,8 +7172,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<eri>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr "Valitse karttakohteet joiden tietoja haluat muokata."
@@ -7309,6 +7200,12 @@ msgstr "Jäsenyydet"
msgid "Position"
msgstr "Sijainti"
+msgid "<different>"
+msgstr "<eri>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Tagit: {0} / Relaatiojäsenyydet: {1}"
@@ -7442,6 +7339,16 @@ msgstr "Valitse muistettavien tagien määrä"
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
"Anna syöttöikkunassa näytetävien viimeksi käytettyjen tagien lukumäärä"
@@ -8247,18 +8154,21 @@ msgstr "Objekti"
msgid "not present"
msgstr "ei olemassa"
-msgid "Changeset:"
-msgstr "Muutoskokoelma:"
-
msgid "Changeset comment"
msgstr "Muutoskokoelman kommentti oli"
msgid "Changeset source"
msgstr "Muutoskokoelmassa annettu lähde oli"
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8268,6 +8178,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr "<html>Versio <strong>{0}</strong> luotu <strong>{1}</strong><html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "Muutoskokoelman tiedot"
@@ -9411,6 +9324,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10635,13 +10551,13 @@ msgid "Setting Preference entries directly. Use with caution!"
msgstr "Muutetaan asetusmuuttujien arvoja suoraan. Käytä tätä vain harkiten!"
msgid "Search: "
-msgstr ""
+msgstr "Etsi: "
msgid "Read from file"
msgstr ""
msgid "Export selected items"
-msgstr ""
+msgstr "Vie valitut rivit"
msgid "JOSM custom settings files (*.xml)"
msgstr ""
@@ -11371,31 +11287,31 @@ msgid "Imagery providers"
msgstr "Kuvatasojen tarjoajat"
msgid "Offset bookmarks"
-msgstr ""
+msgstr "Tallennetut kuvatasojen siirrokset"
msgid "Imagery Background: Default"
msgstr ""
msgid "Available default entries:"
-msgstr ""
+msgstr "Oletuksena tunnetut kuvatasot:"
msgid "Selected entries:"
-msgstr ""
+msgstr "Valikkoon käytettäviksi valitut kuvatasot:"
msgid "Add a new {0} entry by entering the URL"
msgstr ""
msgid "Remove entry"
-msgstr ""
+msgstr "Poista valitut kuvatasot"
msgid "copy selected defaults"
-msgstr ""
+msgstr "Kopioi valitut kuvatasot valikossa näkyvien tasojen listaan"
msgid "Please select at least one row to copy."
msgstr ""
msgid "reload defaults"
-msgstr ""
+msgstr "Lataa uudelleen tunnettujen kuvatasojen lista"
msgid "Menu Name"
msgstr "Nimi valikossa"
@@ -11404,7 +11320,7 @@ msgid "Imagery URL"
msgstr "Kuvatason URL-osoite"
msgid "Menu Name (Default)"
-msgstr ""
+msgstr "Tason oletusnimi valikossa"
msgid "Imagery URL (Default)"
msgstr "Kuvatason URL-osoite (oletus)"
@@ -11445,6 +11361,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12114,6 +12036,14 @@ msgstr "Tarkista uudet viestit OSM-palvelimelta säännöllisesti"
msgid "Check interval (minutes):"
msgstr "Tarkistuksen toistoväli minuutteina:"
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -12379,13 +12309,15 @@ msgid "Show informational level."
msgstr ""
msgid "Show the informational tests."
-msgstr ""
+msgstr "Näytä myös huomautustasoiset havainnot testeistä"
msgid "Show informational level on upload."
msgstr "Näytä myös huomautukset ennen tietojen lähetystä"
msgid "Show the informational tests in the upload check windows."
msgstr ""
+"Näytä huomautustasoiset havainnot myös ennen tietojen lähettämistä "
+"palvelimelle."
msgid "On demand"
msgstr "Tarvittaessa"
@@ -12394,10 +12326,10 @@ msgid "On upload"
msgstr "Lähetettäessä"
msgid "Tests"
-msgstr ""
+msgstr "Suoritettavat testit"
msgid "Choose tests to enable"
-msgstr ""
+msgstr "Valitse karttatiedoille tehtävät tarkistukset"
msgid "multiple"
msgstr ""
@@ -14965,6 +14897,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -15068,6 +15003,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -15195,6 +15133,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Saksan Ruhrin alueen ilmakuvat (10 cm erotuskyky)"
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -15817,12 +15758,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"Työkalu karttadatan viemiseen urbaanin liikenteen simulointiohjelmaan SUMO"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -16161,6 +16096,12 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Työkalu karttadatan viemiseen urbaanin liikenteen simulointiohjelmaan SUMO"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -16208,6 +16149,8 @@ msgid ""
"The turnrestrictions plugin allows to enter maintain information about turn "
"restrictions in the OpenStreetMap database."
msgstr ""
+"turnrestrictions -liitännäinen helpottaa kääntymiskieltojen syöttämistä ja "
+"ylläpitoa OpenStreetMapissa."
msgid "Allows undeleting object from OSM database"
msgstr ""
@@ -16871,15 +16814,34 @@ msgstr ""
msgid "deciduous"
msgstr "lehtimetsä"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -18129,6 +18091,12 @@ msgstr "Lauttareitti"
msgid "Marina"
msgstr "Venesatama"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr "Laituri"
@@ -18527,6 +18495,12 @@ msgstr "Autopesula"
msgid "Car Dealer"
msgstr "Autokauppa"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Repair"
msgstr "Korjaamo"
@@ -18539,12 +18513,6 @@ msgstr "Rengasliike"
msgid "Rental"
msgstr "Vuokraamo"
-msgid "Second hand"
-msgstr ""
-
-msgid "only"
-msgstr ""
-
msgid "Sharing"
msgstr "Autojen yhteiskäyttöpalvelu"
@@ -18754,6 +18722,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr "Metron sisäänkäynti"
+
msgid "Station or amenities"
msgstr ""
@@ -18809,9 +18780,6 @@ msgstr "Asema"
msgid "Building"
msgstr "Rakennus"
-msgid "Subway Entrance"
-msgstr "Metron sisäänkäynti"
-
msgid "Ticket Machine"
msgstr "Matkalippuautomaatti"
@@ -18938,7 +18906,7 @@ msgstr "Tähdet"
msgid "Motel"
msgstr "Motelli"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -19583,9 +19551,6 @@ msgstr "WC"
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -19759,6 +19724,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -20506,9 +20483,6 @@ msgstr "Majakka"
msgid "Street Lamp"
msgstr "Katulyhty"
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -23075,6 +23049,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -23241,36 +23225,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr "Portti:"
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr "Asetukset"
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24402,6 +24356,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Kadunnimi:"
@@ -24456,6 +24416,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -25070,6 +25058,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "Asetukset"
+
msgid "Configure conflation options"
msgstr ""
@@ -25384,9 +25375,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr "Portti:"
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -26449,6 +26455,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr "Mitatut arvot"
@@ -26821,18 +26830,20 @@ msgid ""
msgstr ""
msgid "General settings"
-msgstr ""
+msgstr "Yleiset OpenData-asetukset"
msgid ""
"Import only raw data (i.e. do not add/delete tags or replace them by "
"standard OSM tags)"
msgstr ""
+"Tuo vain raakadata (älä lisää/poista tageja tai korvaa tietoja OSMin "
+"normaaleilla tageilla)"
msgid "Overpass API server:"
msgstr ""
msgid "Overpass API server used to download OSM data"
-msgstr ""
+msgstr "Sen Overpass API -palvelimen osoite, josta OSM-tietoja haetaan"
msgid "XAPI server:"
msgstr ""
@@ -26840,6 +26851,8 @@ msgstr ""
msgid ""
"XAPI server used to download OSM data when Overpass API is not available"
msgstr ""
+"Sen XAPI-palvelimen osoite, jota käytetään jos Overpass API ei ole "
+"käytettävissä"
msgid "Download modules"
msgstr ""
@@ -28564,6 +28577,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
@@ -29858,7 +29880,7 @@ msgid "Opens specified URL browser"
msgstr ""
msgid "Utilsplugin2 settings"
-msgstr ""
+msgstr "Utilsplugin2 -liitännäisen asetukset"
msgid "Here you can change some preferences of Utilsplugin2 functions"
msgstr ""
diff --git a/i18n/po/fil.po b/i18n/po/fil.po
index 88dbca4..e8361c1 100644
--- a/i18n/po/fil.po
+++ b/i18n/po/fil.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2011-06-19 14:15+0000\n"
"Last-Translator: Anthony Balico <Unknown>\n"
"Language-Team: Filipino <fil at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 05:06+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 05:05+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: fil\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/fo.po b/i18n/po/fo.po
index 75e8d9d..14cd538 100644
--- a/i18n/po/fo.po
+++ b/i18n/po/fo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2015-02-28 16:15+0000\n"
"Last-Translator: LiFo <Unknown>\n"
"Language-Team: Faroese <fo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:39+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:39+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}: valmøguleiki ''{1}'' er tvítýddur"
@@ -443,15 +443,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -466,6 +469,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -960,6 +966,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1704,6 +1716,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1713,6 +1747,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2295,134 +2332,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2462,6 +2371,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2477,12 +2392,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2519,7 +2428,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2531,6 +2445,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3864,7 +3781,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4504,6 +4421,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4562,6 +4482,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5952,9 +5875,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6823,9 +6743,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6841,6 +6771,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6971,6 +6907,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7697,18 +7643,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7717,6 +7666,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8739,6 +8691,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10703,6 +10658,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11340,6 +11301,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14068,6 +14037,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14171,6 +14143,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14298,6 +14273,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14920,11 +14898,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15241,6 +15214,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15944,15 +15922,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17200,6 +17197,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17598,22 +17601,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17825,6 +17828,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17880,9 +17886,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18009,7 +18012,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18654,9 +18657,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18830,6 +18830,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19577,9 +19589,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22135,6 +22144,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22301,36 +22320,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23449,6 +23438,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23503,6 +23498,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24112,6 +24135,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24426,9 +24452,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25467,6 +25508,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27571,6 +27615,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/fr.po b/i18n/po/fr.po
index 11f0c86..9ecbbe4 100644
--- a/i18n/po/fr.po
+++ b/i18n/po/fr.po
@@ -5,16 +5,16 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-03-31 15:10+0000\n"
-"Last-Translator: Frédéric Bonifas <fredericbonifas at gmail.com>\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-26 15:25+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: 2015-04-01 04:40+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:40+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: fr\n"
"X-Poedit-Bookmarks: 1767,-1,-1,2669,-1,-1,-1,-1,-1,-1\n"
@@ -466,15 +466,21 @@ msgstr "Afficher/Masquer le panneau des fenêtres latérales"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Affiche/Masque le panneau des fenêtres latérales, maximise la carte"
-msgid "Distribute Nodes"
-msgstr "Distribuer les nœuds"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Répartir les nœuds sélectionnés à égale distance le long d’une ligne"
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Ignore {0} nœuds avec des coordonnées nulles"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+"Sélectionner :\n"
+"* Un chemin qui ne se croise pas sur lui-même sur plus de deux nœuds ;\n"
+"* Trois nœuds."
+
msgid "Download from OSM..."
msgstr "Télécharger à partir d’OSM…"
@@ -491,6 +497,9 @@ msgstr ""
msgid "Download data"
msgstr "Télécharger les données."
+msgid "Download notes in current view"
+msgstr "Télécharger les notes dans la vue actuelle"
+
msgid "Download object..."
msgstr "Télécharger un objet"
@@ -1040,6 +1049,12 @@ msgstr "Annuler le téléchargement et fermer la fenêtre"
msgid "Download Data"
msgstr "Télécharger les données"
+msgid "Which tasks to perform?"
+msgstr "Quelles tâches effectuer ?"
+
+msgid "Ok"
+msgstr "Valider"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1274,7 +1289,7 @@ msgid "Download notes from the note search API"
msgstr "Télécharger des notes depuis l’API de recherche de notes"
msgid "Search the OSM API for notes containing words:"
-msgstr "Rechercher les notes contenant les mots suivants dans l'API d'OSM"
+msgstr "Rechercher les notes contenant les mots suivants dans l’API d’OSM"
msgid "Search for notes"
msgstr "Chercher des notes"
@@ -1854,6 +1869,32 @@ msgstr "En cours de téléchargement des notes"
msgid "Notes"
msgstr "Notes"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] "{0} note a été téléchargée."
+msgstr[1] "{0} notes ont été téléchargées."
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+"Étant donnée la limite de téléchargement de {0}, il se peut qu’il y aie "
+"d’autres notes à télécharger."
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+"Sélectionnez une surface plus petite pour être certain de télécharger toutes "
+"les notes."
+
+msgid "More notes to download"
+msgstr "Plus de notes à télécharger"
+
+msgid "Download OSM Notes within Bounds"
+msgstr "Télécharger les notes dans les limites"
+
+msgid "Download OSM Note by ID"
+msgstr "Télécharger un note OSM par son identifiant"
+
msgid "Download Compressed OSM Change"
msgstr "Téléchargement OSM Change compressé"
@@ -1863,6 +1904,9 @@ msgstr "Téléchargement OSM Change"
msgid "Download Compressed OSM"
msgstr "Téléchargement OSM compressé"
+msgid "Download OSM object by ID"
+msgstr "Télécharger les objets OSM par leur identifiant"
+
msgid "Download OSM"
msgstr "Télécharger OSM"
@@ -2502,167 +2546,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "L’expression de recherche n’est pas valide"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Rue Haute</b> - ''Rue'' et ''Haute'' dans n''importe quelle clé"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Rue Haute\"</b> - ''Rue Haute'' dans n''importe quelle clé"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Haut</b> - ''Haut'' dans n''importe quelle clé ''key''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Bak</b> - ''Bak'' absent de la clé ''key''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - clé ''key'' avec la valeur exacte ''value''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - clé ''key'' avec n''importe quelle valeur. Essayez aussi "
-"<b>*=value</b>, <b>key=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - clé ''key'' avec n''importe quelle valeur"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>key?</b> - clé ''key'' avec la valeur ''yes'', ''true'', ''1'' ou ''on''"
-
-msgid "Special targets"
-msgstr "Cibles spéciales"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - objets du type correspondant (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - objets modifiés par l’’utilisateur"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-"<b>user:anonymous</b> - objets modifiés par des utilisateurs anonymes"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - objets avec l’’ID donné (0 pour les nouveaux objets)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - objets avec la version donnée (0 pour les objets sans "
-"version assignée)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - objets avec l’’ID de groupe de modifications donné (0 "
-"pour les objets sans groupe de modifications assigné)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - objets avec le nombre de nœuds donné "
-"(<b>nodes:</b>compte, <b>nodes:</b>min-max, <b>nodes:</b>min- ou "
-"<b>nodes:</b>-max)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - objets avec le nombre d’’attributs donné "
-"(<b>tags:</b>compte, <b>tags:</b>min-max, <b>tags:</b>min- ou <b>tags:</b>-"
-"max)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - objets avec le rôle donné dans une relation"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>horodatage - objets avec cet horodatage de dernière "
-"modification (2009-11-12T14:51:09Z, 2009-11-12 ou T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-"<b>timestamp:</b>min/max - objets avec leur horodatage de dernière "
-"modification dans cet intervalle"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - chemins fermés avec la superficie donnée en m² "
-"(<b>areasize:</b>min-max ou <b>areasize:</b>max)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - recherche tous les objets modifiés"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - recherche tous les objets sélectionnés"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - recherche tous les objets incomplets"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - recherche tous les objets sans attribut"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr "<b>closed</b> - recherche tous les chemins fermés"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>expr</i></b> - recherche tous les enfants des objets "
-"satisfaisant l’expression indiquée"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - recherche tous les parents des objets "
-"satisfaisant l’expression indiquée"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - objets (et tous ses nœuds de chemin / membres "
-"de relation) dans la zone téléchargée"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - objets (et tous ses nœuds de chemin / membres de "
-"relation) dans la vue courante"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "<b>|</b> ou <b>OR</b> - combine avec le OU logique"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"<b>\"</b> - encadre les opérateurs (par exemple si la clé contient <b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"À l’intérieur des guillemets, les caractères <b>\"</b> et <b>\\</b> doivent "
-"être précédés par un <b>\\</b> (par exemple : <b>\\\"</b> et <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "<b>(</b> et <b>)</b> - regroupe des expressions"
-
msgid "basic examples"
msgstr "Exemples de base"
@@ -2704,6 +2587,15 @@ msgstr ""
"correspond si la \"clé\" est plus grande que la \"valeur\" (respectivement, "
"plus petite)"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"pour citer des opérateurs.<br>Dans les chaines délimitées, les caractères "
+"<b>\"</b> et <b>\\</b> doivent être précédés par un signe d’échappement <b>\\"
+"</b> (par ex. <b>\\\"</b> et <b>\\\\</b>)."
+
msgid "combinators"
msgstr "combinateurs"
@@ -2719,15 +2611,6 @@ msgstr "négation logique"
msgid "use parenthesis to group expressions"
msgstr "utiliser des parenthèses pour grouper des expressions"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"pour citer des opérateurs.<br>Dans les chaines délimitées, les caractères "
-"<b>\"</b> et <b>\\</b> doivent être précédés par un signe d’échappement <b>\\"
-"</b> (par ex. <b>\\\"</b> et <b>\\\\</b>)."
-
msgid "objects"
msgstr "objets"
@@ -2764,8 +2647,17 @@ msgstr "objets dont la date de dernière modification est dans l’intervalle"
msgid "properties"
msgstr "propriétés"
-msgid "objects with at least 20 nodes"
-msgstr "objets comportant au moins 20 nœuds"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+"chemins constitués d’au moins 20 nœuds, ou relations contenants au moins 20 "
+"nœuds."
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
+"nœuds faisant partie d’au moins 3 chemin, ou relations avec au moins 3 "
+"chemins"
msgid "objects having 5 to 10 tags"
msgstr "objets ayant 5 à 10 attributs"
@@ -2776,6 +2668,9 @@ msgstr "objets avec le rôle donné dans une relation"
msgid "closed ways with an area of 100 m²"
msgstr "chemins fermé d’une superficie de 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr "chemins d’au moins 200m"
+
msgid "state"
msgstr "état"
@@ -4127,7 +4022,7 @@ msgid "Checks for errors in internet-related tags."
msgstr "Recherche d''erreurs dans les tags relatifs à internet."
msgid " URL cannot be converted to ASCII: {0}"
-msgstr ""
+msgstr " L''URL ne peut pas être convertie en ASCII: {0}"
msgid "''{0}'': {1}"
msgstr "''{0}'' : {1}"
@@ -4212,6 +4107,8 @@ msgid ""
"With the currently used mappaint style the style for inner way equals the "
"multipolygon style"
msgstr ""
+"Avec le style de coloriage courant, le style pour un chemin intérieur est le "
+"même que le style pour un polygone"
msgid "Style for outer way mismatches"
msgstr "Les styles des chemins extérieurs ne correspondent pas"
@@ -4220,9 +4117,11 @@ msgid ""
"With the currently used mappaint style(s) the style for outer way mismatches "
"polygon"
msgstr ""
+"Avec le style de coloriage courant, le style pour un chemin extérieur ne "
+"correspond pas au polygone"
msgid "Area style on outer way"
-msgstr ""
+msgstr "Style de la zone sur la partie externe du chemin"
msgid "Multipolygon is not closed"
msgstr "Le multipolygone n’est pas fermé"
@@ -4250,8 +4149,9 @@ msgstr ""
"Chercher les objets dont l’attribut ''name'' ne correspond pas à l’un des "
"attributs ''name:*''."
-msgid "A name:* translation is missing."
-msgstr "Le nom : * traduction est manquant"
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
+"Chemin manquant :*={0}. Ajoutez l’attribut avec le bon code de langage."
msgid "A name is missing, even though name:* exists."
msgstr "Une clé ’’name’’ est manquante, même si une clé ’’name: *’’ existe."
@@ -4344,6 +4244,8 @@ msgstr "Contrôle lʼexistence dʼerreurs dans les relations."
msgid ""
"Route scheme is unspecified. Add {0} ({1}=public_transport; {2}=legacy)"
msgstr ""
+"Le schéma d’itinéraire n’est pas indiqué. Préciser {0} "
+"({1}=public_transport; {2}=legacy)"
msgid "Relation type is unknown"
msgstr "Le type de relation est inconnu"
@@ -4352,17 +4254,19 @@ msgid "Relation is empty"
msgstr "La relation est vide"
msgid "Role member does not match expression {0} in template {1}"
-msgstr ""
+msgstr "Le rôle du membre ne satisfait pas la condition {0} du modèle {1}"
msgid ""
"Role member type {0} does not match accepted list of {1} in template {2}"
msgstr ""
+"Le type de rôle du membre {0} ne fait pas partie de la liste de {1} du "
+"modèle {2}"
msgid "<empty>"
msgstr "<vide>"
msgid "Role {0} unknown in templates {1}"
-msgstr ""
+msgstr "Le rôle {0} est inconnu parmi les modèles {1}"
msgid "Empty role type found when expecting one of {0}"
msgstr ""
@@ -4914,6 +4818,9 @@ msgstr "Affiche la version de JOSM et quitte"
msgid "Print debugging messages to console"
msgstr "Afficher les messages de debug à la console"
+msgid "Skip loading plugins"
+msgstr "Ignorer le chargement des greffons"
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr "Désactive l’accès aux ressources données, séparées par une virgule"
@@ -4922,25 +4829,25 @@ msgstr ""
"options disponibles en tant que fichiers de propriétés système pour Java"
msgid "/PATH/TO/JOSM/PREF "
-msgstr ""
+msgstr "/CHEMIN/VERS/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "Définir le répertoire des préférences"
msgid "/PATH/TO/JOSM/USERDATA"
-msgstr ""
+msgstr "/CHEMIN/VERS/JOSM/USERDATA"
msgid "Set the user data directory"
msgstr "Définir le répertoire des données de l’utilisateur"
msgid "/PATH/TO/JOSM/CACHE "
-msgstr ""
+msgstr "/CHEMIN/VERS/JOSM/CACHE "
msgid "Set the cache directory"
msgstr "Définir le répertoire du cache"
msgid "/PATH/TO/JOSM/HOMEDIR "
-msgstr ""
+msgstr "/CHEMIN/VERS/JOSM/HOMEDIR "
msgid ""
"Relocate all 3 directories to homedir. Cache directory will be in "
@@ -4951,6 +4858,8 @@ msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
"general one"
msgstr ""
+"-Djosm.home a une plus faible précédence, c’est-à-dire qu’un réglage "
+"spécifique surcharge le réglage général."
msgid ""
"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4978,6 +4887,9 @@ msgstr "Assurez-vous de charger des données si vous utilisez --selection."
msgid "Printing debugging messages to console"
msgstr "Ecrire les messages de débogage vers la console"
+msgid "Plugin loading skipped"
+msgstr "Le chargement des greffons a été ignoré"
+
msgid "Enabled detailed debug level (trace)"
msgstr "Niveau de débogage détaillé activé (trace)"
@@ -5345,10 +5257,10 @@ msgstr ""
"<i>zoom,x,y</i> ou <i>zoom;x;y</i> sont aussi valides.</html>"
msgid "Tile address:"
-msgstr "Adresse :"
+msgstr "Adresse de la dalle :"
msgid "Apply the tile address"
-msgstr "Valider l’adresse"
+msgstr "Valider l’adresse de la dalle"
msgid "Please enter a tile address"
msgstr "Veuillez entrer l’adresse d’une tuile"
@@ -6518,9 +6430,6 @@ msgstr "Lat/Lon"
msgid "East/North"
msgstr "Est/Nord"
-msgid "Ok"
-msgstr "Valider"
-
msgid "Please enter a GPS coordinates"
msgstr "Entrez des coordonnées GPS"
@@ -7460,8 +7369,18 @@ msgstr "Clé inutile: avant-plan"
msgid "Discardable key: background"
msgstr "Clé inutile: arrière-plan"
-msgid "<different>"
-msgstr "<différent>"
+msgid "{0} ''{1}''"
+msgstr "{0} ''{1}''"
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] "{0} différent"
+msgstr[1] "{0} différents"
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ", {0} non précisé"
+msgstr[1] ", {0} précisés"
msgid "Select objects for which to change tags."
msgstr "Sélectionner les objets dont les attributs sont à changer."
@@ -7478,6 +7397,12 @@ msgstr "Membre de"
msgid "Position"
msgstr "Position"
+msgid "<different>"
+msgstr "<différent>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Attributs : {0} / Appartenance : {1}"
@@ -7614,6 +7539,16 @@ msgstr "Fixer le nombre d’attributs récemment ajoutés"
msgid "Remember last used tags after a restart"
msgstr "Mémoriser les derniers attributs utilisés après un redémarrage"
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr "<code>Ctrl-1</code> pour appliquer la première suggestion"
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr "<code>Shift-Enter</code> pour ajouter sans fermer la fenêtre"
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
"Veuillez introduire le nombre d’attributs récemment ajoutés à afficher"
@@ -8174,6 +8109,8 @@ msgid ""
"<strong>{2}</strong> is enabled.<br>Please choose to either download OSM "
"data, or GPX data, or Notes, or all.</html>"
msgstr ""
+"html>Ni <strong>{0}</strong> ni <strong>{1}</strong> ni <strong>{2}</strong> "
+"ne sont cochés.<br>Cochez au moins l’une des cases.</html>"
msgid "Download referrers (parent relations)"
msgstr "Télécharger les référents (relations parentes)"
@@ -8417,18 +8354,21 @@ msgstr "Objet"
msgid "not present"
msgstr "absente"
-msgid "Changeset:"
-msgstr "Groupe de modifications :"
-
msgid "Changeset comment"
msgstr "Commentaire de groupe de modifications"
msgid "Changeset source"
msgstr "Source de groupe de modification"
+msgid "Imagery used"
+msgstr "Imagerie utilisée"
+
msgid "<b>Source</b>:"
msgstr "<b>Source</b> :"
+msgid "<b>Imagery</b>:"
+msgstr "<b>Imagerie</b> :"
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8440,6 +8380,9 @@ msgid ""
msgstr ""
"<html>Version <strong>{0}</strong> créée le <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr "Groupe de modifications"
+
msgid "Changeset info"
msgstr "Information sur le groupe de modifications"
@@ -9642,6 +9585,9 @@ msgstr "Echelle de pixel: {0}"
msgid "Best zoom: {0}"
msgstr "Meilleur zoom : {0}"
+msgid "Cache stats: {0}"
+msgstr "Statistiques du cache : {0}"
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "Calque TMS ({0}), téléchargement au zoom {1}"
@@ -9931,8 +9877,8 @@ msgstr[1] "{0} ont un attribut GPS."
msgid "{0} has updated GPS data."
msgid_plural "{0} have updated GPS data."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} a mis à jour des données GPS"
+msgstr[1] "{0} ont mis à jour des données GPS"
msgid "Delete image file from disk"
msgstr "Supprimer le fichier image du disque"
@@ -10325,8 +10271,6 @@ msgid ""
"Detected deprecated ''{0}'' in ''{1}'' which will be removed shortly. Use "
"''{2}'' instead."
msgstr ""
-"Il a été détecté une dépréciation de ''{0}'' en ''{1}'' qui va être retiré "
-"bientôt. Utiliser ''{2}'' à la place."
msgid "Illegal dash pattern, values must be positive"
msgstr "Le motif est erroné, les valeurs doivent être positives"
@@ -11841,6 +11785,12 @@ msgstr "Ajouter au sélecteur de la carte glissante : "
msgid "Tile cache directory: "
msgstr "Répertoire du cache : "
+msgid "Maximum concurrent downloads: "
+msgstr "Nombre maximum de téléchargements parallèles : "
+
+msgid "Maximum elements in disk cache: "
+msgstr "Nombre maximum d’éléments du cache sur le disque : "
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12241,7 +12191,7 @@ msgid "Datum name"
msgstr "Nom du datum"
msgid "3 or 7 term datum transform parameters"
-msgstr ""
+msgstr "Transformation du référentiel avec 3 ou 7 termes"
msgid "NTv2 grid file"
msgstr "Grille de conversion NTv2"
@@ -12414,10 +12364,14 @@ msgstr "Désinstalle…"
msgid "Install JOSM localhost certificate to system/browser root keystores"
msgstr ""
+"Installer le certificat local de JOSM dans le magasin de certificat racine "
+"du système/navigateur"
msgid ""
"Uninstall JOSM localhost certificate from system/browser root keystores"
msgstr ""
+"Désinstaller le certificat local de JOSM dans le magasin de certificat "
+"racine du système/navigateur"
msgid "Certificate:"
msgstr "Certificat :"
@@ -12429,7 +12383,7 @@ msgid "Certificate is already installed. Nothing to do."
msgstr "Le certificat est déjà installé. Il n’y a rien d’autre à faire."
msgid "Removing certificate {0} from root keystore."
-msgstr ""
+msgstr "Suppression du certificat {0} du trousseau de clé racine."
msgid "Certificate has been successfully uninstalled."
msgstr "Le certificat a été correctement désinstallé."
@@ -12542,6 +12496,16 @@ msgstr "Fréquence de vérification des nouveaux messages"
msgid "Check interval (minutes):"
msgstr "Intervalle de vérification (minutes) :"
+msgid "Max age for closed notes (days):"
+msgstr "Âge maximal pour les notes fermées (jours) :"
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+"Spécifie le nombre de jours qu’une note a besoin pour être fermée pour ne "
+"plus être téléchargée."
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
"Impossible de retrouver lʼautorisation dʼaccès OAuth depuis le gestionnaire "
@@ -13237,6 +13201,8 @@ msgstr ""
msgid "Unexpected format for port number in preference ''{0}''. Got ''{1}''."
msgstr ""
+"Format inattendu pour le numéro de port dans la préférence'' {0}''. Est "
+"obtenu '' {1}''."
msgid "The proxy will not be used."
msgstr "Le proxy ne sera pas utilisé"
@@ -13578,6 +13544,7 @@ msgstr "L''envoi de notes a échoué"
msgid "Error parsing note response from server"
msgstr ""
+"Erreur de parsing lors de la récupération de la la note depuis le serveur"
msgid "Error encoding string: {0}"
msgstr "Erreur d''encodage de la chaîne: {0}"
@@ -15143,6 +15110,8 @@ msgid ""
"A previous version of JOSM has installed a custom certificate in order to "
"provide HTTPS support for Remote Control:"
msgstr ""
+"Un certificat personnalisé a été installé par une version antérieure de JOSM "
+"afin de permettre des connexions HTTPS pour la télécommande:"
msgid ""
"It appears it could be an important <b>security risk</b>.<br><br>You are now "
@@ -15161,7 +15130,7 @@ msgid "Unable to remove insecure certificate from keystore: {0}"
msgstr ""
msgid "JOSM localhost certificate found in {0} keystore: {1}"
-msgstr ""
+msgstr "Certificat local JOSM trouvé dans {0}, magasin {1}"
msgid ""
"Remote Control is configured to provide HTTPS support.<br>This requires to "
@@ -15176,7 +15145,7 @@ msgid "HTTPS support in Remote Control"
msgstr "Support du HTTPS dans l’Activation à Distance"
msgid "Adding JOSM localhost certificate to {0} keystore"
-msgstr ""
+msgstr "Ajout du certificat JOSM local dans le magasin {0}"
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -15653,10 +15622,10 @@ msgid "OpenPT Map (overlay)"
msgstr ""
msgid "Strava cycling heatmap"
-msgstr ""
+msgstr "Carte de chaleur élo de Strava"
msgid "Strava running heatmap"
-msgstr ""
+msgstr "Carte de chaleur piéton de Strava"
msgid "Locator Overlay"
msgstr ""
@@ -15665,25 +15634,25 @@ msgid "QA No Address"
msgstr ""
msgid "Waymarked Trails: Hiking"
-msgstr ""
+msgstr "Waymarked Trails : Randonnée"
msgid "Waymarked Trails: Cycling"
-msgstr ""
+msgstr "Waymarked Trails : Vélo"
msgid "Waymarked Trails: MTB"
-msgstr ""
+msgstr "Waymarked Trails : VTT"
msgid "Waymarked Trails: Skating"
-msgstr ""
+msgstr "Waymarked Trails : Roller"
msgid "Waymarked Trails: Horse Riding"
-msgstr ""
+msgstr "Waymarked Trails : À cheval"
msgid "Waymarked Trails: Winter Sports"
-msgstr ""
+msgstr "Waymarked Trails: Sports d’hiver"
msgid "OSM Inspector: Geometry"
-msgstr ""
+msgstr "OSM Inspector : Géométrie"
msgid "OSM Inspector: Tagging"
msgstr ""
@@ -15692,19 +15661,19 @@ msgid "OSM Inspector: Places"
msgstr ""
msgid "OSM Inspector: Highways"
-msgstr ""
+msgstr "OSM Inspector : Routes"
msgid "OSM Inspector: Multipolygon"
-msgstr ""
+msgstr "OSM Inspector : Multipolygone"
msgid "OSM Inspector: Routing"
-msgstr ""
+msgstr "OSM Inspector : Routage"
msgid "OSM Inspector: Addresses"
-msgstr ""
+msgstr "OSM Inspector : Adresses"
msgid "OSM Inspector: Boundaries (EU)"
-msgstr ""
+msgstr "OSM Inspector : Frontières (Europe)"
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI noir et blanc 2.5 m"
@@ -15715,6 +15684,9 @@ msgstr ""
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz : Basiskarte (carte de base)"
@@ -15818,6 +15790,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr "BANO"
+
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
@@ -15949,6 +15924,9 @@ msgstr "NRW-Atlas : Carte topographique 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Imagerie drone (Haïti)"
@@ -16571,14 +16549,7 @@ msgid "OS Town Plans, Wigtown 1894 (NLS)"
msgstr ""
msgid "Landsat 233055"
-msgstr ""
-
-msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"Permet de modifier les informations de trafic et de les exporter vers le "
-"simulateur de mobilité urbaine SUMO"
+msgstr "Landsat 233055"
msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -16779,6 +16750,9 @@ msgid ""
"Provides Java Native Access (JNA) library. Not meant to be installed "
"directly by users, but rather as a dependency for other plugins."
msgstr ""
+"Fournit la bibliothèque Java Native Access (JNA). N’a pas vocation à être "
+"directement installé par les utilisateurs, mais plutôt comme dépendance "
+"d’autres greffons."
msgid ""
"Provides Java Topology Suite (JTS) library and related utilities. Not meant "
@@ -16987,6 +16961,13 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "Fonctions d''édition pour OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Permet de modifier les informations de trafic et de les exporter vers le "
+"simulateur de mobilité urbaine SUMO"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Permet d’ajouter des marqueurs/points sur les positions GPS."
@@ -17148,31 +17129,31 @@ msgid "Smoothness"
msgstr ""
msgid "excellent"
-msgstr ""
+msgstr "excellent"
msgid "Thin Rollers: rollerblade, skateboard"
msgstr ""
msgid "good"
-msgstr ""
+msgstr "bonne"
msgid "Thin Wheels: racing bike"
msgstr ""
msgid "intermediate"
-msgstr ""
+msgstr "moyenne"
msgid "Wheels: city bike, wheelchair, scooter"
-msgstr ""
+msgstr "Véhicules à roues : vélo de ville, chaise roulante, trotinette"
msgid "bad"
-msgstr ""
+msgstr "mauvaise"
msgid "Robust Wheels: trekking bike, car, rickshaw"
-msgstr ""
+msgstr "Véhicule à grande roues : VTT, voiture, rickshaw"
msgid "very_bad"
-msgstr ""
+msgstr "Très mauvaise"
msgid "High Clearance: light duty off-road vehicle"
msgstr ""
@@ -17181,19 +17162,20 @@ msgid "horrible"
msgstr ""
msgid "Off-Road: heavy duty off-road vehicle"
-msgstr ""
+msgstr "Tout terrain : véhicules tout terrain spécialisés"
msgid "very_horrible"
msgstr ""
msgid "Specialized off-road: tractor, ATV"
msgstr ""
+"Véhicules tout terrais spécialisés : tracteurs, véhicules tout terrains"
msgid "impassable"
-msgstr ""
+msgstr "impassable"
msgid "No wheeled vehicle"
-msgstr ""
+msgstr "Aucun véhicule à roue"
msgctxt "riding"
msgid "pitch"
@@ -17525,7 +17507,7 @@ msgstr "croquet"
msgctxt "sport"
msgid "cycling"
-msgstr "Cyclisme"
+msgstr "cyclisme"
msgctxt "sport"
msgid "dog_racing"
@@ -17581,7 +17563,7 @@ msgstr "rugby à XV"
msgctxt "sport"
msgid "running"
-msgstr ""
+msgstr "Course à pied"
msgctxt "sport"
msgid "shooting"
@@ -17717,15 +17699,34 @@ msgstr "Vélo"
msgid "deciduous"
msgstr "feuillus"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr "persistant"
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr "semi-caduc"
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr "semi-persistant"
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahaïsme"
@@ -17932,19 +17933,19 @@ msgid "Water access rules:"
msgstr ""
msgid "Ship"
-msgstr ""
+msgstr "Navire"
msgid "designated"
msgstr "signalé"
msgid "Boat"
-msgstr ""
+msgstr "Bateau"
msgid "Motorboat"
-msgstr ""
+msgstr "Bateau à moteur"
msgid "Canoe"
-msgstr ""
+msgstr "Canoé"
msgid "Streets"
msgstr "Routes"
@@ -18060,6 +18061,8 @@ msgid ""
"Emergency lane beside long descending slopes for trucks and other vehicles "
"to stop safely after brake failure."
msgstr ""
+"Voie de détresse pour camion et autres véhicules en cas de perte du système "
+"de freinage"
msgid "Road (Unknown Type)"
msgstr "Route (type inconnu)"
@@ -18069,7 +18072,7 @@ msgstr "Route en construction"
msgctxt "Highway"
msgid "motorway"
-msgstr ""
+msgstr "Autoroute"
msgctxt "Highway"
msgid "motorway_link"
@@ -18085,27 +18088,27 @@ msgstr ""
msgctxt "Highway"
msgid "primary"
-msgstr ""
+msgstr "primaire"
msgctxt "Highway"
msgid "primary_link"
-msgstr ""
+msgstr "Liaison primaire"
msgctxt "Highway"
msgid "secondary"
-msgstr ""
+msgstr "secondaire"
msgctxt "Highway"
msgid "secondary_link"
-msgstr ""
+msgstr "Liaison secondaire"
msgctxt "Highway"
msgid "tertiary"
-msgstr ""
+msgstr "tertiaire"
msgctxt "Highway"
msgid "tertiary_link"
-msgstr ""
+msgstr "Liaison tertiaire"
msgctxt "Highway"
msgid "bus_guideway"
@@ -18113,7 +18116,7 @@ msgstr ""
msgctxt "Highway"
msgid "bridleway"
-msgstr ""
+msgstr "piste équestre"
msgctxt "Highway"
msgid "living_street"
@@ -18121,15 +18124,15 @@ msgstr ""
msgctxt "Highway"
msgid "pedestrian"
-msgstr ""
+msgstr "piétonne"
msgctxt "Highway"
msgid "track"
-msgstr ""
+msgstr "piste"
msgctxt "Highway"
msgid "footway"
-msgstr ""
+msgstr "chemin"
msgctxt "Highway"
msgid "steps"
@@ -18151,6 +18154,8 @@ msgid ""
"Some road types already imply some access restrictions which should not be "
"set again."
msgstr ""
+"Certains type de routes impliquent des restrictions d’accès qui ne doivent "
+"pas être positionnées à nouveau"
msgid "No exit (cul-de-sac)"
msgstr "Sans issue"
@@ -18234,7 +18239,7 @@ msgstr "Giratoire"
msgctxt "Highway"
msgid "construction"
-msgstr ""
+msgstr "construction"
msgid "Ford"
msgstr "Gué"
@@ -18417,10 +18422,10 @@ msgid "Pedestrians"
msgstr "Piétons"
msgid "Segregated Foot- and Cycleway"
-msgstr "Chemin séparé piétions et cyclistes"
+msgstr "Chemin séparé piétons et cyclistes"
msgid "Combined Foot- and Cycleway"
-msgstr "Chemin partagé piétions et cyclistes"
+msgstr "Chemin partagé piétons et cyclistes"
msgid "Dedicated Footway"
msgstr "Chemin pour piétons"
@@ -18435,7 +18440,7 @@ msgid "Ramp"
msgstr "Rampe"
msgid "Stroller ramp"
-msgstr ""
+msgstr "Rampe pour poussette"
msgid "Bicycle ramp"
msgstr "Rampe pour vélo"
@@ -18456,13 +18461,13 @@ msgid "Handrail"
msgstr "Rambarde"
msgid "Left handrail"
-msgstr ""
+msgstr "Rampe à gauche"
msgid "Center handrail"
-msgstr ""
+msgstr "Rampe centrale"
msgid "Right handrail"
-msgstr ""
+msgstr "Rampe à droite"
msgid "Waypoints"
msgstr "Balises"
@@ -18477,7 +18482,7 @@ msgid "Exit to"
msgstr "Sortie vers"
msgid "Services"
-msgstr "Aire de repos"
+msgstr "Aire de service"
msgid "Toilets"
msgstr "Toilettes publiques"
@@ -18609,16 +18614,18 @@ msgid "Speed Camera"
msgstr "Radar fixe"
msgid "Traffic Mirror"
-msgstr ""
+msgstr "Miroir de circulation"
msgctxt "junction=yes"
msgid "Named Junction"
-msgstr ""
+msgstr "Jonction routière"
msgid ""
"Used in some countries for a named road junction who’s name serves for local "
"orientation."
msgstr ""
+"Utilisé dans certains pays pour des jonctions routières dont le nom sert "
+"pour l’orientation dans la zone locale"
msgid "Elevator"
msgstr "Ascenseur"
@@ -18844,13 +18851,13 @@ msgid "Breakwater"
msgstr "Digue"
msgid "Culvert"
-msgstr "Fossé"
+msgstr "Buse"
msgid "Basin"
msgstr "Bassin"
msgid "Reservoir"
-msgstr "Réservoir (déprécié)"
+msgstr "Réservoir"
msgid "Covered Reservoir"
msgstr "Réservoir couvert"
@@ -18902,6 +18909,7 @@ msgstr "Zone humide"
msgid "Waterlogged area, either permanently or seasonally with vegetation."
msgstr ""
+"Surface détrempée, de façon permanente ou saisonnière avec végétation"
msgid "swamp"
msgstr "marécage"
@@ -18995,6 +19003,12 @@ msgstr "Itinéraire de ferry"
msgid "Marina"
msgstr "Marina"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "public"
+
msgid "Pier"
msgstr "Jetée, ponton"
@@ -19157,6 +19171,8 @@ msgid ""
"drag_lift (general type - use only if exact type (see values below) is "
"unknown)"
msgstr ""
+"téléski (valeur générique - à utiliser quand le modèle exact est inconnu, "
+"voir ci-dessous)"
msgid "t-bar"
msgstr "téléski à enrouleur (pioche double)"
@@ -19367,7 +19383,7 @@ msgid "1/50 mix (mofa/moped)"
msgstr "Mélange 1/50 (cyclomoteur)"
msgid "Fuel cards:"
-msgstr ""
+msgstr "Carte essence:"
msgid "DKV"
msgstr "DKV"
@@ -19393,6 +19409,12 @@ msgstr "Lavage"
msgid "Car Dealer"
msgstr "Concessionnaire auto"
+msgid "Second hand"
+msgstr "Seconde main, occasion"
+
+msgid "only"
+msgstr "uniquement"
+
msgid "Repair"
msgstr "Garagiste"
@@ -19405,12 +19427,6 @@ msgstr "Pneus"
msgid "Rental"
msgstr "Location"
-msgid "Second hand"
-msgstr "Seconde main, occasion"
-
-msgid "only"
-msgstr "uniquement"
-
msgid "Sharing"
msgstr "Autopartage"
@@ -19503,10 +19519,10 @@ msgid "Bicycles are washed (for a fee)"
msgstr "Lavage"
msgid "Public Bicycle Repair Station"
-msgstr ""
+msgstr "Point de réparation publique pour vélo"
msgid "Chain tool"
-msgstr ""
+msgstr "Outil pour chaîne"
msgid "Public Transport"
msgstr "Transports publics"
@@ -19621,6 +19637,9 @@ msgstr "Arrêt"
msgid "Platform"
msgstr "Plateforme"
+msgid "Subway Entrance"
+msgstr "Bouche de métro"
+
msgid "Station or amenities"
msgstr "Gare ou infrastructures"
@@ -19676,9 +19695,6 @@ msgstr "Gare"
msgid "Building"
msgstr "Bâtiment"
-msgid "Subway Entrance"
-msgstr "Bouche de métro"
-
msgid "Ticket Machine"
msgstr "Billetterie automatique"
@@ -19686,10 +19702,10 @@ msgid "Reference Number"
msgstr "Numéro de référence"
msgid "Public Transport (Legacy)"
-msgstr ""
+msgstr "Transports publics (obsolète)"
msgid "Public transport route (Legacy)"
-msgstr ""
+msgstr "Itinéraire de transport public (obsolète)"
msgid "forward segment"
msgstr "route (sens aller uniquement)"
@@ -19764,7 +19780,7 @@ msgid "Apron"
msgstr "Aire de stationnement"
msgid "Plane Parking Position"
-msgstr ""
+msgstr "Aire de stationnement d’avion"
msgid "Hangar"
msgstr "Hangar"
@@ -19805,8 +19821,8 @@ msgstr "Étoiles"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
-msgstr "Chambre d''hôtes/Gîte"
+msgid "Guest House/Bed & Breakfast"
+msgstr "Chambre d’hôtes/Bed & Breakfast"
msgid "Chalet"
msgstr "Chalet"
@@ -19815,7 +19831,7 @@ msgid "Hostel"
msgstr "Auberge de jeunesse"
msgid "Alpine Hut"
-msgstr "Refuge"
+msgstr "Refuge gardé"
msgid "Caravan Site/RV Park"
msgstr "Aire de service et/ou stationnement pour Camping-car"
@@ -19994,7 +20010,7 @@ msgid "Hiking"
msgstr "randonnée"
msgid "Cycling"
-msgstr "cyclisme"
+msgstr "Cyclisme"
msgid "Mountainbiking"
msgstr "VTT"
@@ -20417,7 +20433,7 @@ msgid "Dentist"
msgstr "Cabinet dentaire"
msgid "Nursing Home"
-msgstr "Maison de retraite"
+msgstr "Maison de soins"
msgid "Retirement Home"
msgstr "Maison de retraite"
@@ -20429,7 +20445,7 @@ msgid "Dispensing"
msgstr "Délivre des médicaments"
msgid "Baby Hatch/Safe Haven"
-msgstr ""
+msgstr "Tour d’abandon"
msgid "Emergency Access Point"
msgstr "Point d’accès d’urgence"
@@ -20453,10 +20469,7 @@ msgid "Toilets/Restrooms"
msgstr "Toilettes"
msgid "Access rights"
-msgstr "Payant"
-
-msgid "public"
-msgstr "public"
+msgstr "Droits d’accès"
msgid "seasonal"
msgstr "saisonnier"
@@ -20498,13 +20511,13 @@ msgid "Collection times"
msgstr "Heures de collecte"
msgid "Mo-Sa 09:00"
-msgstr ""
+msgstr "Lu-Sa 09:00"
msgid "Mo-Fr 17:30; Sa 12:00"
-msgstr ""
+msgstr "Lu-Ve 17:30; Sa 12:00"
msgid "Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30"
-msgstr ""
+msgstr "Lu-Ve 15:00,19:00; Sa 15:10; Dim 10:30"
msgid "Drive through"
msgstr "Drive"
@@ -20529,7 +20542,7 @@ msgid "Internet Access"
msgstr "Accès Internet"
msgid "Automated Defibrillator"
-msgstr "Défibrilateur automatique"
+msgstr "Défibrillateur automatique"
msgid "Located inside a building?"
msgstr "Situé à lʼintérieur dʼun batiment?"
@@ -20626,10 +20639,22 @@ msgid "centre"
msgstr "centre de tri"
msgid "Waste Basket/Trash Can"
-msgstr "poubelle"
+msgstr "Poubelle"
msgid "Waste Disposal/Dumpster"
-msgstr "benne à ordures"
+msgstr "Benne à ordures"
+
+msgid "Sanitary Dump Station"
+msgstr "Station de vidange de toilettes"
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr "Horaires de fonctionnement"
msgid "Backrest"
msgstr "Dossier"
@@ -20745,7 +20770,7 @@ msgid "Advertising Column"
msgstr "Colonne Morris"
msgid "Billboard"
-msgstr ""
+msgstr "Panneau dʼaffichage"
msgid "Sports"
msgstr "Sports"
@@ -20763,13 +20788,13 @@ msgid "Pitch"
msgstr "Terrain de sport"
msgid "artificial_turf"
-msgstr ""
+msgstr "gazon artificiel"
msgid "decoturf"
-msgstr ""
+msgstr "decoturf - surface artificielle dure -"
msgid "tartan"
-msgstr ""
+msgstr "piste d’athlétisme"
msgid "Racetrack"
msgstr "Circuit"
@@ -20800,16 +20825,16 @@ msgid "track"
msgstr "piste"
msgid "Nine-pin Bowling"
-msgstr ""
+msgstr "Bowling neuf quilles"
msgid "Ten-pin Bowling"
-msgstr ""
+msgstr "Bowling dix quilles"
msgid "Archery"
msgstr "Tir à l’arc"
msgid "Track and Field Athletics"
-msgstr "Piste d''athlétisme"
+msgstr "Piste d’athlétisme"
msgid "Climbing"
msgstr "Escalade"
@@ -20879,10 +20904,10 @@ msgid "skitour"
msgstr "ski de randonnée"
msgid "sled"
-msgstr ""
+msgstr "luge"
msgid "sleigh"
-msgstr ""
+msgstr "traineau"
msgid "snow_park"
msgstr "snowpark"
@@ -20904,7 +20929,7 @@ msgstr "Intermediaire"
msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "Perfexionné"
+msgstr "difficile"
msgctxt "piste:difficulty"
msgid "expert"
@@ -20987,7 +21012,7 @@ msgid "Basketball"
msgstr "Basketball"
msgid "Volleyball"
-msgstr "Volley-ball"
+msgstr "Volleyball"
msgid "Beach Volleyball"
msgstr "Volleyball de plage"
@@ -21094,7 +21119,7 @@ msgstr "hangar agricole"
msgctxt "building"
msgid "farm_auxiliary"
-msgstr ""
+msgstr "Dépendance de ferme"
msgctxt "building"
msgid "transportation"
@@ -21138,7 +21163,7 @@ msgstr "construction"
msgctxt "building"
msgid "Levels"
-msgstr ""
+msgstr "Niveaux"
msgid "Residential Building"
msgstr "Bâtiment résidentiel"
@@ -21176,7 +21201,7 @@ msgid "farm"
msgstr "Batiment agricole"
msgid "Building part"
-msgstr ""
+msgstr "Annexe de bâtiment"
msgctxt "building"
msgid "Skipped Levels"
@@ -21378,9 +21403,6 @@ msgstr "Phare"
msgid "Street Lamp"
msgstr "Lampadaire"
-msgid "Operation times"
-msgstr "Horaires de fonctionnement"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Lu-Ve 22:00-05:00"
@@ -21559,10 +21581,10 @@ msgid "simple-suspension"
msgstr "pont de singe"
msgid "humpback"
-msgstr ""
+msgstr "en dos d’âne"
msgid "Movable Bridge"
-msgstr "Pont Mobile"
+msgstr "Pont mobile"
msgid "bascule"
msgstr "pont basculant"
@@ -21583,7 +21605,7 @@ msgid "transporter"
msgstr "pont transbordeur"
msgid "Bridge Support"
-msgstr ""
+msgstr "Pilier de pont"
msgid "pier"
msgstr ""
@@ -21670,7 +21692,7 @@ msgid "combined_cycle"
msgstr "à cycle combiné"
msgid "Oil Power Generator"
-msgstr ""
+msgstr "Centrale au fioul"
msgid "Diesel Power Generator"
msgstr "Centrale au diesel"
@@ -21770,7 +21792,7 @@ msgid "thermal"
msgstr ""
msgid "Waste Power Generator"
-msgstr ""
+msgstr "Incinérateur de déchets"
msgctxt "generator method"
msgid "pyrolysis"
@@ -21839,7 +21861,7 @@ msgid "Wave Energy Converter"
msgstr "Convertisseur de l’énergie des vagues"
msgid "Osmotic Power Generator"
-msgstr ""
+msgstr "Centrale osmotique"
msgid "Geothermal Power Generator"
msgstr "Centrale géothermique"
@@ -21858,7 +21880,7 @@ msgstr "Type de sous-station"
msgctxt "power"
msgid "transmission"
-msgstr ""
+msgstr "relais"
msgctxt "power"
msgid "distribution"
@@ -21925,7 +21947,7 @@ msgstr "automatique"
msgctxt "power"
msgid "phase_angle_regulator"
-msgstr ""
+msgstr "régulateur d’angle de phase"
msgctxt "power"
msgid "yes"
@@ -21945,13 +21967,13 @@ msgstr ""
"détaillée avec des barres et des baies n''est pas possible!)"
msgid "Power Busbar"
-msgstr "Barres de Puissance"
+msgstr "Barre omnibus"
msgid "Power Bay"
msgstr "Baie d''Alimentation"
msgid "Power Switch"
-msgstr "Intérrupteur"
+msgstr "Interrupteur"
msgid "Power Converter"
msgstr "Convertisseur"
@@ -22272,7 +22294,7 @@ msgid "Used for data communications"
msgstr "Utilisé pour la communication de données"
msgid "Power Cable"
-msgstr ""
+msgstr "Câble électrique"
msgctxt "power cable"
msgid "underground"
@@ -22554,7 +22576,7 @@ msgid "Hearing Aids"
msgstr "Audioprothésiste"
msgid "Medical Supply"
-msgstr ""
+msgstr "Matériel médical"
msgid "Jewellery"
msgstr "Bijouterie"
@@ -22934,7 +22956,7 @@ msgid "A mountain or hill ridge."
msgstr "La crête d''un massif montagneux."
msgid "Valley"
-msgstr ""
+msgstr "Vallée"
msgid "A low area between hills."
msgstr ""
@@ -23174,7 +23196,7 @@ msgid "Garages"
msgstr "Garages"
msgid "Railway Land"
-msgstr "Une zone ferroviaire"
+msgstr "Zone ferroviaire"
msgid "Military"
msgstr "Terrain militaire"
@@ -23472,7 +23494,7 @@ msgstr ""
msgctxt "the tag note=*"
msgid "Note"
-msgstr ""
+msgstr "Note"
msgctxt "note=*"
msgid "An important hint for other mappers (not for the end user)."
@@ -23665,7 +23687,7 @@ msgid "natural"
msgstr "nature"
msgid "Piste Route"
-msgstr ""
+msgstr "Itinéraire de piste"
msgid "link segment"
msgstr "segment de liaison"
@@ -23686,7 +23708,7 @@ msgid "alpine"
msgstr "alpin"
msgid "Detour Route"
-msgstr ""
+msgstr "Itinéraire de déviation"
msgid "Destination"
msgstr "Destination"
@@ -23698,7 +23720,7 @@ msgid "fork node for alternative routes"
msgstr ""
msgid "Power Route"
-msgstr ""
+msgstr "Itinéraire d’électricité"
msgid "Railway Route"
msgstr "Itinéraire ferroviaire"
@@ -23764,7 +23786,7 @@ msgid "position of sign"
msgstr "position du signe"
msgid "Waterway"
-msgstr "Cours d’’eau"
+msgstr "Cours d’eau"
msgid "Subtype of waterway (largest one of members)"
msgstr "Type de cours d’’eau (le plus gros de ses membres)"
@@ -23955,6 +23977,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} sur un nœud. Devrait être employé sur un chemin."
@@ -24127,36 +24159,6 @@ msgstr "Afficher les étiquettes de rues (à zoom élevé)"
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr "Export OSM"
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr "Exporter"
-
-msgid "Port:"
-msgstr "Port :"
-
-msgid "refresh the port list"
-msgstr "Rafraichir la liste des ports"
-
-msgid "Configure"
-msgstr "Configurer"
-
-msgid "Connection Error."
-msgstr "Erreur de connexion"
-
-msgid "configure the connected DG100"
-msgstr "configurer le DG100 connecté"
-
-msgid "delete data after import"
-msgstr "supprimer les données après l’importation"
-
msgid "Columbus V-900 CSV Files"
msgstr "Fichiers CSV de Columbus V-900"
@@ -25421,6 +25423,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Nom de la rue :"
@@ -25475,6 +25483,34 @@ msgstr "Pointez sur le coin opposé du bâtiment"
msgid "Set width of the building"
msgstr "Saisissez la largeur du bâtiment"
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr "sur le polygone"
@@ -26138,7 +26174,7 @@ msgid "Conflation"
msgstr "Conflation"
msgid "Activates the conflation plugin"
-msgstr ""
+msgstr "Activer le plugin Conflation"
msgid "Matches"
msgstr ""
@@ -26158,6 +26194,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "Configurer"
+
msgid "Configure conflation options"
msgstr ""
@@ -26479,9 +26518,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr "Le format de données est inconnu"
+msgid "Port:"
+msgstr "Port :"
+
+msgid "refresh the port list"
+msgstr "Rafraichir la liste des ports"
+
msgid "Configure Device"
msgstr "Configurer le périphérique"
+msgid "Connection Error."
+msgstr "Erreur de connexion"
+
+msgid "configure the connected DG100"
+msgstr "configurer le DG100 connecté"
+
+msgid "delete data after import"
+msgstr "supprimer les données après l’importation"
+
msgid "Importing data from device."
msgstr "Importation des données depuis le périphérique"
@@ -27590,6 +27644,9 @@ msgstr "Mapillary"
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr "Exporter"
+
msgid "Measured values"
msgstr "Valeurs mesurées"
@@ -29697,7 +29754,7 @@ msgid "Save SDS file"
msgstr "Sauvegarde du fichier SDS"
msgid "No object selected"
-msgstr ""
+msgstr "Pas d’objet sélectionné"
msgid "SeaChart Editor"
msgstr ""
@@ -29706,10 +29763,10 @@ msgid "Seamark Inspector"
msgstr ""
msgid "Select only one object"
-msgstr ""
+msgstr "Sélectionner un seul objet"
msgid "Select a map object"
-msgstr ""
+msgstr "Sélectionner un objet cartographique"
msgid "Simplify Area"
msgstr "Simplifier la zone"
@@ -29733,7 +29790,7 @@ msgid "Delete nodes outside of data regions?"
msgstr "Supprimer les nœuds situés en dehors des zones de données ?"
msgid "average nearby nodes"
-msgstr ""
+msgstr "moyenner les nœuds environnants"
msgid ""
"Node of the way (area) is removed if all of <u>Angle Weight</u>, <u>Area "
@@ -29774,6 +29831,15 @@ msgstr "Seuil de fusion des nœuds voisins"
msgid "SeaMap Editor"
msgstr "Éditeur de carte maritime"
+msgid "OSM Export"
+msgstr "Export OSM"
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr "Export SUMO"
+
msgid "AutoSave LiveData"
msgstr "Sauvegarde automatique des données en direct"
@@ -29899,7 +29965,7 @@ msgid "create an associatedStreet relation"
msgstr "Créer une relation associatedStreet"
msgid "keep outline way"
-msgstr ""
+msgstr "conserver le chemin extérieur"
msgid "Street name: "
msgstr "Nom de la rue : "
@@ -30010,7 +30076,7 @@ msgstr ""
"résultats, prenez comme mise à jour la version {0}."
msgid "No set of parameter is active!"
-msgstr ""
+msgstr "Aucun jeu de paramètres activé !"
msgid "Select parameter"
msgstr "Sélection du paramètre"
@@ -30061,7 +30127,7 @@ msgid "Select predefined parameter"
msgstr "Sélectionner les paramètres prédéfinis"
msgid "Modify list of parameter for server request."
-msgstr ""
+msgstr "Modifier la liste des paramètre pour la requête serveur."
msgid "Parameter:"
msgstr "Paramètre :"
@@ -30071,6 +30137,9 @@ msgid ""
"If you don''t have the server, please download it from\n"
"{0}."
msgstr ""
+"Tracer2Server n’est pas en cours d’exécution. Merci de démarrer le serveur.\n"
+"Si vous ne disposez pas du serveur, télécharger le depuis\n"
+"{0}."
msgid "Tracer2Server hasn''t found anything."
msgstr "Tracer2Server n''a rien trouvé."
@@ -31133,6 +31202,8 @@ msgid ""
"The selected way is not a split way, please select split points or split way "
"too."
msgstr ""
+"Le chemin sélectionné n’est pas un chemin découpé, veuillez sélectionner "
+"également les points ou les chemins où découper."
msgid "The selected nodes can not be consecutive nodes in the object."
msgstr ""
@@ -31351,7 +31422,7 @@ msgid "Duplicate tags from the first"
msgstr "Dupliquer les balise à partir du premier"
msgid "Set tags for multiple objects"
-msgstr ""
+msgstr "Ajouter des tags pour plusieurs objets"
msgid "Delete from history"
msgstr "Supprimer à partir de l’historique"
@@ -31413,6 +31484,8 @@ msgstr ""
msgid "Exceeded iteration limit for robust method, using simpler method."
msgstr ""
+"Limite d’itérations de la méthode robuste atteinte, utilisation de la "
+"méthode simple"
msgid "Replace geometry for way {0}"
msgstr "Remplacer la géométrie du chemin {0}"
diff --git a/i18n/po/gl.po b/i18n/po/gl.po
index 08759ad..a1d26d4 100644
--- a/i18n/po/gl.po
+++ b/i18n/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2015-02-02 23:45+0000\n"
"Last-Translator: Adrián Chaves Fernández <adriyetichaves at gmail.com>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:42+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: gl\n"
"X-Poedit-Language: Galician\n"
@@ -467,9 +467,6 @@ msgstr "Alternar o panel de diálogos."
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Alternar o panel de diálogos, maximizar a vista do mapa."
-msgid "Distribute Nodes"
-msgstr "Distribuír nodos"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Distribuír os nodos seleccionados de xeito equidistante ao longo dunha liña."
@@ -477,6 +474,12 @@ msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Estanse a ignorar {0} nodos con coordenadas nulas"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Descargar de OSM…"
@@ -493,6 +496,9 @@ msgstr ""
msgid "Download data"
msgstr "Descargar data"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Descargar obxecto…"
@@ -1044,6 +1050,12 @@ msgstr "Pecha o diálogo e cancela a descarga"
msgid "Download Data"
msgstr "Descargar datos"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Ok"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1852,6 +1864,28 @@ msgstr ""
msgid "Notes"
msgstr "Anotacións"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1861,6 +1895,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "Descargar OSM"
@@ -2459,142 +2496,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Expresión de procura inválida"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr "Elementos especiais"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - todos os obxectos cambiados"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - todos os obxectos seleccionados"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - todos os obxectos incompletos"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - todos os obxectos sen etiquetar"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>expresión</i></b> - todos os fillos de obxectos que coincidan "
-"coa expresión"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - todos os pais de obxectos que coincidan coa "
-"expresión"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Usar <b>|</b> ou <b>OR</b> para combinar co operador OU lóxico"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Use <b>\"</b> para poñer entre comiñas as operacións (por exemplo, se unha "
-"chave contén <b>:</b>)."
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Cando os caracteres <b>\"</b> e <b>\\</b> van entre comiñas necesitan ir "
-"precedidos por <b>\\</b> (por exemplo, <b>\\\"</b> e <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Usar <b>(</b> e <b>)</b> para agrupar expresións"
-
msgid "basic examples"
msgstr ""
@@ -2634,6 +2535,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2649,12 +2556,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2691,7 +2592,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2703,6 +2609,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -4087,8 +3996,8 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
-msgstr "O nome:* non se atopa a tradución."
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr ""
@@ -4732,6 +4641,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4796,6 +4708,9 @@ msgstr "Asegurate de que cargas algún dato se usas --selección."
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -6256,9 +6171,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr "Ok"
-
msgid "Please enter a GPS coordinates"
msgstr "Introduza coordenadas GPS"
@@ -7166,8 +7078,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<diferente>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr ""
@@ -7184,6 +7106,12 @@ msgstr "Membro de"
msgid "Position"
msgstr "Posición"
+msgid "<different>"
+msgstr "<diferente>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -7314,6 +7242,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -8070,18 +8008,21 @@ msgstr "Obxecto"
msgid "not present"
msgstr "non presente"
-msgid "Changeset:"
-msgstr "Conxunto de cambios"
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8090,6 +8031,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "Información do conxunto de cambios"
@@ -9136,6 +9080,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -11161,6 +11108,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11806,6 +11759,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14617,6 +14578,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14720,6 +14684,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14847,6 +14814,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -15469,11 +15439,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15812,6 +15777,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Permite engadir marcadores/nodos ás posicións GPS actuais."
@@ -16528,15 +16498,34 @@ msgstr ""
msgid "deciduous"
msgstr "decíduos"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahaísta"
@@ -17785,6 +17774,12 @@ msgstr "Ruta de ferry"
msgid "Marina"
msgstr "Porto deportivo"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "público"
+
msgid "Pier"
msgstr "Embarcadoiro"
@@ -18183,6 +18178,12 @@ msgstr "Limpeza"
msgid "Car Dealer"
msgstr "Concesionario de automóviles"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Repair"
msgstr "Taller"
@@ -18195,12 +18196,6 @@ msgstr ""
msgid "Rental"
msgstr "Alquiler"
-msgid "Second hand"
-msgstr ""
-
-msgid "only"
-msgstr ""
-
msgid "Sharing"
msgstr "Compartindo"
@@ -18410,6 +18405,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr "Boca de metro"
+
msgid "Station or amenities"
msgstr ""
@@ -18465,9 +18463,6 @@ msgstr "Estación"
msgid "Building"
msgstr "Edificio"
-msgid "Subway Entrance"
-msgstr "Boca de metro"
-
msgid "Ticket Machine"
msgstr "Máquina de tiquets"
@@ -18594,7 +18589,7 @@ msgstr "Estrelas"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -19239,9 +19234,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr "público"
-
msgid "seasonal"
msgstr ""
@@ -19415,6 +19407,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr "Copia de seguranza"
@@ -20162,9 +20166,6 @@ msgstr "Faro"
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22720,6 +22721,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22886,36 +22897,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr "Porto:"
-
-msgid "refresh the port list"
-msgstr "Actualizar a lista de portos"
-
-msgid "Configure"
-msgstr "Configurar"
-
-msgid "Connection Error."
-msgstr "Erro de Conexión."
-
-msgid "configure the connected DG100"
-msgstr "Configurar o DG100 conectado"
-
-msgid "delete data after import"
-msgstr "eliminar datos despois de importar"
-
msgid "Columbus V-900 CSV Files"
msgstr "Ficheiros CSV de Columbus V-900"
@@ -24035,6 +24016,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Nome da Calle:"
@@ -24089,6 +24076,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr "nun polígono"
@@ -24712,6 +24727,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "Configurar"
+
msgid "Configure conflation options"
msgstr ""
@@ -25026,9 +25044,24 @@ msgstr "Desactivar captura de datos se a distancia cae por debaixo de"
msgid "Unknown logFormat"
msgstr "Formato de log descoñecido"
+msgid "Port:"
+msgstr "Porto:"
+
+msgid "refresh the port list"
+msgstr "Actualizar a lista de portos"
+
msgid "Configure Device"
msgstr "Configurar o Dispositivo"
+msgid "Connection Error."
+msgstr "Erro de Conexión."
+
+msgid "configure the connected DG100"
+msgstr "Configurar o DG100 conectado"
+
+msgid "delete data after import"
+msgstr "eliminar datos despois de importar"
+
msgid "Importing data from device."
msgstr "Importar datos do dispositivo"
@@ -26073,6 +26106,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr "Valores medidos"
@@ -28185,6 +28221,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr "Editor Seamap"
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/he.po b/i18n/po/he.po
index 4ce22d7..a507cf4 100644
--- a/i18n/po/he.po
+++ b/i18n/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2013-03-30 13:38+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Hebrew <he at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:43+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:43+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: he\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -445,15 +445,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "פזר צמתים"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "פזר את הצמתים הנבחרים במרחקים שווים לאורך קו"
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "הורד מ-OSM..."
@@ -470,6 +473,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -964,6 +970,12 @@ msgstr "סגור את הדיאלוג ובטל את ההורדה"
msgid "Download Data"
msgstr "הורד מידע"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1709,6 +1721,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1718,6 +1752,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2304,134 +2341,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b>...- כל העצמים ששונו"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - כל העצמים הבחורים"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - כל העצמים הבלתי גמורים"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - כל העצמים הלא מתוייגים"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "השתמש ב-<b>|</b> או <b>OR</b> כדי לחבר ב\"או\" לוגי"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "השתמש ב-<b>(</b> ו <b>)</b> כדי לצרף ביטויים"
-
msgid "basic examples"
msgstr ""
@@ -2471,6 +2380,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2486,12 +2401,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2528,7 +2437,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2540,6 +2454,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3880,7 +3797,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4522,6 +4439,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4580,6 +4500,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5978,9 +5901,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6850,8 +6770,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<שונה>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr ""
@@ -6868,6 +6798,12 @@ msgstr "חבר ב"
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr "<שונה>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6998,6 +6934,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7725,18 +7671,21 @@ msgstr "פריט"
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7745,6 +7694,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8769,6 +8721,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10741,6 +10696,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11378,6 +11339,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14110,6 +14079,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14213,6 +14185,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14340,6 +14315,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14962,11 +14940,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15283,6 +15256,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15986,15 +15964,34 @@ msgstr ""
msgid "deciduous"
msgstr "נשיר"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "בהאי"
@@ -17242,6 +17239,12 @@ msgstr "נתיב מעבורת"
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17640,6 +17643,12 @@ msgstr "שטיפה"
msgid "Car Dealer"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Repair"
msgstr "תיקונים"
@@ -17652,12 +17661,6 @@ msgstr ""
msgid "Rental"
msgstr "השכרה"
-msgid "Second hand"
-msgstr ""
-
-msgid "only"
-msgstr ""
-
msgid "Sharing"
msgstr "שיתוף"
@@ -17867,6 +17870,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr "כניסת רכבת תחתית"
+
msgid "Station or amenities"
msgstr ""
@@ -17922,9 +17928,6 @@ msgstr ""
msgid "Building"
msgstr "מבנה"
-msgid "Subway Entrance"
-msgstr "כניסת רכבת תחתית"
-
msgid "Ticket Machine"
msgstr ""
@@ -18051,7 +18054,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18696,9 +18699,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18872,6 +18872,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19619,9 +19631,6 @@ msgstr "מגדלור"
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22177,6 +22186,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22343,36 +22362,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr "פורט:"
-
-msgid "refresh the port list"
-msgstr "רענן את רשימת הפורטים"
-
-msgid "Configure"
-msgstr "קבע תצורה"
-
-msgid "Connection Error."
-msgstr "שגיאת התחברות."
-
-msgid "configure the connected DG100"
-msgstr "מגדיר את ה-DG100 המחובר"
-
-msgid "delete data after import"
-msgstr "מחק נתונים לאחר ייבוא"
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23491,6 +23480,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23545,6 +23540,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24154,6 +24177,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "קבע תצורה"
+
msgid "Configure conflation options"
msgstr ""
@@ -24468,9 +24494,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr "פורט:"
+
+msgid "refresh the port list"
+msgstr "רענן את רשימת הפורטים"
+
msgid "Configure Device"
msgstr "קבע תצורת מכשיר"
+msgid "Connection Error."
+msgstr "שגיאת התחברות."
+
+msgid "configure the connected DG100"
+msgstr "מגדיר את ה-DG100 המחובר"
+
+msgid "delete data after import"
+msgstr "מחק נתונים לאחר ייבוא"
+
msgid "Importing data from device."
msgstr "מייבא נתונים ממכשיר."
@@ -25512,6 +25553,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr "ערכים נמדדים"
@@ -27617,6 +27661,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/hi.po b/i18n/po/hi.po
index c55e0e3..e2800f4 100644
--- a/i18n/po/hi.po
+++ b/i18n/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2009-11-14 16:28+0000\n"
"Last-Translator: nipunreddevil <nipunreddevil at gmail.com>\n"
"Language-Team: Hindi <hi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:44+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:43+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: hi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/hr.po b/i18n/po/hr.po
index c3b03d8..729e75b 100644
--- a/i18n/po/hr.po
+++ b/i18n/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2015-02-25 14:38+0000\n"
"Last-Translator: gogo <trebelnik2 at gmail.com>\n"
"Language-Team: Croatian <hr at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:56+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:55+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: hr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -452,15 +452,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "Distribuiraj točke"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Distribuiraj izabrane točke na jednake udaljenosti uz liniju."
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Preuzimanje sa OSM..."
@@ -475,6 +478,9 @@ msgstr ""
msgid "Download data"
msgstr "Preuzmi podatke"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Preuzmi objekt..."
@@ -1000,6 +1006,12 @@ msgstr "Zatvori dijalog i poništi preuzimanje"
msgid "Download Data"
msgstr "Preuzimanje podataka"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "U redu"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1789,6 +1801,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1798,6 +1832,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2388,141 +2425,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Baker Street</b> - ''Baker'' i ''Street'' u svakoj tipci"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' u svakoj tipci"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Bak</b> - ''Bak'' svugdje u tipci ''key''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Bak</b> - ''Bak'' nigdje u tipci ''key''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>tipka:</b>- tipka ''key'' dodaj bolokoju vrijednost"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>tipka?</b> - tipka ''key'' sa vrijenošću ''da'', ''istina'', ''1'' ili "
-"''na''"
-
-msgid "Special targets"
-msgstr "Posebne mete"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - objekti promjenjeni od korisnika"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-"<b>user:anonymous</b> ... - objekti promjenjeni od anonimnog korisnika"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - svi promjenjeni objekti"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - svi označeni objekti"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - svi nedovršeni objekti"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - svi neoznačeni (untagged) objekti"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(svi)indownloadedarea</b> - objekti (i sve točke puteva / članovi "
-"relacija) u preuzetom području"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(svi)inview </b> - objekti (i sve točke puteva / članovi relacija) u "
-"trenutnom pogledu"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Koristite <b>|</b> ili <b>OR</b> za kombiniranje sa logičkim \"ili\""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr "osnovni primjeri"
@@ -2562,6 +2464,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr "kombinatori"
@@ -2577,12 +2485,6 @@ msgstr "logičko ne"
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr "objekti"
@@ -2619,8 +2521,13 @@ msgstr ""
msgid "properties"
msgstr "svojstva"
-msgid "objects with at least 20 nodes"
-msgstr "objekti sa najmanje 20 točaka"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "objekti koji sadržavaju 5 do 10 tagova"
@@ -2631,6 +2538,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr "zatvoreni putevi sa površinom od 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3985,7 +3895,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4626,6 +4536,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4684,6 +4597,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -6078,9 +5994,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr "U redu"
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6950,9 +6863,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6968,6 +6891,12 @@ msgstr ""
msgid "Position"
msgstr "Pozicija"
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -7099,6 +7028,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7827,18 +7766,21 @@ msgstr "Objekt"
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7847,6 +7789,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8896,6 +8841,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10861,6 +10809,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11498,6 +11452,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14226,6 +14188,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14329,6 +14294,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14456,6 +14424,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -15078,11 +15049,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15399,6 +15365,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -16102,15 +16073,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17358,6 +17348,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17756,22 +17752,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17983,6 +17979,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -18038,9 +18037,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18167,7 +18163,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18812,9 +18808,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18988,6 +18981,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19735,9 +19740,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22293,6 +22295,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22459,36 +22471,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23607,6 +23589,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23661,6 +23649,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24270,6 +24286,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24584,9 +24603,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25625,6 +25659,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27733,6 +27770,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ht.po b/i18n/po/ht.po
index 1fbbbbd..5cda21e 100644
--- a/i18n/po/ht.po
+++ b/i18n/po/ht.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2010-03-11 21:17+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Haitian; Haitian Creole <ht at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:43+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:42+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/hu.po b/i18n/po/hu.po
index 98391b6..aa13acc 100644
--- a/i18n/po/hu.po
+++ b/i18n/po/hu.po
@@ -8,53 +8,54 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-03-19 20:09+0000\n"
-"Last-Translator: Úr Balázs <urbalazs at gmail.com>\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-26 16:30+0000\n"
+"Last-Translator: Zoltan Faludi <Unknown>\n"
"Language-Team: Hungarian <kde-l10n-hu at kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:44+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:44+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: hu\n"
msgid "{0}: option ''{1}'' is ambiguous"
-msgstr "{0}: ''{1}'' kapcsoló nem egyértelmű"
+msgstr "{0}: „{1}” kapcsoló nem egyértelmű"
msgid "{0}: option ''--{1}'' does not allow an argument"
-msgstr "{0}: ''--{1}'' kapcsoló nem használ paramétert"
+msgstr "{0}: „--{1}” kapcsoló nem használ paramétert"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
-msgstr "{0}: ''--{1}{2}'' kapcsoló nem használ paramétert"
+msgstr "{0}: „--{1}{2}” kapcsoló nem használ paramétert"
msgid "{0}: option ''{1}'' requires an argument"
-msgstr "{0}: \"{1}\" kapcsoló paramétert igényel"
+msgstr "{0}: „{1}” kapcsoló paramétert igényel"
msgid "{0}: unrecognized option ''--{1}''"
-msgstr "{0}: nem felismerhető kapcsoló \"--{1}\""
+msgstr "{0}: nem felismerhető „--{1}” kapcsoló"
msgid "{0}: unrecognized option ''{1}{2}''"
-msgstr "{0}: nem felismerhető kapcsoló \"--{1}{2}\""
+msgstr "{0}: nem felismerhető „--{1}{2}” kapcsoló"
msgid "{0}: illegal option -- {1}"
-msgstr "{0}: szabálytalan kapcsoló --{1}"
+msgstr "{0}: szabálytalan --{1} kapcsoló"
msgid "{0}: invalid option -- {1}"
-msgstr "{0}: érvénytelen kapcsoló --{1}"
+msgstr "{0}: érvénytelen --{1} kapcsoló"
msgid "{0}: option requires an argument -- {1}"
-msgstr "{0}: a kapcsoló paramétert igényel --{1}"
+msgstr "{0}: a kapcsoló paramétert igényel -- {1}"
msgid "Invalid value {0} for parameter ''has_arg''"
-msgstr "Érvénytelen {0} kapcsoló a ''has_arg'' paraméterhez"
+msgstr "Érvénytelen {0} érték a „has_arg” paraméterhez"
msgid "Background Terms of Use"
msgstr "Háttérképek felhasználási feltételei"
msgid "Opening link not supported on current platform (''{0}'')"
-msgstr "A link megnyitása nem támogatott az aktuális (''{0}'') platformon"
+msgstr ""
+"A hivatkozás megnyitása nem támogatott az aktuális („{0}”) platformon"
msgid "ERROR: {0}"
msgstr "HIBA: {0}"
@@ -63,10 +64,10 @@ msgid "WARNING: {0}"
msgstr "FIGYELMEZTETÉS: {0}"
msgid "INFO: {0}"
-msgstr "INFO: {0}"
+msgstr "INFORMÁCIÓ: {0}"
msgid "DEBUG: {0}"
-msgstr "DEBUG: {0}"
+msgstr "HIBAKERESÉS: {0}"
msgid "Cause: "
msgstr "Indok: "
@@ -81,16 +82,16 @@ msgid "Help"
msgstr "Súgó"
msgid "Initializing OSM API"
-msgstr "OSM API indítása"
+msgstr "OSM API előkészítése"
msgid "Initializing validator"
-msgstr "Hibakereső betöltése"
+msgstr "Ellenőrző előkészítése"
msgid "Initializing presets"
-msgstr "Beállítások betöltése"
+msgstr "Beállítások előkészítése"
msgid "Initializing map styles"
-msgstr "Térképi stílusok betöltése"
+msgstr "Térképstílusok előkészítése"
msgid "Loading imagery preferences"
msgstr "Légifelvétel-beállítások betöltése"
@@ -102,16 +103,17 @@ msgid "{0} completed in {1}"
msgstr "{0} elkészült {1} alatt"
msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "Rosszul formázott fájl-URL kihagyása: \"{0}\""
+msgstr "Rosszul formázott fájl-URL kihagyása: „{0}”"
msgid "Warning"
msgstr "Figyelmeztetés"
msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
-msgstr "A \"downloadgps\" paraméter nem lehet fájlnév vagy fájl URL."
+msgstr ""
+"A „downloadgps” paraméter nem fogad el fájlneveket vagy fájl URL-eket"
msgid "Ignoring malformed URL: \"{0}\""
-msgstr "Rosszul formázott URL kihagyása: \"{0}\""
+msgstr "Rosszul formázott URL mellőzése: „{0}”"
msgid ""
"<h2>JOSM requires Java version {0}.</h2>Detected Java version: {1}.<br>You "
@@ -136,7 +138,7 @@ msgid "About"
msgstr "Névjegy"
msgid "Display the about screen."
-msgstr "Névjegy ablak mutatása."
+msgstr "A névjegy ablak megjelenítése."
msgid "Java OpenStreetMap Editor"
msgstr "Java OpenStreetMap Szerkesztő"
@@ -464,15 +466,18 @@ msgstr "Párbeszédpanelek váltása"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Párbeszédpanelek váltása, térképnézet maximalizálása"
-msgid "Distribute Nodes"
-msgstr "Pontok szétosztása"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "A kijelölt pontok elhelyezése egyenlő távolságokra egy vonal mentén."
msgid "Ignoring {0} nodes with null coordinates"
msgstr "{0} null-koordinátájú pont mellőzése"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Letöltés OSM-ről..."
@@ -489,6 +494,9 @@ msgstr ""
msgid "Download data"
msgstr "Adatok letöltése"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Objektumok letöltése…"
@@ -732,7 +740,7 @@ msgid "Join Areas Function"
msgstr "Területek egyesítése funkció"
msgid "Join Node to Way"
-msgstr "Pont illesztése vonalra"
+msgstr "Csomópont egyesítése az úttal"
msgid "Include a node into the nearest way segments"
msgstr "Beilleszti a pontot a legközelebbi vonalszakaszba"
@@ -1035,6 +1043,12 @@ msgstr "Párbeszédablak bezárása és a letöltés megszakítása"
msgid "Download Data"
msgstr "Adatok letöltése"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "OK"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1853,6 +1867,28 @@ msgstr "Jegyzetek letöltése"
msgid "Notes"
msgstr "Jegyzetek"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr "Tömörített OSM Change letöltése"
@@ -1862,6 +1898,9 @@ msgstr "OSM Change letöltése"
msgid "Download Compressed OSM"
msgstr "Tömörített OSM letöltése"
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "OSM letöltése"
@@ -2496,170 +2535,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Érvénytelen keresőkifejezés"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Baker Street</b> - ''Baker'' és ''Street'' bármely kulcsban"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' bármely kulcsban"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Bak</b> - ''Bak'' bárhol a ''key'' kulcsban"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Bak</b> - ''Bak'' nem szerepel a ''key'' kulcsban"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - ''key'' kulcs pontosan ''value'' értékkel"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - ''key'' kulcs bármely értékkel. Próbáld még: <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - ''key'' kulcs bármely értékkel"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>key?</b> - ''key'' kulcs az alábbi értékek egyikével: ''yes'', ''true'', "
-"''1'' vagy ''on''"
-
-msgid "Special targets"
-msgstr "Speciális feladatok"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - objektum a következő típusok egyikével: <b>node</b>, "
-"<b>way</b>, <b>relation</b>"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - felhasználó által változtatott objektum"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-"<b>user:anonymous</b> - anonim felhasználó által változtatott objektum"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-"<b>id:</b>... - objektumok a megadott azonosítóval (0 az új objektum)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr "<b>version:</b>... - megadott verziójú objektumok (0 az új objektum)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - objektumok a megadott azonosítójú módosításcsomagból "
-"(0 ami még nincs módosításcsomagban)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - ennyi pontot tartalmazó objektumok (<b>nodes:</b>darab, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- vagy <b>nodes:</b>-max)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - ennyi címkét tartalmazó objektumok (<b>tags:</b>darab, "
-"<b>tags:</b>min-max, <b>tags:</b>min- vagy <b>tags:</b>-max)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-"<b>role:</b>... - a kapcsolatban a megadott szerepben lévő objektumok"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>időbélyeg - objektumok, amik ekkor voltak utoljára "
-"módosítva (2009-11-12T14:51:09Z, 2009-11-12 vagy T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-"<b>timestamp:</b>min/max - objektumok, amik ebben az intervallumban voltak "
-"utoljára módosítva"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - zárt vonalak m²-ben megadott területtel "
-"(<b>areasize:</b>min-max vagy <b>areasize:</b>max)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - minden módosított objektum"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - minden kijelölt objektum"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - minden félkész objektum"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - minden címke nélküli objektum"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr "<b>closed</b> - az összes zárt vonal (egy pont nem számít annak)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>expr</i></b> - az <i>expr</i> kifejezésre illeszkedő objektumok "
-"összes leszármazottja"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - az <i>expr</i> kifejezésre illeszkedő objektumok "
-"összes felmenője"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - objektumok (és azok összes vonala, pontja, "
-"kapcsolata) a letöltött területről"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - objektumok (és azok összes vonala, pontja, kapcsolata) "
-"az aktuális nézetben"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-"Használd a <b>|</b> vagy <b>OR</b> operátorokat logikai VAGY kapcsolat "
-"létrehozásához"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Idézéshez használj <b>\"</b> operátort (pl. ha a kulcs <b>:</b> jelet "
-"tartalmaz)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Az idézett szövegekben az <b>\"</b> és <b>\\</b> karaktereket le kell védeni "
-"egy eléjük rakott <b>\\</b>-vel (pl. <b>\\\"</b> és <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-"Használd a <b>(</b> és <b>)</b> karaktereket kifejezések csoportosításához"
-
msgid "basic examples"
msgstr "egyszerű példák"
@@ -2699,6 +2574,15 @@ msgstr "egyezik, ha ''key'' létezik"
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr "egyezik, ha ''key'' nagyobb mint a ''value'' (illetve kisebb)"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"idéző operátorokhoz.<br>Az idézett szövegen belül az <b>\"</b> és <b>\\</b> "
+"karaktereket le kell védeni egy megelőző <b>\\</b> karakterrel (pl. <b>\\"
+"\"</b> és <b>\\\\</b>)."
+
msgid "combinators"
msgstr "kombinálók"
@@ -2714,15 +2598,6 @@ msgstr "logikai nem"
msgid "use parenthesis to group expressions"
msgstr "használj zárójelet a kifejezések csoportosításához"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"idéző operátorokhoz.<br>Az idézett szövegen belül az <b>\"</b> és <b>\\</b> "
-"karaktereket le kell védeni egy megelőző <b>\\</b> karakterrel (pl. <b>\\"
-"\"</b> és <b>\\\\</b>)."
-
msgid "objects"
msgstr "objektumok"
@@ -2759,8 +2634,13 @@ msgstr "adott időbélyeg tartományon belül módosított objektumok"
msgid "properties"
msgstr "tulajdonságok"
-msgid "objects with at least 20 nodes"
-msgstr "objektumok legalább 20 ponttal"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "5 - 10 címkével rendelkező objektumok"
@@ -2771,6 +2651,9 @@ msgstr "a kapcsolatban az adott szerepben lévő objektumok"
msgid "closed ways with an area of 100 m²"
msgstr "100 m² területű zárt vonal"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr "állapot"
@@ -4214,8 +4097,8 @@ msgstr ""
"egyezik más ''name:*'' attribútumokkal és nem ''name:*'' attribútumok "
"összetétele, mint Italia - Italien - Italy"
-msgid "A name:* translation is missing."
-msgstr "name:* fordítás hiányzik"
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "name hiányzik, viszont van megadott name:*"
@@ -4872,6 +4755,9 @@ msgstr "Megjeleníti a JOSM verziószámát és kilép"
msgid "Print debugging messages to console"
msgstr "Hibakeresési üzenetek kiírása a konzolra"
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
"Hozzáférés letiltása az adott erőforrás(ok)hoz, vesszővel elválasztva"
@@ -4942,6 +4828,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr "Hibaüzenetek írása a konzolra"
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr "Részletes hibakeresési szint (trace) engedélyezve"
@@ -6462,9 +6351,6 @@ msgstr "Szélesség/Hosszúság"
msgid "East/North"
msgstr "Keleti/Északi"
-msgid "Ok"
-msgstr "OK"
-
msgid "Please enter a GPS coordinates"
msgstr "Kérlek add meg a GPS koordinátákat"
@@ -7403,8 +7289,18 @@ msgstr "Eldobható kulcs: előtér"
msgid "Discardable key: background"
msgstr "Eldobható kulcs: háttér"
-msgid "<different>"
-msgstr "<különböző>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr "Válassz objektumokat, amiknek megváltoztatnád a címkéit."
@@ -7421,6 +7317,12 @@ msgstr "Tagja"
msgid "Position"
msgstr "Pozíció"
+msgid "<different>"
+msgstr "<különböző>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Címke: {0} / Tagság: {1}"
@@ -7553,6 +7455,16 @@ msgstr "Nemrég használt címkék száma"
msgid "Remember last used tags after a restart"
msgstr "Emlékezzen a legutóbb használt cimkékre újraindítás után is"
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr "Kérlek add meg a megjeleníteni kívánt nemrég használt címkék számát"
@@ -8366,18 +8278,21 @@ msgstr "Objektum"
msgid "not present"
msgstr "nem létezik"
-msgid "Changeset:"
-msgstr "Módosításcsomag:"
-
msgid "Changeset comment"
msgstr "Módosításcsomag megjegyzése"
msgid "Changeset source"
msgstr "Módosításcsomag forrás"
+msgid "Imagery used"
+msgstr "Felhasznált képanyag"
+
msgid "<b>Source</b>:"
msgstr "<b>Forrás</b>:"
+msgid "<b>Imagery</b>:"
+msgstr "<b>Képanyag</b>:"
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8390,6 +8305,9 @@ msgstr ""
"<html><strong>{0}</strong> változat ekkor készült: "
"<strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr "Változáskészlet"
+
msgid "Changeset info"
msgstr "Módosításcsomag információi"
@@ -9561,6 +9479,9 @@ msgstr "Képpont méretarány: {0}"
msgid "Best zoom: {0}"
msgstr "Legjobb nagyítás: {0}"
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "TMS réteg ({0}), letöltés {1} zoomszinten"
@@ -11741,6 +11662,12 @@ msgstr "Hozzáadás a slippymap választóba: "
msgid "Tile cache directory: "
msgstr "Csempegyorsítótár könyvtár: "
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12447,6 +12374,14 @@ msgstr "Új üzenetek lekérése rendszeres időközönként"
msgid "Check interval (minutes):"
msgstr "Ellenőrzés intervalluma (perc):"
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr "Nem sikerült lekérni az OAuth elérési tokent az igazoláskezelőtől."
@@ -15581,6 +15516,9 @@ msgstr "Geoimage.at MaxRes"
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (alaptérkép)"
@@ -15684,6 +15622,9 @@ msgstr "Estonia Kataszteri (Maaamet)"
msgid "Estonia Forestry (Maaamet)"
msgstr "Estonia Forestry (Maaamet)"
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
@@ -15815,6 +15756,9 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Drón ábrázolás (Haiti)"
@@ -16437,13 +16381,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"Lehetővé teszi a közlekedési információk szerkesztését és kiöntését a városi "
-"mobilitás szimulátor (SUMO) részére"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -16860,6 +16797,13 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "OpenSeaMap tulajdonságok szerkesztése"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Lehetővé teszi a közlekedési információk szerkesztését és kiöntését a városi "
+"mobilitás szimulátor (SUMO) részére"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
"Lehetővé teszi jelölők/pontok hozzáadását az aktuális GPS pozícióhoz."
@@ -17591,15 +17535,34 @@ msgstr "Kör"
msgid "deciduous"
msgstr "lombhullató"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr "örökzöld"
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr "félig lombhullató"
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr "félig örökzöld"
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahái"
@@ -18870,6 +18833,12 @@ msgstr "Kompútvonal"
msgid "Marina"
msgstr "Jachtkikötő"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "nyilvános"
+
msgid "Pier"
msgstr "Móló"
@@ -19268,6 +19237,12 @@ msgstr "Autómosó"
msgid "Car Dealer"
msgstr "Autókereskedés"
+msgid "Second hand"
+msgstr "Használt"
+
+msgid "only"
+msgstr "kizárólag"
+
msgid "Repair"
msgstr "Szerviz"
@@ -19280,12 +19255,6 @@ msgstr "Gumik"
msgid "Rental"
msgstr "Kölcsönző"
-msgid "Second hand"
-msgstr "Használt"
-
-msgid "only"
-msgstr "kizárólag"
-
msgid "Sharing"
msgstr "Megosztóhely"
@@ -19495,6 +19464,9 @@ msgstr "Állóhely"
msgid "Platform"
msgstr "Peron"
+msgid "Subway Entrance"
+msgstr "Metrólejárat"
+
msgid "Station or amenities"
msgstr "Megálló vagy komfort-szolgáltatók"
@@ -19550,9 +19522,6 @@ msgstr "Állomás"
msgid "Building"
msgstr "Épület"
-msgid "Subway Entrance"
-msgstr "Metrólejárat"
-
msgid "Ticket Machine"
msgstr "Jegyautomata"
@@ -19679,8 +19648,8 @@ msgstr "Csillagok"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
-msgstr "Vendégház/Magánszálláshely reggelivel"
+msgid "Guest House/Bed & Breakfast"
+msgstr ""
msgid "Chalet"
msgstr "Apartman"
@@ -20330,9 +20299,6 @@ msgstr "Mosdók/WC"
msgid "Access rights"
msgstr "Használati jogok"
-msgid "public"
-msgstr "nyilvános"
-
msgid "seasonal"
msgstr "szezonális"
@@ -20506,6 +20472,18 @@ msgstr "Szemétkosár/Szemetes"
msgid "Waste Disposal/Dumpster"
msgstr "Hulladék leadó/Kuka"
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr "Üzemidő"
+
msgid "Backrest"
msgstr "Háttámla"
@@ -21254,9 +21232,6 @@ msgstr "Világítótorony"
msgid "Street Lamp"
msgstr "Lámpaoszlop"
-msgid "Operation times"
-msgstr "Üzemidő"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "H-P 22:00-05:00"
@@ -23843,6 +23818,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} egy ponton. Vonalon kellene használni."
@@ -24018,36 +24003,6 @@ msgstr "Utca feliratok megjelenítése (magas nagyításnál)"
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr "OSM kiöntés"
-
-msgid "Export traffic data to SUMO network file."
-msgstr "Forgalmi adatok kiöntése SUMO hálózati fájlba."
-
-msgid "SUMO Export"
-msgstr "SUMO kiöntés"
-
-msgid "Export"
-msgstr "Kiöntés"
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "port lista frissítése"
-
-msgid "Configure"
-msgstr "Konfiguráció"
-
-msgid "Connection Error."
-msgstr "Kapcsolat hiba."
-
-msgid "configure the connected DG100"
-msgstr "a csatlakozó DG100 konfigurálása"
-
-msgid "delete data after import"
-msgstr "adat törlése betöltés után"
-
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV Files"
@@ -25196,6 +25151,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Utca:"
@@ -25250,6 +25211,34 @@ msgstr "Mutass az épület másik végére"
msgid "Set width of the building"
msgstr "Állítsd be az épület szélességét"
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr "poligonon"
@@ -25866,6 +25855,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "Konfiguráció"
+
msgid "Configure conflation options"
msgstr ""
@@ -26180,9 +26172,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "port lista frissítése"
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr "Kapcsolat hiba."
+
+msgid "configure the connected DG100"
+msgstr "a csatlakozó DG100 konfigurálása"
+
+msgid "delete data after import"
+msgstr "adat törlése betöltés után"
+
msgid "Importing data from device."
msgstr ""
@@ -27221,6 +27228,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr "Kiöntés"
+
msgid "Measured values"
msgstr ""
@@ -29352,6 +29362,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr "OSM kiöntés"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Forgalmi adatok kiöntése SUMO hálózati fájlba."
+
+msgid "SUMO Export"
+msgstr "SUMO kiöntés"
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/hy.po b/i18n/po/hy.po
index 0c0cf37..953bccb 100644
--- a/i18n/po/hy.po
+++ b/i18n/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2011-04-13 21:51+0000\n"
"Last-Translator: Gev777 <Unknown>\n"
"Language-Team: Armenian <hy at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:32+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:32+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: hy\n"
msgid "Cancel"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ia.po b/i18n/po/ia.po
index 2e3bed8..85c615f 100644
--- a/i18n/po/ia.po
+++ b/i18n/po/ia.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2011-08-29 01:02+0000\n"
"Last-Translator: Emilio Sepulveda <Unknown>\n"
"Language-Team: Interlingua <ia at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:45+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:45+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: ia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/id.po b/i18n/po/id.po
index e8452c2..25f562e 100644
--- a/i18n/po/id.po
+++ b/i18n/po/id.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2014-10-16 10:41+0000\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-10 09:39+0000\n"
"Last-Translator: Trisno Pamuji <tri.snowman at gmail.com>\n"
"Language-Team: Indonesian <id at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:45+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:45+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: id\n"
"X-Language: id_ID\n"
@@ -57,7 +57,7 @@ msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Membuka tautan tidak dapat dilakukan pada platform ini (''{0}'')"
msgid "ERROR: {0}"
-msgstr ""
+msgstr "KESALAHAN: {0}"
msgid "WARNING: {0}"
msgstr "PERINGATAN: {0}"
@@ -118,6 +118,9 @@ msgid ""
"can <ul><li>update your Java (JRE) or</li><li>use an earlier (Java {2} "
"compatible) version of JOSM.</li></ul>More Info:"
msgstr ""
+"<h2>JOSM membutuhkan Java versi {0}.</h2>Versi Java terdeteksi: {1}.<br>Anda "
+"dapat <ul><li>memperbarui Javaan (JRE) anda atau</li><li>menggunakan versi "
+"lama (Java {2} yang kompatibel) untuk JOSM.</li></ul>More Info:"
msgid "Exit JOSM"
msgstr "Keluar JOSM"
@@ -454,9 +457,6 @@ msgstr "Mengatur panel dialog"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Mengatur panel dialog, memaksimalkan tampilan peta"
-msgid "Distribute Nodes"
-msgstr "Mendistribusikan Node/Titik"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Mendistribusikan node terpilih untuk menyamakan jarak sepanjang garis"
@@ -464,6 +464,12 @@ msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Abaikan {0} titik-titik/nodes tanpa koordinat"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Download dari OSM..."
@@ -480,6 +486,9 @@ msgstr ""
msgid "Download data"
msgstr "Download data"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Download objek..."
@@ -1015,6 +1024,12 @@ msgstr "Tutup dialog dan batalkan download"
msgid "Download Data"
msgstr "Download Data"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Ok"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1825,6 +1840,28 @@ msgstr ""
msgid "Notes"
msgstr "Catatan"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr "Download Perubahan OSM yang dikompresi"
@@ -1834,6 +1871,9 @@ msgstr "Download Perubahan OSM"
msgid "Download Compressed OSM"
msgstr "Download OSM yang dikompresi"
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "Unduh data OSM"
@@ -2452,168 +2492,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Ekspresi pencarian tidak berlaku"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Baker Street</b> - ''Baker'' dan ''Street'' di \"key\" manapun"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' di manapun \"key\""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Bak</b> - ''Bak'' dimanapun dalam \"key\" pada ''key''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Bak</b> - ''Bak'' tidak ada key ''key''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - key ''key'' dengan nilai sebenarnya ''value''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - key ''key'' dengan \"value\" apapun. Coba buka "
-"<b>*=value</b>, <b>key=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - key ''key'' mengatur \"value\" manapun"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>key?</b> - key ''key'' dengan value ''yes'', ''true'', ''1'' atau ''on''"
-
-msgid "Special targets"
-msgstr "Target khusus"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - objects dengan tipe koresponden (<b>node/titik</b>, "
-"<b>way</b>, <b>relasi</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - objek-objek diubah oleh user"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>pengguna:tanpa nama</b> - objek diubah oleh pengguna tanpa nama"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - Objek dengan ID (0 untuk objek yang baru)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>versi:</b>... - objek yang diberikan versi (0 objects tanpa versi yang "
-"telah ditandai)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>perubahan:</b>... - Objek yang diberikan perubahan ID (0 objects tanpa "
-"perubahan yang tidak ditandai)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>node/titik:</b>... - objek yang diberikan nomor "
-"(<b>node/titik:</b>jumlah, <b>node/titik:</b>min-max, <b>node/titik:</b>min- "
-"or <b>node/titik:</b>-max)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tag:</b>... - objek yang telah diberikan tag (<b>tag:</b>jumlah, "
-"<b>tag:</b>min-max, <b>tag:</b>min- atau <b>tag:</b>-max)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-"<b>peran:</b>... - Objek yang telah diberikan peran pada sebuah relasi"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>timestamp - objek yang dimodifikasi terakhir melalui "
-"timestamp (2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-"<b>timestamp:</b>min/max - objek dengan modifikasi terakhir di dalam "
-"jangkauan"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>luas area:</b>... - way/garis tertutup dengan area dalam m² "
-"(<b>areasize:</b>min-max atau <b>luas area:</b>max)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - semua objek telah telah dimodifikasi"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - semua objek yang terpilih"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - semua objek yang belum lengkap"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - semua objek yang tidak memiliki label"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-"<b>closed</b> - semua jalur yang tertutup (sebuah node tidak dipertimbangkan "
-"untuk ditutup)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>expr</i></b> - semua anak objek yang sama dengan ekspresi"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - semua induk objek yang sama dengan ekspresi"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(semua)area download</b> - objek (dan semua member dari way/garis "
-"node/titik) dalam area download"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"b>(semua)tampilan</b> - objek (dan semua member dari way/garis node/titik) "
-"dalam tampilan saat ini"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-"Gunakan <b>|</b> atau <b>OR</b> untuk mengkombinasikan dengan logika atau"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Gunakan<b>\"</b> untuk mengutip operator (misal apabila kunci mengandung "
-"<b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Tanpa mengutip, rangkaian <b>\"</b> dan karakter <b>\\</b> harus dikeluarkan "
-"dengan mendahulukan <b>\\</b> (contoh <b>\\\"</b> adan <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Gunakan <b>(</b> dan <b>)</b> untuk mengelompokan ekspresi"
-
msgid "basic examples"
msgstr "contoh-contoh dasar"
@@ -2653,6 +2531,15 @@ msgstr "Cocokkan jika \"key\" telah ada"
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"Mengutip operator.<br>Di dalam rangkaian kutipan <b>\"</b> dan <b>\\</b> "
+"karakter butuh untuk dikeluarkan oleh karakter sebelumnya <b>\\</b> (e.g. "
+"<b>\\\"</b> dan <b>\\\\</b>)."
+
msgid "combinators"
msgstr "pengkombinasi"
@@ -2668,15 +2555,6 @@ msgstr "Tidak logika"
msgid "use parenthesis to group expressions"
msgstr "Menggunakan tanda kurung untuk mengelompokkan ekspresi yang ada"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"Mengutip operator.<br>Di dalam rangkaian kutipan <b>\"</b> dan <b>\\</b> "
-"karakter butuh untuk dikeluarkan oleh karakter sebelumnya <b>\\</b> (e.g. "
-"<b>\\\"</b> dan <b>\\\\</b>)."
-
msgid "objects"
msgstr "Objek-objek"
@@ -2713,8 +2591,13 @@ msgstr "Objek yang modifikasi terakhir yang berada dalam jangkauan"
msgid "properties"
msgstr "Properti"
-msgid "objects with at least 20 nodes"
-msgstr "objek-objek dengan paling sedikit 20 node/titik"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "objek-objek yang mempunyai 5 sampai 10 tag"
@@ -2725,6 +2608,9 @@ msgstr "objek-objek dengan peran yang telah diberikan pada suatu relasi"
msgid "closed ways with an area of 100 m²"
msgstr "garis tertutup dengan area 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr "Provinsi"
@@ -4136,8 +4022,8 @@ msgstr ""
"beberapa \"nama\":*atribut dan tidak komposisi \"nama\" atribut, misalnya "
"Italia - Italien - Itali."
-msgid "A name:* translation is missing."
-msgstr "Nama:*terjemahan hilang"
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "Nama menghilang, walaupun nama:*sudah ada"
@@ -4792,6 +4678,9 @@ msgstr "Tampilkan versi JOSM dan keluar"
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4856,6 +4745,9 @@ msgstr "Pastikan anda memuat beberapa data jika anda menggunakan --seleksi."
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -6314,9 +6206,6 @@ msgstr "Lintang/Bujur"
msgid "East/North"
msgstr "Timur/Utara"
-msgid "Ok"
-msgstr "Ok"
-
msgid "Please enter a GPS coordinates"
msgstr "Silahkan masukkan koordinat GPS"
@@ -7238,8 +7127,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<perbedaan>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr ""
@@ -7256,6 +7155,12 @@ msgstr "Anggota Dari"
msgid "Position"
msgstr "Posisi"
+msgid "<different>"
+msgstr "<perbedaan>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -7384,6 +7289,16 @@ msgstr "Mengatur jumlah tag/label yang baru ditambahkan"
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr "Masukkan jumlah tag baru yang ditambahkan untuk ditampilkan"
@@ -8181,18 +8096,21 @@ msgstr "Objek"
msgid "not present"
msgstr "tidak saat ini"
-msgid "Changeset:"
-msgstr "Set perubahan"
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8203,6 +8121,9 @@ msgid ""
msgstr ""
"<html>Versi <strong>{0}</strong> dibuat di <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "Info set perubahan"
@@ -9320,6 +9241,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "Layer TMS ({0}), mendownload dengan perbesaran {1}"
@@ -11478,6 +11402,12 @@ msgstr "Tambhakan ke slippymap pemilih: "
msgid "Tile cache directory: "
msgstr "Direktori indeks cache: "
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12172,6 +12102,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -15147,6 +15085,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -15250,6 +15191,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -15377,6 +15321,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -15999,11 +15946,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -16387,6 +16329,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "mengedit fitur dari OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Memungkinkan untuk menambah tanda/titik pada posisi gps saat ini"
@@ -17112,15 +17059,34 @@ msgstr ""
msgid "deciduous"
msgstr "gugur"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahai"
@@ -18377,6 +18343,12 @@ msgstr "Rute Feri"
msgid "Marina"
msgstr "Marina"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "publik"
+
msgid "Pier"
msgstr "Tembok Laut"
@@ -18775,6 +18747,12 @@ msgstr "Cuci"
msgid "Car Dealer"
msgstr "Penjual Mobil"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr "hanya"
+
msgid "Repair"
msgstr "Perbaikan"
@@ -18787,12 +18765,6 @@ msgstr ""
msgid "Rental"
msgstr "Penyewaan"
-msgid "Second hand"
-msgstr ""
-
-msgid "only"
-msgstr "hanya"
-
msgid "Sharing"
msgstr "Berbagi"
@@ -19002,6 +18974,9 @@ msgstr "Posisi berhenti"
msgid "Platform"
msgstr "Platform"
+msgid "Subway Entrance"
+msgstr "Pintu masuk kereta bawah tanah"
+
msgid "Station or amenities"
msgstr "Stasiun atau ameniti"
@@ -19057,9 +19032,6 @@ msgstr "Stasiun"
msgid "Building"
msgstr "Bangunan"
-msgid "Subway Entrance"
-msgstr "Pintu masuk kereta bawah tanah"
-
msgid "Ticket Machine"
msgstr "Mesin Tiket"
@@ -19186,7 +19158,7 @@ msgstr "Bintang"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -19831,9 +19803,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr "publik"
-
msgid "seasonal"
msgstr ""
@@ -20007,6 +19976,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr "Waktu operasi"
+
msgid "Backrest"
msgstr "Sandaran"
@@ -20754,9 +20735,6 @@ msgstr "Mercusuar"
msgid "Street Lamp"
msgstr "Lampu Jalan"
-msgid "Operation times"
-msgstr "Waktu operasi"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Senin-Jumat 22:00-05:00"
@@ -23314,6 +23292,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -23482,36 +23470,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr "Export"
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "perbaharui daftar port"
-
-msgid "Configure"
-msgstr "Konfigurasi"
-
-msgid "Connection Error."
-msgstr "Kesalahan sambungan"
-
-msgid "configure the connected DG100"
-msgstr "konfigurasi disambungkan DG100"
-
-msgid "delete data after import"
-msgstr "Hapus data setelah import"
-
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV Files"
@@ -24738,6 +24696,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Nama Jalan:"
@@ -24792,6 +24756,34 @@ msgstr "Titik pada ujung bangunan"
msgid "Set width of the building"
msgstr "Atur lebar bangunan"
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr "di dalam poligon"
@@ -25453,6 +25445,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "Konfigurasi"
+
msgid "Configure conflation options"
msgstr ""
@@ -25772,9 +25767,24 @@ msgstr "Non aktifkan pencatatan data jika jarak turun"
msgid "Unknown logFormat"
msgstr "logFormat tidak diketahui"
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "perbaharui daftar port"
+
msgid "Configure Device"
msgstr "Alat konfigurasi"
+msgid "Connection Error."
+msgstr "Kesalahan sambungan"
+
+msgid "configure the connected DG100"
+msgstr "konfigurasi disambungkan DG100"
+
+msgid "delete data after import"
+msgstr "Hapus data setelah import"
+
msgid "Importing data from device."
msgstr "pengimporan data dari alat"
@@ -26902,6 +26912,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr "Export"
+
msgid "Measured values"
msgstr "Nilai ukuran"
@@ -29108,6 +29121,15 @@ msgstr "Menggabungkan ambang batas Node/titik terdekat"
msgid "SeaMap Editor"
msgstr "Editor SeaMap"
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr "AutoSave LiveData"
diff --git a/i18n/po/is.po b/i18n/po/is.po
index c76a336..9eadfac 100644
--- a/i18n/po/is.po
+++ b/i18n/po/is.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2013-03-30 13:49+0000\n"
"Last-Translator: Pjetur G. Hjaltason <pjetur at pjetur.net>\n"
"Language-Team: Icelandic <is at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:44+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:44+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: is\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -447,15 +447,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "Dreifa hnútum jafnt"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Dreifa völdum hnútum á jöfnu millibili á línu."
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Sækja frá OSM..."
@@ -470,6 +473,9 @@ msgstr ""
msgid "Download data"
msgstr "Sækja gögn"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Sækja hlut..."
@@ -964,6 +970,12 @@ msgstr "Loka glugga og hætta við að sækja gögn."
msgid "Download Data"
msgstr "Sækja gögn"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1719,6 +1731,28 @@ msgstr ""
msgid "Notes"
msgstr "Athugasemd"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1728,6 +1762,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "Sækja OSM"
@@ -2310,134 +2347,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - Hlutum sem breytt hefur verið"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - Valdir hlutir"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - Ókláraðir hlutir"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - Hlutir án eiginda"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr "<b>child <i>segð</i></b> - allir undirhlutir sem passa við segðina"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr "<b>parent <i>segð</i></b> - allir yfirhlutir sem passa við segðina"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Notaðu <b>|</b> eða <b>OR</b> t.d. „A | B“ til að leita að A eða B"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Notaðu <b>(</b> og <b>)</b> til að sameina segðir"
-
msgid "basic examples"
msgstr ""
@@ -2477,6 +2386,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2492,12 +2407,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2534,7 +2443,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2546,6 +2460,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3884,7 +3801,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4524,6 +4441,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4584,6 +4504,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5974,9 +5897,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6849,8 +6769,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<mismunandi>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr ""
@@ -6867,6 +6797,12 @@ msgstr "Stak í"
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr "<mismunandi>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6997,6 +6933,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7726,18 +7672,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7746,6 +7695,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8775,6 +8727,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10745,6 +10700,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11386,6 +11347,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14120,6 +14089,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14223,6 +14195,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14350,6 +14325,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14972,11 +14950,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15294,6 +15267,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15997,15 +15975,34 @@ msgstr ""
msgid "deciduous"
msgstr "laufskógur"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17253,6 +17250,12 @@ msgstr "Siglingarleið ferju"
msgid "Marina"
msgstr "Smábátahöfn"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr "Bryggja"
@@ -17651,6 +17654,12 @@ msgstr "Bílaþvottastöð"
msgid "Car Dealer"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Repair"
msgstr ""
@@ -17663,12 +17672,6 @@ msgstr ""
msgid "Rental"
msgstr "Leiga"
-msgid "Second hand"
-msgstr ""
-
-msgid "only"
-msgstr ""
-
msgid "Sharing"
msgstr ""
@@ -17878,6 +17881,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17933,9 +17939,6 @@ msgstr ""
msgid "Building"
msgstr "Bygging"
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18062,7 +18065,7 @@ msgstr "Stjörnur"
msgid "Motel"
msgstr "Vegahótel"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18707,9 +18710,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18883,6 +18883,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19630,9 +19642,6 @@ msgstr "Viti"
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22188,6 +22197,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22354,36 +22373,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23502,6 +23491,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23556,6 +23551,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24165,6 +24188,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24479,9 +24505,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25520,6 +25561,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr "Mælingar"
@@ -27624,6 +27668,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/it.po b/i18n/po/it.po
index 3d91809..00a8f8c 100644
--- a/i18n/po/it.po
+++ b/i18n/po/it.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm 20081003\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2015-03-30 13:27+0000\n"
"Last-Translator: Sbiribizio <ftambussa at gmail.com>\n"
"Language-Team: Italian <talk-it at lists.openstreetmap.org>\n"
@@ -12,8 +12,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:46+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:45+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: it\n"
"X-Language: it_IT\n"
"X-Source-Language: en\n"
@@ -468,15 +468,18 @@ msgstr "Commuta pannello finestre"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Commuta pannello finestre, massimizza visualizzazione mappa"
-msgid "Distribute Nodes"
-msgstr "Disponi i nodi"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Disponi i nodi a distanze regolari lungo una linea"
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Ignoro {0} nodi con coordinate nulle"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Scarica da OSM..."
@@ -493,6 +496,9 @@ msgstr ""
msgid "Download data"
msgstr "Scarica dati"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Scarica oggetto..."
@@ -1046,6 +1052,12 @@ msgstr "Chiudi la finestra e annulla lo scaricamento"
msgid "Download Data"
msgstr "Scarica dati"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Ok"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1885,6 +1897,28 @@ msgstr "Scaricamento note"
msgid "Notes"
msgstr "Annotazioni"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr "Scarica modifica OSM compressa"
@@ -1894,6 +1928,9 @@ msgstr "Scarica modifica OSM"
msgid "Download Compressed OSM"
msgstr "Scarica OSM compresso"
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "Scarica OSM"
@@ -2544,175 +2581,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Espressione di ricerca non valida"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Via Roma</b> - ''Via'' e ''Roma'' in qualsiasi chiave"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Via Roma\"</b> - ''Via Roma'' in qualsiasi chiave"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Rom</b> - ''Rom'' in qualsiasi punto della chiave ''key''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Rom</b> - ''Rom'' in nessun punto della chiave ''key''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - chiave ''key'' con il valore esatto ''value''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - chiave ''key'' contenente qualsiasi valore. Provare anche "
-"<b>*=value</b>, <b>key=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - chiave ''key'' valorizzata con qualsiasi valore"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>key?</b> - chiave ''key'' con il valore ''yes'', ''true'', ''1'' oppure "
-"''on''"
-
-msgid "Special targets"
-msgstr "Obiettivi speciali"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - oggetti di tipo corrispondente (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - oggetti modificati da uno specifico utente"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - oggetti modificati da utenti anonimi"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-"<b>id:</b>... - oggetti con un identificativo specifico (0 per i nuovi "
-"oggetti)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - oggetti con una versione specifica (0 per gli oggetti "
-"senza alcuna versione assegnata)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - oggetti con l''ID del gruppo di modifiche specificato "
-"(0 per gli oggetti senza un gruppo di modifiche assegnato)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - oggetti contenenti un numero di nodi specifico "
-"(<b>nodes:</b>numero, <b>nodes:</b>min-max, <b>nodes:</b>min- oppure "
-"<b>nodes:</b>-max)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - oggetti contenenti un numero di etichette specifico "
-"(<b>tags:</b>numero, <b>tags:</b>min-max, <b>tags:</b>min- oppure "
-"<b>tags:</b>-max)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-"<b>role:</b>... - oggetti che assumono un ruolo specifico all''interno di "
-"una relazione"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>marca temporale - oggetti con quest''ultima marca temporale "
-"di modifica (2009-11-12T14:51:09Z, 2009-11-12 oppure T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-"<b>timestamp:</b>min/max - oggetti con l''ultima modifica nell’intervallo"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - percorsi chiusi con una specifica area in m² "
-"(<b>areasize:</b>min-max oppure <b>areasize:</b>max)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - tutti gli oggetti modificati"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - tutti gli oggetti selezionati"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - tutti gli oggetti incompleti"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - tutti gli oggetti privi di etichette"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-"<b>closed</b> - tutti i percorsi chiusi (un nodo non è considerato chiuso)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>espressione</i></b> - tutti i figli degli oggetti corrispondenti "
-"all''espressione"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>espressione</i></b> - tutti gli elementi da cui dipendono gli "
-"oggetti corrispondenti all''espressione"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - gli oggetti (e tutti i loro nodi di percorso "
-"/ membri di relazione) presenti all''interno dell''area scaricata"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - gli oggetti (e tutti i loro nodi di percorso / membri "
-"di relazione) presenti all''interno della visualizzazione corrente"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-"Utilizzare <b>|</b> oppure <b>OR</b> per combinare secondo l''operatore "
-"logico ''or''"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Utilizza <b>\"</b> per delimitare gli operatori (es. se la chiave contiene "
-"<b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"All’interno delle stringhe delimitate da virgolette i caratteri <b>\"</b> e "
-"<b>\\</b> devono essere preceduti da <b>\\</b> (es. <b>\\\"</b> e <b>\\\\"
-"</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Utilizzare <b>(</b> e <b>)</b> per raggruppare le espressioni"
-
msgid "basic examples"
msgstr "esempi di base"
@@ -2753,6 +2621,15 @@ msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
"corrisponde se ''key'' è più grande di ''value'' (analogamente se minore)"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"per delimitare gli operatori.<br>All''interno delle stringhe delimitate i "
+"caratteri <b>\"</b> e <b>\\</b> devono essere marcati facendoli precedere da "
+"<b>\\</b> (es. <b>\\\"</b> e <b>\\\\</b>)."
+
msgid "combinators"
msgstr "combinatori"
@@ -2768,15 +2645,6 @@ msgstr "negazione logica"
msgid "use parenthesis to group expressions"
msgstr "utilizzare le parentesi per raggruppare le espressioni"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"per delimitare gli operatori.<br>All''interno delle stringhe delimitate i "
-"caratteri <b>\"</b> e <b>\\</b> devono essere marcati facendoli precedere da "
-"<b>\\</b> (es. <b>\\\"</b> e <b>\\\\</b>)."
-
msgid "objects"
msgstr "oggetti"
@@ -2813,8 +2681,13 @@ msgstr "oggetti con l''ultima marca temporale di modifica nell''intervallo"
msgid "properties"
msgstr "proprietà"
-msgid "objects with at least 20 nodes"
-msgstr "oggetti con almeno 20 nodi"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "oggetti aventi dalle 5 alle 10 etichette"
@@ -2825,6 +2698,9 @@ msgstr "oggetti con dato ruolo in una relazione"
msgid "closed ways with an area of 100 m²"
msgstr "percorsi chiusi con un''area di 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr "stato"
@@ -4313,8 +4189,8 @@ msgstr ""
"è uguale a qualche attributo ''name:*'' e non è una combinazione di "
"attributi ''name:*'' (es. ''Italia - Italien - Italy'')."
-msgid "A name:* translation is missing."
-msgstr "Manca una traduzione per name:*."
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "Manca un nome, nonostante esista name:*."
@@ -4993,6 +4869,9 @@ msgstr "Visualizza la versione di JOSM ed esce"
msgid "Print debugging messages to console"
msgstr "Visualizza i messaggi di debug sulla console"
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr "Disabilita accesso alle risorse specificate, separate da virgola"
@@ -5062,6 +4941,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr "Visualizzazione dei messaggi di debug su console"
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr "Livello di debug di dettaglio abilitato (traccia)"
@@ -6634,9 +6516,6 @@ msgstr "Lat/Lon"
msgid "East/North"
msgstr "Est/Nord"
-msgid "Ok"
-msgstr "Ok"
-
msgid "Please enter a GPS coordinates"
msgstr "Si prega di inserire delle coordinate GPS"
@@ -7605,8 +7484,18 @@ msgstr "Chiave scartabile: primo piano"
msgid "Discardable key: background"
msgstr "Chiave scartabile: sfondo"
-msgid "<different>"
-msgstr "<diverso>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr "Selezionare gli oggetti per i quali modificare le etichette."
@@ -7623,6 +7512,12 @@ msgstr "Membro di"
msgid "Position"
msgstr "Posizione"
+msgid "<different>"
+msgstr "<diverso>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Etichette: {0} / Appartenenze: {1}"
@@ -7757,6 +7652,16 @@ msgstr "Imposta il numero delle etichette aggiunte di recente"
msgid "Remember last used tags after a restart"
msgstr "Ricorda le ultime etichette usati, dopo il riavvio"
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
"Si prega di inserire il numero delle etichette aggiunte di recente da "
@@ -8593,18 +8498,21 @@ msgstr "Oggetto"
msgid "not present"
msgstr "non presente"
-msgid "Changeset:"
-msgstr "Gruppo di modifiche:"
-
msgid "Changeset comment"
msgstr "Commento al gruppo di modifiche"
msgid "Changeset source"
msgstr "Sorgente gruppo di modifiche"
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr "<b>Sorgente</b>:"
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8616,6 +8524,9 @@ msgid ""
msgstr ""
"<html>Versione <strong>{0}</strong> creata il <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "Informazioni sul gruppo di modifiche"
@@ -9821,6 +9732,9 @@ msgstr "Scala pixel: {0}"
msgid "Best zoom: {0}"
msgstr "Migliore ingrandimento: {0}"
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "Livello TMS ({0}), scaricamento nell''ingrandimento {1}"
@@ -12077,6 +11991,12 @@ msgstr "Aggiungi al selezionatore slippymap: "
msgid "Tile cache directory: "
msgstr "Cartella di cache per i tasselli: "
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12808,6 +12728,14 @@ msgstr "Verificare periodicamente se ci sono nuovi messaggi"
msgid "Check interval (minutes):"
msgstr "Intervallo di controllo (minuti):"
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
"Fallito l''ottenimento del token di accesso OAuth dal gestore delle "
@@ -16024,6 +15952,9 @@ msgstr "Geoimage.at MaxRes"
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (mappa base)"
@@ -16128,6 +16059,9 @@ msgstr "Estonia Cadastre (Maaamet)"
msgid "Estonia Forestry (Maaamet)"
msgstr "Estonia Forestry (Maaamet)"
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
@@ -16258,6 +16192,9 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Antenne (10 cm)"
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Drone Imagery (Haiti)"
@@ -16880,13 +16817,6 @@ msgid "Landsat 233055"
msgstr "Landsat 233055"
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"Permette di modificare le informazioni sul traffico e di esportarle per il "
-"simulatore di mobilità urbana SUMO"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -17308,6 +17238,13 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "Modifica caratteristiche per OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Permette di modificare le informazioni sul traffico e di esportarle per il "
+"simulatore di mobilità urbana SUMO"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
"Permetti l''aggiunta di contrassegni/nodi alle posizioni gps correnti."
@@ -18043,15 +17980,34 @@ msgstr "Ciclo"
msgid "deciduous"
msgstr "deciduo (caducifoglie)"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr "sempreverde"
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr "semi deciduo"
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr "semi sempreverde"
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahaista"
@@ -19328,6 +19284,12 @@ msgstr "Itinerario traghetto"
msgid "Marina"
msgstr "Porto turistico"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "pubblico"
+
msgid "Pier"
msgstr "Passerella"
@@ -19728,6 +19690,12 @@ msgstr "Autolavaggio"
msgid "Car Dealer"
msgstr "Concessionaria"
+msgid "Second hand"
+msgstr "Usate"
+
+msgid "only"
+msgstr "solo"
+
msgid "Repair"
msgstr "Autofficina"
@@ -19740,12 +19708,6 @@ msgstr "Pneumatici"
msgid "Rental"
msgstr "Noleggio"
-msgid "Second hand"
-msgstr "Usate"
-
-msgid "only"
-msgstr "solo"
-
msgid "Sharing"
msgstr "Condivisione"
@@ -19955,6 +19917,9 @@ msgstr "Punto di fermata"
msgid "Platform"
msgstr "Banchina"
+msgid "Subway Entrance"
+msgstr "Ingresso metropolitana"
+
msgid "Station or amenities"
msgstr "Stazione o strutture di servizio"
@@ -20010,9 +19975,6 @@ msgstr "Stazione"
msgid "Building"
msgstr "Palazzo"
-msgid "Subway Entrance"
-msgstr "Ingresso metropolitana"
-
msgid "Ticket Machine"
msgstr "Biglietteria automatica"
@@ -20139,8 +20101,8 @@ msgstr "Stelle"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
-msgstr "Affittacamere/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
+msgstr ""
msgid "Chalet"
msgstr "Casetta (chalet)"
@@ -20785,9 +20747,6 @@ msgstr "Bagni"
msgid "Access rights"
msgstr "Diritti di accesso"
-msgid "public"
-msgstr "pubblico"
-
msgid "seasonal"
msgstr "stagionale"
@@ -20961,6 +20920,18 @@ msgstr "Cestino"
msgid "Waste Disposal/Dumpster"
msgstr "Cassonetto"
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr "Orario di accensione"
+
msgid "Backrest"
msgstr "Schienale"
@@ -21708,9 +21679,6 @@ msgstr "Faro"
msgid "Street Lamp"
msgstr "Lampione"
-msgid "Operation times"
-msgstr "Orario di accensione"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Lu-Ve 22:00-05:00"
@@ -24300,6 +24268,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} in un nodo. Dovrebbe essere usato in un tracciato."
@@ -24475,36 +24453,6 @@ msgstr "Mostra etichette delle strade (ad alta livello di zoom)"
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr "Esportazione OSM"
-
-msgid "Export traffic data to SUMO network file."
-msgstr "Esporta i dati del traffico su un file di rete SUMO"
-
-msgid "SUMO Export"
-msgstr "Esportazione SUMO"
-
-msgid "Export"
-msgstr "Esporta"
-
-msgid "Port:"
-msgstr "Porta:"
-
-msgid "refresh the port list"
-msgstr "aggiorna l''elenco delle porte"
-
-msgid "Configure"
-msgstr "Configura"
-
-msgid "Connection Error."
-msgstr "Errore di connessione."
-
-msgid "configure the connected DG100"
-msgstr "configura il DG100 collegato"
-
-msgid "delete data after import"
-msgstr "elimina i dati dopo l''importazione"
-
msgid "Columbus V-900 CSV Files"
msgstr "File CSV Columbus V-900"
@@ -25791,6 +25739,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr "Iterazioni di assottigliamento"
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Nome della strada:"
@@ -25846,6 +25800,34 @@ msgstr "Posizionati sull’angolo opposto dell’edificio"
msgid "Set width of the building"
msgstr "Imposta la larghezza dell’edificio"
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr "sul poligono"
@@ -26539,6 +26521,9 @@ msgstr "Solo riferimenti ({0})"
msgid "Subject only ({0})"
msgstr "Solo soggetto ({0})"
+msgid "Configure"
+msgstr "Configura"
+
msgid "Configure conflation options"
msgstr "Configura le opzioni di fusione"
@@ -26861,9 +26846,24 @@ msgstr "Disabilita il log dei dati se la distanza è minore"
msgid "Unknown logFormat"
msgstr "Formato del log sconosciuto"
+msgid "Port:"
+msgstr "Porta:"
+
+msgid "refresh the port list"
+msgstr "aggiorna l''elenco delle porte"
+
msgid "Configure Device"
msgstr "Configura dispositivo"
+msgid "Connection Error."
+msgstr "Errore di connessione."
+
+msgid "configure the connected DG100"
+msgstr "configura il DG100 collegato"
+
+msgid "delete data after import"
+msgstr "elimina i dati dopo l''importazione"
+
msgid "Importing data from device."
msgstr "Importazione dei dati dal dispositivo."
@@ -28002,6 +28002,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr "Esporta"
+
msgid "Measured values"
msgstr "Valori misurati"
@@ -30264,6 +30267,15 @@ msgstr "Limite di unione di nodi limitrofi"
msgid "SeaMap Editor"
msgstr "Editor SeaMap"
+msgid "OSM Export"
+msgstr "Esportazione OSM"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Esporta i dati del traffico su un file di rete SUMO"
+
+msgid "SUMO Export"
+msgstr "Esportazione SUMO"
+
msgid "AutoSave LiveData"
msgstr "Salvataggio automatico LiveData"
diff --git a/i18n/po/ja.po b/i18n/po/ja.po
index 2a4802b..771318d 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: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-03-27 16:35+0000\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-06 03:26+0000\n"
"Last-Translator: fujimoto <fujimoto at internet.ne.jp>\n"
"Language-Team: Japanese <tr at openstreetmap.jp>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:46+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:46+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"X-Poedit-Country: JAPAN\n"
"Language: ja\n"
"X-Poedit-Language: Japanese\n"
@@ -450,15 +450,18 @@ msgstr "ダイアログパネルの表示/非表示"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "ダイアログパネルの表示/非表示を切り替え、地図ビューを最大化"
-msgid "Distribute Nodes"
-msgstr "ノードを等間隔に配置"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "直線に沿って、選択したノードを等間隔に配置します。"
msgid "Ignoring {0} nodes with null coordinates"
msgstr "座標を持たない{0}件のノードを無視"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "OSMからダウンロード..."
@@ -473,6 +476,9 @@ msgstr "<html>この操作には、{0}回の独立したダウンロードリク
msgid "Download data"
msgstr "データのダウンロード"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "オブジェクトをダウンロード..."
@@ -972,6 +978,12 @@ msgstr "ダイアログを閉じてダウンロードをキャンセル"
msgid "Download Data"
msgstr "データをダウンロード"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "OK"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1725,6 +1737,28 @@ msgstr "メモをダウンロード中"
msgid "Notes"
msgstr "メモ"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr "OSMの変更を圧縮形式でダウンロード"
@@ -1734,6 +1768,9 @@ msgstr "OSMの変更をダウンロード"
msgid "Download Compressed OSM"
msgstr "OSMを圧縮形式でダウンロード"
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "OSMをダウンロード"
@@ -2321,148 +2358,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "検索条件が無効です"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Baker Street</b> - ''Baker'' と ''Street'' をキー名に含む"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' をキー名に含む"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Bak</b> - ''key'' の一部に ''Bak'' を含む"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Bak</b> - ''key'' に ''Bak'' を含まない"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - キー ''key'' は完全に ''value'' と一致"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - 任意の値を持つキー ''key'' に一致。 "
-"<b>*=value</b>、<b>key=</b>、<b>*=*</b>、<b>*=</b>も利用可"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - 任意の値を持つキー''key'' に一致"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr "<b>key?</b> - ''yes''、''true''、''1''、''on'' のいずれかの値を持つキー ''key'' に一致"
-
-msgid "Special targets"
-msgstr "特別なターゲット"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - 種別が一致するオブジェクト(<b>node</b>、<b>way</b>、<b>relation</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - userによってオブジェクトが変更された"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - 匿名ユーザーによってオブジェクトが変更された"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - 指定されたIDを持つオブジェクト(新規オブジェクトならば0)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr "<b>version:</b>... - 指定されたバージョンのオブジェクト(バージョンが割り当てられていないオブジェクトは0)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr "<b>changeset:</b>... - 指定された変更セットIDのオブジェクト(変更セットが割り当てられていないオブジェクトは0)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - 指定された数のノードを持つオブジェクト(<b>nodes:</b>count、<b>nodes:</b>min-"
-"max、<b>nodes:</b>min-、<b>nodes:</b>-max)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - 指定された数のタグを持つオブジェクト(<b>tags:</b>count、<b>tags:</b>min-"
-"max、<b>tags:</b>min-、<b>tags:</b>-max)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - リレーション中で指定されたロールを持つオブジェクト"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>timestamp - 最終更新が指定されたタイムスタンプのオブジェクト(2009-11-"
-"12T14:51:09Z、2009-11-12、T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr "<b>timestamp:</b>min/max - 最終更新が指定された範囲のオブジェクト"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - 閉じたウェイの面積をm²で指定(<b>areasize:</b>最小値-最大値 or "
-"<b>areasize:</b>最大値)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - 変更されたオブジェクトすべて"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - 選択されたオブジェクトすべて"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - すべての不完全なオブジェクト"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - タグの無いオブジェクト全て"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr "<b>closed</b> - 閉じたウェイすべて(単独のノードは閉じているとはみなされない)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr "<b>child <i>式</i></b> - 式にマッチしたオブジェクトの全ての子"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr "<b>parent <i>式</i></b> - 式にマッチしたオブジェクトの全ての親"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - ダウンロード範囲内のオブジェクト(とウェイのノード、リレーションのメンバーすべて)"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr "<b>(all)inview</b> - 現在のビュー内のオブジェクト(とウェイのノード、リレーションのメンバーすべて)"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "<b>|</b> や <b>OR</b>を、論理和をとるために使う"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr "文字列に引用符をつける場合は<b>\"</b> を使ってください(キーが<b>:</b>を含む場合など)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"引用符で囲った文字列に <b>\"</b> か <b>\\</b> を含むときには、<b>\\</b> を加えてエスケープしてください。(<b>\\"
-"\"</b> 及び <b>\\\\</b>)。"
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "グループの分類のために <b>(</b> と <b>)</b> を使用する。"
-
msgid "basic examples"
msgstr "基本例"
@@ -2502,6 +2397,14 @@ msgstr "''key''が存在すればマッチ"
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr "''key''が''value''より大きければマッチ(簡単に言えば、未満)"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"引用符。<br>引用符の中では、 <b>\"</b> や <b>\\</b> の文字は、前に <b>\\</b> "
+"を付けてエスケープする必要があります(例: <b>\\\"</b> や <b>\\\\</b>)。"
+
msgid "combinators"
msgstr "演算子"
@@ -2517,14 +2420,6 @@ msgstr "論理否定"
msgid "use parenthesis to group expressions"
msgstr "条件をグループ化するために括弧を使用"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"引用符。<br>引用符の中では、 <b>\"</b> や <b>\\</b> の文字は、前に <b>\\</b> "
-"を付けてエスケープする必要があります(例: <b>\\\"</b> や <b>\\\\</b>)。"
-
msgid "objects"
msgstr "オブジェクト"
@@ -2561,8 +2456,13 @@ msgstr "最終更新日時が範囲内のオブジェクト"
msgid "properties"
msgstr "プロパティ"
-msgid "objects with at least 20 nodes"
-msgstr "20個以上のノードを持つオブジェクト"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "5～10個のタグを持つオブジェクト"
@@ -2573,6 +2473,9 @@ msgstr "リレーションの中でロールを与えられたオブジェクト
msgid "closed ways with an area of 100 m²"
msgstr "100㎡以上の面積を持った閉じたウェイ"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr "状態"
@@ -3912,8 +3815,8 @@ msgstr ""
"この検査は、 ''name'' 属性がどの ''name:*'' とも等しくなく、''name:*'' "
"を構成するものではない多言語のオブジェクトを探します。例: Italia - Italien - Italy"
-msgid "A name:* translation is missing."
-msgstr "name:* に不備があります。"
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "name:*があるにも関わらずnameがありません。"
@@ -4551,6 +4454,9 @@ msgstr "JOSMのバージョンを表示し終了"
msgid "Print debugging messages to console"
msgstr "デバッグメッセージをコンソールに表示"
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr "指定されたリソースへのアクセスを無効化、コンマ区切り"
@@ -4611,6 +4517,9 @@ msgstr "--selectionを使った場合、一部のデータだけをロードす
msgid "Printing debugging messages to console"
msgstr "コンソールにデバッグメッセージを出力しています"
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr "詳細デバッグレベル(トレース)を有効にしました"
@@ -6032,9 +5941,6 @@ msgstr "緯度/経度"
msgid "East/North"
msgstr "東/北"
-msgid "Ok"
-msgstr "OK"
-
msgid "Please enter a GPS coordinates"
msgstr "GPS座標を入力してください"
@@ -6916,8 +6822,18 @@ msgstr "削除可能なキー: 前景色"
msgid "Discardable key: background"
msgstr "削除可能なキー: 背景色"
-msgid "<different>"
-msgstr "<差異あり>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr "タグを変更するオブジェクトを選択してください。"
@@ -6934,6 +6850,12 @@ msgstr "メンバー"
msgid "Position"
msgstr "位置"
+msgid "<different>"
+msgstr "<差異あり>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "タグ: {0}件／所属: {1}件"
@@ -7060,6 +6982,16 @@ msgstr "最近追加されたタグの数を設定"
msgid "Remember last used tags after a restart"
msgstr "再起動時に最後に使用したタグを記憶"
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr "最近追加されたタグの表示数を入力してください"
@@ -7812,18 +7744,21 @@ msgstr "オブジェクト"
msgid "not present"
msgstr "存在しません"
-msgid "Changeset:"
-msgstr "変更セット:"
-
msgid "Changeset comment"
msgstr "変更セットのコメント"
msgid "Changeset source"
msgstr "変更セットのソース"
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr "<b>ソース</b>:"
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr "<html>レイヤー ''{1}'' で編集しているバージョン <strong>{0}</strong></html>"
@@ -7832,6 +7767,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr "<html>バージョン <strong>{0}</strong> 作成日 <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "変更セット情報"
@@ -8891,6 +8829,9 @@ msgstr "ピクセルの倍率: {0}"
msgid "Best zoom: {0}"
msgstr "最適倍率: {0}"
+msgid "Cache stats: {0}"
+msgstr "キャッシュ状況: {0}"
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "TMSレイヤー({0})、ズーム{1}をダウンロード中"
@@ -10920,6 +10861,12 @@ msgstr "スリッピーマップに追加: "
msgid "Tile cache directory: "
msgstr "タイルキャッシュの保存フォルダ: "
+msgid "Maximum concurrent downloads: "
+msgstr "最大同時ダウンロード数: "
+
+msgid "Maximum elements in disk cache: "
+msgstr "最大ディスクキャッシュ項目数: "
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11309,7 +11256,7 @@ msgid "Projection bounds (in degrees)"
msgstr "投影範囲(角度)"
msgid "Sets the SRS=... parameter in the WMS request"
-msgstr ""
+msgstr "WMSリクエストにSRS=...パラメーターを設定"
msgid "Gauß-Krüger"
msgstr "Gauß-Krüger"
@@ -11582,6 +11529,14 @@ msgstr "定期的に新しいメッセージを確認"
msgid "Check interval (minutes):"
msgstr "確認間隔(分):"
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr "認証マネージャーからOAuthアクセストークンの取得に失敗しました"
@@ -14337,52 +14292,52 @@ msgid "Strava running heatmap"
msgstr "Strava running heatmap"
msgid "Locator Overlay"
-msgstr ""
+msgstr "Locator Overlay"
msgid "QA No Address"
-msgstr ""
+msgstr "QA No Address"
msgid "Waymarked Trails: Hiking"
-msgstr ""
+msgstr "Waymarked Trails: Hiking"
msgid "Waymarked Trails: Cycling"
-msgstr ""
+msgstr "Waymarked Trails: Cycling"
msgid "Waymarked Trails: MTB"
-msgstr ""
+msgstr "Waymarked Trails: MTB"
msgid "Waymarked Trails: Skating"
-msgstr ""
+msgstr "Waymarked Trails: Skating"
msgid "Waymarked Trails: Horse Riding"
-msgstr ""
+msgstr "Waymarked Trails: Horse Riding"
msgid "Waymarked Trails: Winter Sports"
-msgstr ""
+msgstr "Waymarked Trails: Winter Sports"
msgid "OSM Inspector: Geometry"
-msgstr ""
+msgstr "OSM Inspector: Geometry"
msgid "OSM Inspector: Tagging"
-msgstr ""
+msgstr "OSM Inspector: Tagging"
msgid "OSM Inspector: Places"
-msgstr ""
+msgstr "OSM Inspector: Places"
msgid "OSM Inspector: Highways"
-msgstr ""
+msgstr "OSM Inspector: Highways"
msgid "OSM Inspector: Multipolygon"
-msgstr ""
+msgstr "OSM Inspector: Multipolygon"
msgid "OSM Inspector: Routing"
-msgstr ""
+msgstr "OSM Inspector: Routing"
msgid "OSM Inspector: Addresses"
-msgstr ""
+msgstr "OSM Inspector: Addresses"
msgid "OSM Inspector: Boundaries (EU)"
-msgstr ""
+msgstr "OSM Inspector: Boundaries (EU)"
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI black-and-white 2.5m"
@@ -14393,6 +14348,9 @@ msgstr "Geoimage.at MaxRes"
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (base map)"
@@ -14497,6 +14455,9 @@ msgstr "Estonia Cadastre (Maaamet)"
msgid "Estonia Forestry (Maaamet)"
msgstr "Estonia Forestry (Maaamet)"
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
@@ -14628,6 +14589,9 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Drone Imagery (Haiti)"
@@ -14650,13 +14614,13 @@ msgid "OSMIE EDs"
msgstr "OSMIE EDs"
msgid "OSMIE Civil Parishes"
-msgstr ""
+msgstr "OSMIE Civil Parishes"
msgid "OSMIE Baronies"
-msgstr ""
+msgstr "OSMIE Baronies"
msgid "OSMIE Political"
-msgstr ""
+msgstr "OSMIE Political"
msgid "Ireland EEA GMES Urban Atlas"
msgstr "Ireland EEA GMES Urban Atlas"
@@ -14665,7 +14629,7 @@ msgid "Ireland EEA CORINE 2006"
msgstr "Ireland EEA CORINE 2006"
msgid "Antrim Civil Parishes and Baronies"
-msgstr ""
+msgstr "Antrim Civil Parishes and Baronies"
msgid "Memorial Atlas of Ireland (1901) L.J. Richards"
msgstr "Memorial Atlas of Ireland (1901) L.J. Richards"
@@ -14677,40 +14641,40 @@ msgid "Clare Civil Parishes and Baronies"
msgstr "Clare Civil Parishes and Baronies"
msgid "Dublin Civil Parishes and Baronies"
-msgstr ""
+msgstr "Dublin Civil Parishes and Baronies"
msgid "Fermanagh Civil Parishes and Baronies"
-msgstr ""
+msgstr "Fermanagh Civil Parishes and Baronies"
msgid "Galway Civil Parishes and Baronies"
-msgstr ""
+msgstr "Galway Civil Parishes and Baronies"
msgid "Kildare Civil Parishes and Baronies"
-msgstr ""
+msgstr "Kildare Civil Parishes and Baronies"
msgid "Leitrim Civil Parishes and Baronies"
-msgstr ""
+msgstr "Leitrim Civil Parishes and Baronies"
msgid "Longford Civil Parishes and Baronies"
-msgstr ""
+msgstr "Longford Civil Parishes and Baronies"
msgid "Offaly Civil Parishes and Baronies"
-msgstr ""
+msgstr "Offaly Civil Parishes and Baronies"
msgid "Sligo Civil Parishes and Baronies"
-msgstr ""
+msgstr "Sligo Civil Parishes and Baronies"
msgid "Tyrone Civil Parishes and Baronies"
-msgstr ""
+msgstr "Tyrone Civil Parishes and Baronies"
msgid "Westmeath Civil Parishes and Baronies"
-msgstr ""
+msgstr "Westmeath Civil Parishes and Baronies"
msgid "Wexford Civil Parishes and Baronies"
-msgstr ""
+msgstr "Wexford Civil Parishes and Baronies"
msgid "Wicklow Civil Parishes and Baronies"
-msgstr ""
+msgstr "Wicklow Civil Parishes and Baronies"
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
@@ -14863,10 +14827,10 @@ msgid "Slovakia Historic Maps"
msgstr "Slovakia Historic Maps"
msgid "RABA-KGZ: Slovenia farmland use"
-msgstr ""
+msgstr "RABA-KGZ: Slovenia farmland use"
msgid "RABA-KGZ: Slovenia built-up areas"
-msgstr ""
+msgstr "RABA-KGZ: Slovenia built-up areas"
msgid "South Africa CD:NGI Aerial"
msgstr "South Africa CD:NGI Aerial"
@@ -15250,11 +15214,6 @@ msgid "Landsat 233055"
msgstr "Landsat 233055"
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr "交通情報を編集可能にし、道路交通シミュレーションソフトSUMOにエクスポートします。"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr "単一のダイアログでグループの共通の住所を補完入力します。オプションで自動的にウェイから独立した住居番号を作成します。"
@@ -15595,6 +15554,11 @@ msgstr "極端な鈍角上のノードを取り除いてエリアを簡素化し
msgid "Edit features for OpenSeaMap"
msgstr "OpenSeaMapの編集機能"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr "交通情報を編集可能にし、道路交通シミュレーションソフトSUMOにエクスポートします。"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "現在のGPS位置上にマーカー/ノードの追加を許可"
@@ -15740,52 +15704,52 @@ msgid "Smoothness"
msgstr "滑らかさ"
msgid "excellent"
-msgstr ""
+msgstr "とても良い"
msgid "Thin Rollers: rollerblade, skateboard"
-msgstr ""
+msgstr "細い車輪: ローラーブレード、スケートボード"
msgid "good"
-msgstr ""
+msgstr "良い"
msgid "Thin Wheels: racing bike"
-msgstr ""
+msgstr "細い車輪: レース用自転車"
msgid "intermediate"
-msgstr ""
+msgstr "中間"
msgid "Wheels: city bike, wheelchair, scooter"
-msgstr ""
+msgstr "車輪: 普通の自転車、車いす、スクーター"
msgid "bad"
-msgstr ""
+msgstr "悪い"
msgid "Robust Wheels: trekking bike, car, rickshaw"
-msgstr ""
+msgstr "太い車輪: トレッキングバイク、自動車、人力車"
msgid "very_bad"
-msgstr ""
+msgstr "とても悪い"
msgid "High Clearance: light duty off-road vehicle"
-msgstr ""
+msgstr "車高が高い: 軽量オフロード車"
msgid "horrible"
-msgstr ""
+msgstr "困難"
msgid "Off-Road: heavy duty off-road vehicle"
-msgstr ""
+msgstr "オフロード車: 重量オフロード車"
msgid "very_horrible"
-msgstr ""
+msgstr "とても困難"
msgid "Specialized off-road: tractor, ATV"
-msgstr ""
+msgstr "特殊なオフロード車: トラクター、バギー"
msgid "impassable"
-msgstr ""
+msgstr "通行不能"
msgid "No wheeled vehicle"
-msgstr ""
+msgstr "車輪付きの車両では不可"
msgctxt "riding"
msgid "pitch"
@@ -16173,7 +16137,7 @@ msgstr "ラグビー"
msgctxt "sport"
msgid "running"
-msgstr ""
+msgstr "ランニング"
msgctxt "sport"
msgid "shooting"
@@ -16309,15 +16273,34 @@ msgstr "サイクル"
msgid "deciduous"
msgstr "広葉樹林"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr "一年の中で一定の期間、植物に葉がなくなる"
+
msgid "evergreen"
msgstr "常緑樹"
+msgid "Plants that are never entirely without green foliage."
+msgstr "緑を失うことがない植物です。"
+
msgid "semi_deciduous"
msgstr "半落葉樹"
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr "古い葉が落ちて新しい葉に生え変わるまでの短期間だけ落葉する植物です。"
+
msgid "semi_evergreen"
msgstr "半常緑樹"
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr "年間で一部の時期に、一部を残して多くの葉が落葉する植物です。"
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr "常緑樹と落葉樹が混在している植生です。"
+
msgid "bahai"
msgstr "バハーイ教"
@@ -16388,7 +16371,7 @@ msgid "mormon"
msgstr "モルモン"
msgid "old_catholic"
-msgstr ""
+msgstr "古代カトリック"
msgid "orthodox"
msgstr "ギリシャ正教系"
@@ -16516,25 +16499,25 @@ msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "永続的な水域ではない（季節によってなくなる）？"
msgid "culvert"
-msgstr ""
+msgstr "カルバート"
msgid "Water access rules:"
msgstr ""
msgid "Ship"
-msgstr ""
+msgstr "船"
msgid "designated"
msgstr "標示あり"
msgid "Boat"
-msgstr ""
+msgstr "ボート"
msgid "Motorboat"
-msgstr ""
+msgstr "モーターボート"
msgid "Canoe"
-msgstr ""
+msgstr "カヌー"
msgid "Streets"
msgstr "ストリート"
@@ -17012,22 +16995,22 @@ msgid "Ramp"
msgstr "ランプ"
msgid "Stroller ramp"
-msgstr ""
+msgstr "ベビーカー用のスロープ"
msgid "Bicycle ramp"
-msgstr ""
+msgstr "自転車用のスロープ"
msgid "Wheelchair ramp"
-msgstr ""
+msgstr "車いす用のスロープ"
msgid "Luggage ramp"
-msgstr ""
+msgstr "キャリーバッグ用スロープ"
msgid "automatic"
-msgstr ""
+msgstr "自動"
msgid "manual"
-msgstr ""
+msgstr "マニュアル"
msgid "Handrail"
msgstr "手すり"
@@ -17567,6 +17550,12 @@ msgstr "フェリー航路"
msgid "Marina"
msgstr "マリーナ"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "公開"
+
msgid "Pier"
msgstr "桟橋"
@@ -17965,6 +17954,12 @@ msgstr "洗車場"
msgid "Car Dealer"
msgstr "自動車販売店"
+msgid "Second hand"
+msgstr "中古品(セコハン)"
+
+msgid "only"
+msgstr "限定"
+
msgid "Repair"
msgstr "修理工場"
@@ -17977,12 +17972,6 @@ msgstr "タイヤ"
msgid "Rental"
msgstr "レンタル店"
-msgid "Second hand"
-msgstr "中古品(セコハン)"
-
-msgid "only"
-msgstr "限定"
-
msgid "Sharing"
msgstr "カーシェアリング"
@@ -18192,6 +18181,9 @@ msgstr "停止位置"
msgid "Platform"
msgstr "プラットホーム"
+msgid "Subway Entrance"
+msgstr "地下鉄の出入口"
+
msgid "Station or amenities"
msgstr "駅や設備"
@@ -18247,9 +18239,6 @@ msgstr "駅"
msgid "Building"
msgstr "建物"
-msgid "Subway Entrance"
-msgstr "地下鉄の出入口"
-
msgid "Ticket Machine"
msgstr "券売機"
@@ -18376,8 +18365,8 @@ msgstr "星の数"
msgid "Motel"
msgstr "モーテル"
-msgid "Guest House/Bed & Breakfast"
-msgstr "ゲストハウス/B&B"
+msgid "Guest House/Bed & Breakfast"
+msgstr ""
msgid "Chalet"
msgstr "貸別荘"
@@ -19021,9 +19010,6 @@ msgstr "トイレ"
msgid "Access rights"
msgstr "利用者"
-msgid "public"
-msgstr "公開"
-
msgid "seasonal"
msgstr "季節限定"
@@ -19197,6 +19183,18 @@ msgstr "ゴミ箱"
msgid "Waste Disposal/Dumpster"
msgstr "ゴミ集積所"
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr "営業時間"
+
msgid "Backrest"
msgstr "背もたれ"
@@ -19944,9 +19942,6 @@ msgstr "灯台"
msgid "Street Lamp"
msgstr "街灯"
-msgid "Operation times"
-msgstr "営業時間"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Mo-Fr 22:00-05:00"
@@ -22503,6 +22498,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0}がノードに設定されています。ウェイに設定するべきです。"
@@ -22669,36 +22674,6 @@ msgstr "通りのラベルを表示(大きいズームの時)"
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr "OSMエクスポート"
-
-msgid "Export traffic data to SUMO network file."
-msgstr "交通データをSUMOネットワークファイルにエクスポートします。"
-
-msgid "SUMO Export"
-msgstr "SUMOエクスポート"
-
-msgid "Export"
-msgstr "エクスポート"
-
-msgid "Port:"
-msgstr "ポート:"
-
-msgid "refresh the port list"
-msgstr "ポートのリストを更新する。"
-
-msgid "Configure"
-msgstr "設定"
-
-msgid "Connection Error."
-msgstr "接続エラー"
-
-msgid "configure the connected DG100"
-msgstr "接続されたDG100の設定"
-
-msgid "delete data after import"
-msgstr "インポート後データを削除"
-
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSVファイル"
@@ -23910,6 +23885,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "通り名:"
@@ -23964,6 +23945,34 @@ msgstr "建物の対角をクリック"
msgid "Set width of the building"
msgstr "建物の幅を設定"
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr "ポリゴン上"
@@ -24614,6 +24623,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "設定"
+
msgid "Configure conflation options"
msgstr ""
@@ -24932,9 +24944,24 @@ msgstr "距離が次以下になったらデータ取得をやめる:"
msgid "Unknown logFormat"
msgstr "データ記録フォーマットが不明です"
+msgid "Port:"
+msgstr "ポート:"
+
+msgid "refresh the port list"
+msgstr "ポートのリストを更新する。"
+
msgid "Configure Device"
msgstr "デバイスの設定"
+msgid "Connection Error."
+msgstr "接続エラー"
+
+msgid "configure the connected DG100"
+msgstr "接続されたDG100の設定"
+
+msgid "delete data after import"
+msgstr "インポート後データを削除"
+
msgid "Importing data from device."
msgstr "デバイスからデータをインポート"
@@ -26002,6 +26029,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr "エクスポート"
+
msgid "Measured values"
msgstr "測定した値"
@@ -28135,6 +28165,15 @@ msgstr "近接するノードを結合する閾値"
msgid "SeaMap Editor"
msgstr "SeaMapエディタ"
+msgid "OSM Export"
+msgstr "OSMエクスポート"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "交通データをSUMOネットワークファイルにエクスポートします。"
+
+msgid "SUMO Export"
+msgstr "SUMOエクスポート"
+
msgid "AutoSave LiveData"
msgstr "LiveDataの自動保存"
diff --git a/i18n/po/ka.po b/i18n/po/ka.po
index 2d80f60..7d13a07 100644
--- a/i18n/po/ka.po
+++ b/i18n/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2011-12-16 00:14+0000\n"
"Last-Translator: datogogishvili <Unknown>\n"
"Language-Team: Georgian <ka at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:41+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: ka\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -449,15 +449,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "გაანაწილე მონიშნული წერტილები თანაბარ დაშორებაზე ხაზის გასწვრივ."
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "გადმოწერე OSM-დან"
@@ -472,6 +475,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "გადმოწერე ობიექტი."
@@ -966,6 +972,12 @@ msgstr "დახურე დიალოგის ფანჯარა და
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1710,6 +1722,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1719,6 +1753,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2301,134 +2338,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2468,6 +2377,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2483,12 +2398,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2525,7 +2434,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2537,6 +2451,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3870,7 +3787,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4510,6 +4427,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4568,6 +4488,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5958,9 +5881,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6829,9 +6749,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6847,6 +6777,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6977,6 +6913,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7703,18 +7649,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7723,6 +7672,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8745,6 +8697,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10709,6 +10664,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11346,6 +11307,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14074,6 +14043,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14177,6 +14149,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14304,6 +14279,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14926,11 +14904,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15247,6 +15220,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15950,15 +15928,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17206,6 +17203,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17604,22 +17607,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17831,6 +17834,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17886,9 +17892,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18015,7 +18018,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18660,9 +18663,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18836,6 +18836,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19583,9 +19595,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22141,6 +22150,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22307,36 +22326,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23455,6 +23444,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23509,6 +23504,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24118,6 +24141,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24432,9 +24458,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25473,6 +25514,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27577,6 +27621,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/km.po b/i18n/po/km.po
index c130899..e831cc1 100644
--- a/i18n/po/km.po
+++ b/i18n/po/km.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2015-01-27 10:25+0000\n"
"Last-Translator: Sophea Sok <sksophea at gmail.com>\n"
"Language-Team: Khmer <km at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:47+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:46+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -457,15 +457,18 @@ msgstr "បិទ/បើកផ្ទាំងប្រអប់បញ
msgid "Toggle dialogs panel, maximize mapview"
msgstr "បិទ/បើកផ្ទាំងប្រអប់បញ្ចូល បង្រួមអតិបរមាទិដ្ឋភាពផែនទី"
-msgid "Distribute Nodes"
-msgstr "ចែកចាយតំណ"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "ចែកចាយតំណដែលបានជ្រើសឲ្យមានចម្ងាយស្មើគ្នាតាមបន្ទាត់។"
msgid "Ignoring {0} nodes with null coordinates"
msgstr "មិនអើពើតំណ {0} ដែលមិនមានកូអរដោណេ"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "ទាញយកពី OSM..."
@@ -482,6 +485,9 @@ msgstr ""
msgid "Download data"
msgstr "ទាញយកទិន្នន័យ"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "ទាញយកវត្ថុ..."
@@ -1012,6 +1018,12 @@ msgstr "បិទប្រអប់ រួចបោះបង់កា
msgid "Download Data"
msgstr "ទាញយកទិន្នន័យ"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "យល់ព្រម"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1823,6 +1835,28 @@ msgstr "កំពុងទាញយកតំណ"
msgid "Notes"
msgstr "ចំណាំ"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr "ទាញយកការផ្លាស់ប្ដូរ OSM ដែលបានបង្ហាប់"
@@ -1832,6 +1866,9 @@ msgstr "ទាញយកការផ្លាស់ប្ដូរ OSM"
msgid "Download Compressed OSM"
msgstr "ទាញយក OSM ដែលបានបង្ហាប់"
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "ទាញយក OSM"
@@ -2447,164 +2484,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "កន្សោមស្វែងរកមិនត្រឹមត្រូវ"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - key ''key'' with value exactly ''value''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - key ''key'' កំណត់ទៅតម្លៃណាមួយ"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>key?</b> - key ''key'' ជាមួយតម្លៃ ''yes'', ''true'', ''1'' or ''on''"
-
-msgid "Special targets"
-msgstr "គោលដៅពិសេស"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - វត្ថុដែលមានប្រភេទត្រូវគ្នា (<b>តំណ</b>, <b>ផ្លូវ</b>, "
-"<b>ទំនាក់ទំនង</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - បានប្ដូរវត្ថុដោយអ្នកប្រើ"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - បានប្ដូរវត្ថុដោយអ្នកប្រើអនាមិក"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-"<b>id:</b>... - វត្ថុជាមួយលេខសម្គាល់ដែលបានផ្ដល់ (0 សម្រាប់វត្ថុថ្មី)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - វត្ថុជាមួយកំណែដែលបានផ្ដល់ (0 "
-"វត្ថុដែលមិនមានលេខកំណែ)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - វត្ថុជាមួយលេខសម្គាល់ changeset ដែលបានផ្ដល់ (0 "
-"វត្ថុដែលមិនមាន changeset)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - វត្ថុជាមួយលេខតំណដែលបានផ្ដល់ (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - វត្ថុជាមួយលេខស្លាកដែលបានផ្ដល់ (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-"<b>role:</b>... - វត្ថុជាមួយមុខងារដែលបានផ្ដល់នៅក្នុងទំនាក់ទំនង"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>timestamp - "
-"វត្ថុជាមួយត្រាពេលវេលាដែលបានកែប្រែចុងក្រោយ (2009-11-12T14:51:09Z, 2009-"
-"11-12 or T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-"<b>timestamp:</b>min/max - វត្ថុជាមួយការកែប្រែចុងក្រោយនៅក្នុងជួរ"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - "
-"បានបិទផ្លូវជាមួយក្រឡាផ្ទៃដែលបានផ្ដល់គិតជាម៉ែត្រការ៉េ "
-"(<b>areasize:</b>min-max or <b>areasize:</b>max)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - វត្ថុដែលបានប្ដូរទាំងអស់"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - វត្ថុដែលបានជ្រើសទាំងអស់"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - វត្ថុដែលមិនបានបញ្ចប់ទាំងអស់"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - វត្ថុដែលមិនបានដាក់ស្លាកទាំងអស់"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-"<b>closed</b> - ផ្លូវដែលបានបិទទាំងអស់ (តំណមិនត្រូវបានគិតថាបិទទេ)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr "<b>child <i>expr</i></b> - វត្ថុកូនទាំងអស់ដែលផ្គូផ្គងនឹងកន្សោម"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr "<b>parent <i>expr</i></b> - វត្ថុមេទាំងអស់ដែលផ្គូផ្គងនឹងកន្សោម"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - វត្ថុ "
-"(និងតំណផ្លូវ/ធាតុទំនាក់ទំនងរបស់វាទាំងអស់) ក្នុងតំបន់ដែលបានទាញយក"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - វត្ថុ (និងតំណផ្លូវ/ធាតុទំនាក់ទំនងរបស់វាទាំងអស់) "
-"ក្នុងទិដ្ឋភាពបច្ចុប្បន្ន"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "ប្រើ <b>|</b> or <b>OR</b> ដើម្បីផ្សំជាមួយឈ្នាប់ឬ"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"ដើម្បី <b>\"</b> ដើម្បីស្រង់ប្រមាណវិធី (ឧ. បើពាក្យគន្លឹះមាន <b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"ជាមួយសញ្ញាសម្រង់ <b>\"</b> និង <b>\\</b> តួអក្សរចាំបាច់ត្រូវនាំមុខដោយ "
-"<b>\\</b> (ឧ. <b>\\\"</b> និង <b>\\\\</b>)។"
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "ប្រើ <b>(</b> និង <b>)</b> ដើម្បីដាក់កន្សោមជាក្រុម"
-
msgid "basic examples"
msgstr "ឧទាហរណ៍មូលដ្ឋាន"
@@ -2644,6 +2523,15 @@ msgstr "ផ្គូផ្គង បើ ''key'' មានស្រាប់"
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr "ផ្គូផ្គង បើ ''key'' ធំជាង ''value'' (analogously, less than)"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"ដើម្បីស្រង់សញ្ញាប្រមាណវិធី។<br>ជាមួយសញ្ញាសម្រង់ <b>\"</b> និង <b>\\"
+"</b> តួអក្សរចាំបាច់ត្រូវតែនាំមុខដោយ <b>\\</b> (ឧ. <b>\\\"</b> និង <b>\\\\"
+"</b>)។"
+
msgid "combinators"
msgstr "កម្មវិធីផ្សំ"
@@ -2659,15 +2547,6 @@ msgstr "ឈ្នាប់មិន"
msgid "use parenthesis to group expressions"
msgstr "ប្រើវង់ក្រចកដើម្បីដាក់កន្សោមជាក្រុម"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"ដើម្បីស្រង់សញ្ញាប្រមាណវិធី។<br>ជាមួយសញ្ញាសម្រង់ <b>\"</b> និង <b>\\"
-"</b> តួអក្សរចាំបាច់ត្រូវតែនាំមុខដោយ <b>\\</b> (ឧ. <b>\\\"</b> និង <b>\\\\"
-"</b>)។"
-
msgid "objects"
msgstr "វត្ថុ"
@@ -2704,8 +2583,13 @@ msgstr "វត្ថុជាមួយត្រាពេលវេលា
msgid "properties"
msgstr "លក្ខណសម្បត្តិ"
-msgid "objects with at least 20 nodes"
-msgstr "វត្ថុដែលមានតំណយ៉ាងហោច២០"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "វត្ថុដែលមានស្លាកពី១០ ទៅ១៥"
@@ -2716,6 +2600,9 @@ msgstr "វត្ថុដែលមានមុខងារបាន
msgid "closed ways with an area of 100 m²"
msgstr "ផ្លូវបិទជិតដែលមានក្រឡាផ្ទៃ 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr "ស្ថានភាព"
@@ -4142,8 +4029,8 @@ msgstr ""
"''name'' មិនស្មើនឹងគុណលក្ខណៈខ្លះរបស់ ''name:*'' "
"ហើយមិនមែនជាបន្សំនៃគុណលក្ខណ ''name:*'' ឧ. Italia - Italien - Italy ។"
-msgid "A name:* translation is missing."
-msgstr "ការបកប្រែ name:* គឺបាត់។"
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "ឈ្មោះបានបាត់ ទោះបីជាមាន name:* ក៏ដោយ។"
@@ -4805,6 +4692,9 @@ msgstr "បង្ហាញកំណែ JOSM រូចចេញ"
msgid "Print debugging messages to console"
msgstr "បោះពុម្ពសារបំបាត់កំហុសទៅកុងសូល"
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr "បិទការចូលប្រើធនធានដែលបានផ្ដល់ បំបែកដោយសញ្ញាក្បៀស"
@@ -4874,6 +4764,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr "ការបោះពុម្ពសារបំបាត់កំហុសទៅកុងសូល"
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr "បានបើកកម្រិតបំបាត់កំហុសលម្អិត (តាមដាន)"
@@ -6402,9 +6295,6 @@ msgstr "រយៈបណ្ដោយ/ទទឹង"
msgid "East/North"
msgstr "កើត/ជើង"
-msgid "Ok"
-msgstr "យល់ព្រម"
-
msgid "Please enter a GPS coordinates"
msgstr "សូមបញ្ចូលកូអរដោណេជីភីអេស"
@@ -7356,8 +7246,18 @@ msgstr "ពាក្យគន្លឹះដែលអាចបោះ
msgid "Discardable key: background"
msgstr "ពាក្យគន្លឹះដែលអាចបោះបង់បាន៖ ផ្ទៃខាងក្រោយ"
-msgid "<different>"
-msgstr "<ខុសគ្នា>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr "ជ្រើសវត្ថុសម្រាប់ស្លាកដែលត្រូវប្ដូរ។"
@@ -7374,6 +7274,12 @@ msgstr "សមាជិករបស់"
msgid "Position"
msgstr "ទីតាំង"
+msgid "<different>"
+msgstr "<ខុសគ្នា>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "ស្លាក៖ {0} / សមាជិកភាព៖ {1}"
@@ -7504,6 +7410,16 @@ msgstr "កំណត់ចំនួនស្លាកដែលបា
msgid "Remember last used tags after a restart"
msgstr "ចងចាំស្លាកដែលបានប្រើចុងក្រោយបន្ទាប់ពីចាប់ផ្ដើមឡើងវិញ"
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr "សូមបញ្ចូលចំនួនស្លាកដែលបានបន្ថែមថ្មីៗដើម្បីបង្ហាញ"
@@ -8309,18 +8225,21 @@ msgstr "វត្ថុ"
msgid "not present"
msgstr "មិនមែនបច្ចុប្បន្ន"
-msgid "Changeset:"
-msgstr "សំណុំផ្លាស់ប្ដូរ៖"
-
msgid "Changeset comment"
msgstr "សេចក្ដីអធិប្បាយសំណុំផ្លាស់ប្ដូរ"
msgid "Changeset source"
msgstr "ប្រភពសំណុំផ្លាស់ប្ដូរ"
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr "<b>ប្រភព</b>៖"
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8332,6 +8251,9 @@ msgid ""
msgstr ""
"<html>កំណែ <strong>{0}</strong> បានបង្កើតនៅ <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "ព័ត៌មានសំណុំផ្លាស់ប្ដូរ"
@@ -9493,6 +9415,9 @@ msgstr "មាត្រដ្ឋានភីកសែល៖ {0}"
msgid "Best zoom: {0}"
msgstr "ការពង្រីកល្អបំផុត៖ {0}"
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "TMS ស្រទាប់ ({0}), ទាញយកការពង្រីក {1}"
@@ -11689,6 +11614,12 @@ msgstr "បន្ថែមទៅកម្មវិធីជ្រើស
msgid "Tile cache directory: "
msgstr "ថតឃ្លាំងក្រឡា៖ "
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12399,6 +12330,14 @@ msgstr "ពិនិត្យមើលសារថ្មីយូរៗ
msgid "Check interval (minutes):"
msgstr "ចន្លោះពេលពិនិត្យមើល (នាទី)៖"
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
"បានបរាជ័យក្នុងការទៅយកថូខឹនចូលដំណើរការ OAuth "
@@ -15514,6 +15453,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -15617,6 +15559,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -15744,6 +15689,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -16366,13 +16314,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"អនុញ្ញាតឲ្យកែសម្រួលព័ត៌មានចរាចរ "
-"រួចនាំចេញវាទៅកាន់កម្មវិធីក្លែងធ្វើចល័ត SUMO នៃទីក្រុង"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -16778,6 +16719,13 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"អនុញ្ញាតឲ្យកែសម្រួលព័ត៌មានចរាចរ "
+"រួចនាំចេញវាទៅកាន់កម្មវិធីក្លែងធ្វើចល័ត SUMO នៃទីក្រុង"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -17481,15 +17429,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -18737,6 +18704,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -19135,22 +19108,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -19362,6 +19335,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -19417,9 +19393,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -19546,7 +19519,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -20191,9 +20164,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -20367,6 +20337,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -21114,9 +21096,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -23672,6 +23651,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -23838,36 +23827,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24986,6 +24945,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -25040,6 +25005,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -25649,6 +25642,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -25963,9 +25959,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -27004,6 +27015,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -29108,6 +29122,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ko.po b/i18n/po/ko.po
index 196c619..ce4a567 100644
--- a/i18n/po/ko.po
+++ b/i18n/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2015-02-27 14:53+0000\n"
"Last-Translator: Yongmin Hong <revi at fastlizard4.org>\n"
"Language-Team: Korean <ko at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:48+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:47+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: ko\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr "토글 대화 패널"
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "Node 분산 배치"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "선택된 Node를 일직선상의 동일 거리에 분산 배치합니다"
msgid "Ignoring {0} nodes with null coordinates"
msgstr "좌표가 없는 {0}개의 노드를 무시함"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "OSM에서 다운로드..."
@@ -468,6 +471,9 @@ msgstr ""
msgid "Download data"
msgstr "데이터 다운로드"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "오브젝트 다운로드..."
@@ -958,6 +964,12 @@ msgstr "다이얼로그를 닫고 다운로드를 취소"
msgid "Download Data"
msgstr "데이터 다운로드"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "확인"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1698,6 +1710,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1707,6 +1741,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2288,134 +2325,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>변경된 것</b> - 변경된 모든 객체"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>선택된 것</b> - 선택된 모든 객체"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>불완전</b> - 불완전한 모든 객체"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>태그 없음</b> - 태그가 없는 모든 객체"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr "<b>child <i>expr</i></b> - 정규식이 일치하는 객체의 모든 하위 객체"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr "<b>parent <i>expr</i></b> - 정규식에 일치하는 객체의 모든 상위 객체"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "<b>|</b> 나 <b>OR</b>을 사용하여 논리합을 구성"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "<b>(</b> 와 <b>)</b>을 사용하여 그룹식 구성"
-
msgid "basic examples"
msgstr ""
@@ -2455,6 +2364,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2470,12 +2385,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2512,7 +2421,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2524,6 +2438,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3850,7 +3767,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4489,6 +4406,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4547,6 +4467,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5937,9 +5860,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr "확인"
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6808,8 +6728,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<차이점>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr ""
@@ -6826,6 +6756,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr "<차이점>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6956,6 +6892,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7682,18 +7628,21 @@ msgstr "대상"
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7702,6 +7651,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8729,6 +8681,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10693,6 +10648,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11330,6 +11291,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14058,6 +14027,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14161,6 +14133,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14288,6 +14263,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14910,11 +14888,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15231,6 +15204,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15934,15 +15912,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17190,6 +17187,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17588,22 +17591,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17815,6 +17818,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17870,9 +17876,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -17999,7 +18002,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18644,9 +18647,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18820,6 +18820,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19567,9 +19579,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22125,6 +22134,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22291,36 +22310,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23439,6 +23428,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23493,6 +23488,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24102,6 +24125,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24416,9 +24442,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25457,6 +25498,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27561,6 +27605,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ky.po b/i18n/po/ky.po
index d607421..c3e5dba 100644
--- a/i18n/po/ky.po
+++ b/i18n/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2012-12-18 02:36+0000\n"
"Last-Translator: chyngyz <Unknown>\n"
"Language-Team: Kirghiz <ky at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:47+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:47+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -443,15 +443,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -466,6 +469,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -960,6 +966,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1704,6 +1716,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1713,6 +1747,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2295,134 +2332,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2462,6 +2371,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2477,12 +2392,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2519,7 +2428,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2531,6 +2445,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3864,7 +3781,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4504,6 +4421,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4562,6 +4482,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5952,9 +5875,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6823,9 +6743,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6841,6 +6771,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6971,6 +6907,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7697,18 +7643,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7717,6 +7666,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8739,6 +8691,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10703,6 +10658,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11340,6 +11301,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14068,6 +14037,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14171,6 +14143,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14298,6 +14273,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14920,11 +14898,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15241,6 +15214,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15944,15 +15922,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17200,6 +17197,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17598,22 +17601,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17825,6 +17828,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17880,9 +17886,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18009,7 +18012,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18654,9 +18657,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18830,6 +18830,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19577,9 +19589,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22135,6 +22144,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22301,36 +22320,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23449,6 +23438,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23503,6 +23498,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24112,6 +24135,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24426,9 +24452,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25467,6 +25508,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27571,6 +27615,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/lo.po b/i18n/po/lo.po
index 5bc34d2..96e1068 100644
--- a/i18n/po/lo.po
+++ b/i18n/po/lo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2009-09-15 10:06+0000\n"
"Last-Translator: Anousone <Unknown>\n"
"Language-Team: Lao <lo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:48+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:48+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/lt.po b/i18n/po/lt.po
index e41d461..6a5222e 100644
--- a/i18n/po/lt.po
+++ b/i18n/po/lt.po
@@ -7,17 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-03-31 11:26+0000\n"
-"Last-Translator: Tomas Straupis <tomasstraupis at gmail.com>\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-25 06:53+0000\n"
+"Last-Translator: Aurimas Fišeras <Unknown>\n"
"Language-Team: Lithuanian <lt at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:49+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:49+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: lt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -45,16 +45,16 @@ msgid "{0}: invalid option -- {1}"
msgstr "{0}: klaidinga parinktis -- {1}"
msgid "{0}: option requires an argument -- {1}"
-msgstr "{0}: parinkčia reikalingas kintamsis dydis -- {1}"
+msgstr "{0}: parinkčiai reikalingas argumentas – {1}"
msgid "Invalid value {0} for parameter ''has_arg''"
-msgstr "Klaidinga reikšmė {0} parametrui ''has_arg''"
+msgstr "Klaidinga reikšmė {0} parametrui „has_arg“"
msgid "Background Terms of Use"
msgstr "Fono naudojimo sąlygos"
msgid "Opening link not supported on current platform (''{0}'')"
-msgstr "Atveriama nuorada dabartinėje platformoje nepalaikoma (''{0}'')"
+msgstr "Nuorodos atvėrimas dabartinėje platformoje nepalaikomas („{0}“)"
msgid "ERROR: {0}"
msgstr "KLAIDA: {0}"
@@ -87,16 +87,16 @@ msgid "Initializing validator"
msgstr "Inicijuojamas validatorius"
msgid "Initializing presets"
-msgstr "Inicijuojama išankstynės paranktys"
+msgstr "Inicijuojami ruošiniai"
msgid "Initializing map styles"
msgstr "Inicijuojamas žemėlapio stilius"
msgid "Loading imagery preferences"
-msgstr "Kraunamos paveikslėlio nuostatos"
+msgstr "Įkeliamos vaizdų nuostatos"
msgid "Updating user interface"
-msgstr "Atnaujinama vartotojo sąsaja"
+msgstr "Atnaujinama naudotojo sąsaja"
msgid "{0} completed in {1}"
msgstr "{0} baigta per {1}"
@@ -126,7 +126,7 @@ msgid "Exit JOSM"
msgstr "Paliekamas JOSM"
msgid "Continue, try anyway"
-msgstr "Tęsti, vistiek bandyti"
+msgstr "Tęsti, vis tiek bandyti"
msgid "Error"
msgstr "Klaida"
@@ -138,7 +138,7 @@ msgid "Display the about screen."
msgstr "Rodyti langą Apie."
msgid "Java OpenStreetMap Editor"
-msgstr "Java OpenStreetMap Redaktorius"
+msgstr "Java OpenStreetMap rengyklė"
msgid "Version {0}"
msgstr "Versija {0}"
@@ -171,7 +171,7 @@ msgid "License"
msgstr "Licencija"
msgid "Plugins"
-msgstr "Priedai"
+msgstr "Papildiniai"
msgid "About JOSM..."
msgstr "Apie JOSM..."
@@ -202,7 +202,7 @@ msgstr[1] "Spauskite, kad tęstumėte atidarinėti {0} naršykles"
msgstr[2] "Spauskite, kad tęstumėte atidarinėti {0} naršyklių"
msgid "Cancel"
-msgstr "Atšaukti"
+msgstr "Atsisakyti"
msgid "Click to abort launching external browsers"
msgstr "Paspauskite, sustabdyti paleidžiamą interneto naršykles"
@@ -211,7 +211,7 @@ msgid "Please select at least one already uploaded node, way, or relation."
msgstr "Parinkite bent vieną jau išsiųstą tašką, kelią ar ryšį."
msgid "Please select the target layer."
-msgstr "Prašome parinkti paskirties sluoksnį"
+msgstr "Parinkite paskirties sluoksnį."
msgid "Select target layer"
msgstr "Parinkite paskirties sluoksnį"
@@ -230,7 +230,7 @@ msgid "No target layers"
msgstr "Nėra paskirties sluoksnių"
msgid "Select"
-msgstr "Parinkti"
+msgstr "Pažymėti"
msgid ""
"Set the selected elements on the map to the selected items in the list above."
@@ -238,7 +238,7 @@ msgstr ""
"Žemėlapyje pažymėti elementus, kurie pažymėti aukščiau esančiame sąraše."
msgid "Add imagery layer {0}"
-msgstr "Pridėti vaizdo sluoksnį {0}"
+msgstr "Pridėti vaizdų sluoksnį {0}"
msgid "Select image format for WMS layer"
msgstr "Parinkite WMS sluoksnio piešinio formatą"
@@ -266,7 +266,7 @@ msgstr "Pridėti tašką..."
msgid "Add a node by entering latitude / longitude or easting / northing."
msgstr ""
-"Pridėti tašką įvedant platumą / ilgumą arba nuokripį į rytus / šiaurę."
+"Pridėti tašką įvedant platumą / ilgumą arba nuokrypį į rytus / šiaurę."
msgid "Edit: {0}"
msgstr "Keisti: {0}"
@@ -278,7 +278,7 @@ msgid "Move the selected nodes into a circle."
msgstr "Perkelti parinktus taškus į apskritimą."
msgid "Tool: {0}"
-msgstr "Įrankai: {0}"
+msgstr "Įrankis: {0}"
msgid "Not enough nodes in selected ways."
msgstr "Neužtenka taškų pažymėtuose keliuose."
@@ -296,7 +296,7 @@ msgstr ""
"ribų."
msgid "Align Nodes in Line"
-msgstr "Išdėstyti Taškus į Tiesę"
+msgstr "Išdėstyti taškus į tiesę"
msgid "Move the selected nodes in to a line."
msgstr "Perkelti parinktus taškus į tiesę"
@@ -356,10 +356,10 @@ msgid "No conflicts to zoom to"
msgstr "Nėra konfliktų, kuriuos galima priartinti."
msgid "Changeset Manager"
-msgstr "Pakeitumų redaktorius"
+msgstr "Pakeitimų tvarkytuvė"
msgid "Toggle visibility of Changeset Manager window"
-msgstr "Perjungti pakeitimų valdymo lango matomumą"
+msgstr "Perjungti pakeitimų tvarkytuvės lango matomumą"
msgid "Close open changesets"
msgstr "Užverti atvertus pakeitimus"
@@ -408,7 +408,7 @@ msgid "Combine {0} way"
msgid_plural "Combine {0} ways"
msgstr[0] "Sujungti {0} kelią"
msgstr[1] "Sujungti {0} kelius"
-msgstr[2] "Sujungti {0} kelius"
+msgstr[2] "Sujungti {0} kelių"
msgid "Please select at least two ways to combine."
msgstr "Parinkite bent du kelius sujungiant."
@@ -417,7 +417,7 @@ msgid "Copy"
msgstr "Kopijuoti"
msgid "Copy selected objects to paste buffer."
-msgstr "Nukopijuoti parinktą objektą į įdėjimo buferį."
+msgstr "Kopijuoti parinktą objektą į iškarpinę."
msgid "Please select something to copy."
msgstr "Parinkite ką nukopijuoti."
@@ -456,10 +456,10 @@ msgid "You must select at least one way."
msgstr "Jūs turite pasirinkti bent vieną kelią."
msgid "Delete"
-msgstr "Ištrinti"
+msgstr "Pašalinti"
msgid "Delete selected objects."
-msgstr "Ištrinti parinktus objektus."
+msgstr "Šalinti pažymėtus objektus."
msgid "Toggle dialogs panel"
msgstr "Perjungti dialogų skiltį"
@@ -467,15 +467,21 @@ msgstr "Perjungti dialogų skiltį"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Perjungti dialogų skiltį, didinti žemėlapio vaizdą"
-msgid "Distribute Nodes"
-msgstr "Paskirstyti Taškus"
-
msgid "Distribute the selected nodes to equal distances along a line."
-msgstr "Paskirstyti parinktus taškus vienodais atstumais tiesiojoje."
+msgstr "Paskirstyti pažymėtus taškus vienodais atstumais tiesėje."
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Ignoruojama {0} taškų su tuščiomis koordinatėmis"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+"Prašome pažymėti:\n"
+"* Vieną savęs nekertantį kelią su ne daugiau nei dviem jo taškais;\n"
+"* Tris taškus."
+
msgid "Download from OSM..."
msgstr "Atsisiųsti iš OSM..."
@@ -492,29 +498,32 @@ msgstr ""
msgid "Download data"
msgstr "Parsiųsti duomenis"
+msgid "Download notes in current view"
+msgstr "Atsiųsti pastabas dabartiniame rodinyje"
+
msgid "Download object..."
-msgstr "Parsisti objektą..."
+msgstr "Parsiųsti objektą..."
msgid "Download OSM object by ID."
-msgstr "Parsisti OSM objekta pagal ID"
+msgstr "Parsiųsti OSM objektą pagal ID."
msgid "Download parent ways/relations..."
-msgstr "Atsiunčiami tėviški keliai/ryšiai..."
+msgstr "Atsiųsti tėvinius kelius/ryšius..."
msgid "Download objects referring to one of the selected objects"
msgstr "Atsiųsti objektus, kurie priklauso vienam iš pažymėtų objektų"
msgid "Duplicate"
-msgstr "Dublikuoti"
+msgstr "Dubliuoti"
msgid "Duplicate selection by copy and immediate paste."
-msgstr "Dublikuoti parinktą kopijuojant ir įdėti iškarto"
+msgstr "Dubliuoti pažymėjimą kopijuojant ir iš karto įdedant."
msgid "Exit"
msgstr "Baigti"
msgid "Exit the application."
-msgstr "Palikti programą."
+msgstr "Baigti programą."
msgid "Expert Mode"
msgstr "Eksperto režimas"
@@ -526,7 +535,7 @@ msgid "Follow line"
msgstr "Sekti liniją"
msgid "Continues drawing a line that shares nodes with another line."
-msgstr "Testi tiesę kuri dalijasi taškais su kita tiese."
+msgstr "Tęsti tiesę, kuri dalijasi taškais su kita tiese."
msgid "Follow"
msgstr "Sekti"
@@ -544,7 +553,7 @@ msgid "Export the data to GPX file."
msgstr "Eksportuoti duomenis į GPX failą."
msgid "Nothing to export. Get some data first."
-msgstr "Nera ką eksportuoti. Pirma pateikite duomenis."
+msgstr "Nėra ką eksportuoti. Pirma gaukite duomenų."
msgid "Export GPX file"
msgstr "Eksportuoti GPX failą"
@@ -553,10 +562,10 @@ msgid "History"
msgstr "Istorija"
msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Parodyti OSM kelių, taškų arba ryšių detalę istoriją."
+msgstr "Parodyti OSM kelių, taškų arba ryšių detalią istoriją."
msgid "Show history"
-msgstr "Roditį istoriją"
+msgstr "Rodyti istoriją"
msgid "History (web)"
msgstr "Istorija (Internete)"
@@ -565,16 +574,16 @@ msgid ""
"Display history information about OSM ways, nodes, or relations in web "
"browser."
msgstr ""
-"Naršyklėje rodyti istorinę informaciją apie OSM kelius, taškus ar ryšius"
+"Naršyklėje rodyti istorinę informaciją apie OSM kelius, taškus ar ryšius."
msgid "New offset"
msgstr "Naujas lygiavimas"
msgid "Adjust the position of this imagery layer"
-msgstr "Koreguoti paveiksliuko sluoksnio pozicija"
+msgstr "Derinti vaizdų sluoksnio poziciją"
msgid "Adjust imagery offset"
-msgstr "Koreguoti paveikliuko lygiavimą"
+msgstr "Derinti vaizdų poslinkį"
msgid "OK"
msgstr "Gerai"
@@ -585,8 +594,8 @@ msgid ""
"You can also enter east and north offset in the {0} coordinates.\n"
"If you want to save the offset as bookmark, enter the bookmark name below"
msgstr ""
-"Naudokite kursoriaus mygtukus arba stumkite ortofoto sluoksnį pele, kad "
-"pakeistumėte ortofoto poslinkį.\n"
+"Naudokite rodyklių klavišus arba stumkite vaizdų sluoksnį pele, kad "
+"pakeistumėte vaizdų poslinkį.\n"
"Taip pat galite įvesti rytų ar šiaurės poslinkį {0} koordinatėse.\n"
"Jei norite įrašyti poslinkį kaip žymelę, žemiau įveskite žymelės pavadinimą"
@@ -616,17 +625,16 @@ msgid ""
"Display object information about OSM nodes, ways, or relations in web "
"browser."
msgstr ""
-"Objekto informaciją apie OSM taškus, kelius arba ryšius rodyti naršyklėje"
+"Objekto informaciją apie OSM taškus, kelius arba ryšius rodyti naršyklėje."
msgid "Join overlapping Areas"
-msgstr "Sujungti persidengiančias Sritis"
+msgstr "Sujungti persidengiančias sritis"
msgid "Joins areas that overlap each other"
msgstr "Sujungia vienas kitą dengiančius plotus"
msgid "Please select at least one closed way that should be joined."
-msgstr ""
-"Prašome parinkti bent vieną uždarą kelią, kuris turi būti sujungtas."
+msgstr "Prašome pažymėti bent vieną uždarą kelią, kuris turi būti sujungtas."
msgid ""
"One of the selected ways is not closed and therefore cannot be joined."
@@ -638,12 +646,12 @@ msgstr "Plotų sujungimo patvirtinimas"
msgid "The selected way has nodes outside of the downloaded data region."
msgid_plural ""
"The selected ways have nodes outside of the downloaded data region."
-msgstr[0] "Parinktas kelias turi taškų už atsiųsto duomenų regiono."
-msgstr[1] "Parinkti keliai turi taškų už atsiųsto duomenų regiono."
-msgstr[2] "Parinkti keliai turi taškų už atsiųsto duomenų regiono."
+msgstr[0] "Pažymėtas kelias turi taškų už atsiųsto duomenų regiono."
+msgstr[1] "Pažymėti keliai turi taškų už atsiųsto duomenų regiono."
+msgstr[2] "Pažymėti keliai turi taškų už atsiųsto duomenų regiono."
msgid "This can lead to nodes being deleted accidentally."
-msgstr "Tokiu būdų taškai gali būti atsitiktinai ištrinti."
+msgstr "Tokiu būdu taškai gali būti atsitiktinai pašalinti."
msgid "Are you really sure to continue?"
msgstr "Ar tikrai norite tęsti?"
@@ -667,19 +675,19 @@ msgid "Removed duplicate nodes"
msgstr "Pašalinti identiškus taškus"
msgid "Added node on all intersections"
-msgstr "Pridėti tašką visuose susikirtimose"
+msgstr "Pridėti tašką visuose susikirtimuose"
msgid "Assemble new polygons"
-msgstr "Sukurti naują polikogną"
+msgstr "Sukurti naujus daugiakampius"
msgid "Delete relations"
-msgstr "Ištrinti ryšius"
+msgstr "Šalinti ryšius"
msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr "Ištrinti kelius kurie nėra vidinio multipoligono dalis"
+msgstr "Šalinti kelius, kurie nėra vidinio multipoligono dalimi"
msgid "Joined overlapping areas"
-msgstr "Sujungti persidengiančias sritis"
+msgstr "Sujungtos persidengiančios sritys"
msgid ""
"Some of the ways were part of relations that have been modified.<br>Please "
@@ -719,7 +727,7 @@ msgstr ""
"multipoligonų ryšiuose."
msgid "Removed Element from Relations"
-msgstr "Pašalinti Elemetą iš Ryšių"
+msgstr "Pašalintas elementas iš ryšių"
msgid "Remove tags from inner ways"
msgstr "Pašalinti žymes iš vidinių kelių"
@@ -743,7 +751,7 @@ msgid "No Shortcut"
msgstr "Nėra nuorodos"
msgid "Jump To Position"
-msgstr "Eiti Į Poziciją"
+msgstr "Eiti į poziciją"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Atveria dialogą, leidžiantį peršokti į konkrečią vietą"
@@ -752,7 +760,7 @@ msgid "Enter Lat/Lon to jump to position."
msgstr "Persikėlimui į vietą įveskite platumą/ilgumą."
msgid "You can also paste an URL from www.openstreetmap.org"
-msgstr "Taipogi galite įkelti URL iš www.openstreetmap.org"
+msgstr "Taipogi galite įdėti URL iš www.openstreetmap.org"
msgid "Latitude"
msgstr "Platuma"
@@ -761,7 +769,7 @@ msgid "Longitude"
msgstr "Ilguma"
msgid "Zoom (in metres)"
-msgstr "Priartinti (metrais)"
+msgstr "Mastelis (metrais)"
msgid "URL"
msgstr "URL"
@@ -770,7 +778,7 @@ msgid "Jump there"
msgstr "Eiti čia"
msgid "Jump to Position"
-msgstr "Eiti į Poziciją"
+msgstr "Eiti į poziciją"
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -783,7 +791,8 @@ msgid "Lasso Mode"
msgstr "Laisvo pasirinkimo Režimas"
msgid "Lasso selection mode: select objects within a hand-drawn region"
-msgstr "Laisvo pasirinkimo režimas: parinti objektus su ranka piešta sritimi"
+msgstr ""
+"Laisvo pasirinkimo veiksena: pažymėti objektus ranka pieštoje srityje"
msgid "Rectified Image..."
msgstr "Rektifikuotas piešinys..."
@@ -792,7 +801,7 @@ msgid "Download Rectified Images From Various Services"
msgstr "Atsisiųsti rektifikuotus piešinius iš įvairių paslaugų"
msgid "Imagery: {0}"
-msgstr "Ortofoto: {0}"
+msgstr "Vaizdai: {0}"
msgid "Custom WMS Link"
msgstr "Sava WMS nuoroda"
@@ -838,9 +847,9 @@ msgid ""
"want to continue?"
msgstr ""
"Jūs tuoj suliesite duomenis iš sluoksnių „{0}“ ir „{1}“.<br /><br />Šių "
-"sluoksnių įkėlimo nuostatos skiriasi, todėl jie neturėtų būti sulieti tokie, "
-"kokie yra.<br />Po suliejimo sluoksniui „{1}“ bus įjungta griežtesnė "
-"nuostata (siūloma neįkelti).<br /><br /><b>Tai nerekomenduojamas būdas "
+"sluoksnių išsiuntimo nuostatos skiriasi, todėl jie neturėtų būti sulieti "
+"tokie, kokie yra.<br />Po suliejimo sluoksniui „{1}“ bus įjungta griežtesnė "
+"nuostata (siūloma neišsiųsti).<br /><br /><b>Tai nerekomenduojamas būdas "
"sulieti tokius duomenis</b>.<br />Vietoje to, jūs turėtumėte patikrinti ir "
"sulieti kiekvieną objektą atskirai, naudodami „<i>Sulieti žymėjimą</i>“.<br "
"/><br />Ar tikrai norite tęsti?"
@@ -869,7 +878,7 @@ msgstr "Spauskite, kad nutrauktumėte taškų suliejimą"
msgid ""
"Cannot merge nodes: Would have to delete way {0} which is still used by {1}"
msgstr ""
-"Negalima sulieti taškų: reikėtų ištrinti kelią {0}, kurį vis dar naudoja {1}"
+"Negalima sulieti taškų: reikėtų pašalinti kelią {0}, kurį vis dar naudoja {1}"
msgid "Merge {0} node"
msgid_plural "Merge {0} nodes"
@@ -878,7 +887,7 @@ msgstr[1] "Sulieti {0} taškus"
msgstr[2] "Sulieti {0} taškų"
msgid "Merge selection"
-msgstr "Sulieti parinkta"
+msgstr "Sulieti pažymėjimą"
msgid "Merge the currently selected objects into another layer"
msgstr "Sulieti dabar pažymėtus objektus į kitą sluoksnį"
@@ -931,13 +940,13 @@ msgid "Cannot move objects outside of the world."
msgstr "Negalima perkelti objektus iš šio pasaulio."
msgid "Move Node..."
-msgstr "Perkelti Tašką..."
+msgstr "Perkelti tašką..."
msgid "Edit latitude and longitude of a node."
msgstr "Keisti taško platumą ir ilgumą"
msgid "New Layer"
-msgstr "Naujas Sluoksnis"
+msgstr "Naujas sluoksnis"
msgid "Create a new map layer."
msgstr "Sukurti naują žemėlapio sluoksnį"
@@ -990,7 +999,7 @@ msgid "Opening {0} file..."
msgid_plural "Opening {0} files..."
msgstr[0] "Atveriamas {0} failas..."
msgstr[1] "Atveriami {0} failai..."
-msgstr[2] "Atveriami {0} failai..."
+msgstr[2] "Atveriama {0} failų..."
msgid "Opening file ''{0}'' ..."
msgstr "Atveriamas failas ''{0}'' ..."
@@ -1005,7 +1014,7 @@ msgid "Separate Layer"
msgstr "Atskirti sluoksnius"
msgid "Select if the data should be downloaded into a new layer"
-msgstr "Pasirinkite ar duomenys turi būti parsiųsti kaip naujas sluoksnis"
+msgstr "Pasirinkite, ar duomenys turi būti parsiųsti į naują sluoksnį"
msgid "Enter URL to download:"
msgstr "Įveskite URL parsiuntimui:"
@@ -1026,7 +1035,13 @@ msgid "Close dialog and cancel downloading"
msgstr "Uždaryti dialogą ir nutraukti atsiuntimą"
msgid "Download Data"
-msgstr "Parsiųstį Duomenis"
+msgstr "Atsiųsti duomenis"
+
+msgid "Which tasks to perform?"
+msgstr "Kurias užduotis vykdyti?"
+
+msgid "Ok"
+msgstr "Gerai"
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
@@ -1103,21 +1118,21 @@ msgid "Paste"
msgstr "Įdėti"
msgid "Paste contents of paste buffer."
-msgstr "Įkelti iškarpinės turinį."
+msgstr "Įdėti iškarpinės turinį."
msgid "Delete incomplete members?"
msgstr "Trinti nepilnus narius?"
msgid "Paste without incomplete members"
-msgstr "Įkelti be nepilnų narių"
+msgstr "Įdėti be nepilnų narių"
msgid ""
"The copied data contains incomplete objects. When pasting the incomplete "
"objects are removed. Do you want to paste the data without the incomplete "
"objects?"
msgstr ""
-"Įkeltuose duomenyse yra nepilnų objektų. Įkeliant nepilni objektai "
-"pašalinami. Ar norite įkelti duomenis be nepilnų objektų?"
+"Nukopijuotose duomenyse yra nepilnų objektų. Įdedant nepilni objektai "
+"pašalinami. Ar norite įdėti duomenis be nepilnų objektų?"
msgid "Paste Tags"
msgstr "Įdėti žymes"
@@ -1129,12 +1144,12 @@ msgid "Pasting {0} tag"
msgid_plural "Pasting {0} tags"
msgstr[0] "Įkeliama {0} žyma"
msgstr[1] "Įkeliamos {0} žymos"
-msgstr[2] "Įkeliamos {0} žymos"
+msgstr[2] "Įkeliama {0} žymų"
msgid "to {0} object"
msgid_plural "to {0} objects"
msgstr[0] "į {0} objektą"
-msgstr[1] "į {0} objektų"
+msgstr[1] "į {0} objektus"
msgstr[2] "į {0} objektų"
msgid "Preferences..."
@@ -1150,7 +1165,8 @@ msgid "Purge..."
msgstr "Pamiršti..."
msgid "Forget objects but do not delete them on server when uploading."
-msgstr "Pamiršti objektus, bet jų neištrinti įkeliant pakeitimus į serverį."
+msgstr ""
+"Pamiršti objektus, bet jų nepašalinti išsiunčiant pakeitimus į serverį."
msgid "Purge"
msgstr "Pamiršti"
@@ -1164,7 +1180,7 @@ msgid ""
"uploading."
msgstr ""
"Šiuo veiksmu JOSM pamiršta pažymėtus objektus.<br>Jie bus išimti iš "
-"sluoksnio, bet <i>nebus</i> ištrinti<br>serveryje įkeliant duomenis."
+"sluoksnio, bet <i>nebus</i> pašalinti<br>serveryje išsiunčiant duomenis."
msgid ""
"The following dependent objects will be purged<br> in addition to the "
@@ -1273,14 +1289,14 @@ msgid "You must enter a search term"
msgstr "Turite įvesti paieškos žodį"
msgid "Select All"
-msgstr "Parinkti viską"
+msgstr "Pažymėti viską"
msgid ""
"Select all undeleted objects in the data layer. This selects incomplete "
"objects too."
msgstr ""
-"Parinkti visus nepašalintus objektus iš duomenų sluoksnio. Tai taip pat "
-"parenka nebaigtus objektus."
+"Pažymėti visus nepašalintus objektus duomenų sluoksnyje. Tai taip pat pažymi "
+"nepilnus objektus."
msgid "Non-branching way sequences"
msgstr "Neišsišakojančios kelių sekos"
@@ -1289,16 +1305,16 @@ msgid "Select non-branching sequences of ways"
msgstr "Pažymėti neišsišakojančias kelių sekas"
msgid "Load Session"
-msgstr "Įkelti Sesiją"
+msgstr "Įkelti seansą"
msgid "Load a session from file."
-msgstr "Įkelti sesiją iš failo."
+msgstr "Įkelti seansą iš failo."
msgid "Open session"
-msgstr "Atverti sesiją"
+msgstr "Atverti seansą"
msgid "Loading session ''{0}''"
-msgstr "Įkeliama sesija ''{0}''"
+msgstr "Įkeliamas seansas „{0}“"
msgid "Data Error"
msgstr "Duomenų Klaida"
@@ -1307,28 +1323,28 @@ msgid "IO Error"
msgstr "IO Klaida"
msgid "<html>Could not load session file ''{0}''.<br>Error is:<br>{1}</html>"
-msgstr "<html>Nepavyko įkelti sesijos failo „{0}“.<br>Klaida:<br>{1}</html>"
+msgstr "<html>Nepavyko įkelti seanso failo „{0}“.<br>Klaida:<br>{1}</html>"
msgid "Save Session As..."
-msgstr "Išsaugoti Sesiją Kaip..."
+msgstr "Įrašyti seansą kaip..."
msgid "Save the current session to a new file."
-msgstr "Įrašyti dabartinę sesiją į naują failą."
+msgstr "Įrašyti dabartinį seansą į naują failą."
msgid "Session file (archive) (*.joz)"
-msgstr "Sesijos failas (archyvas) (*.joz)"
+msgstr "Seanso failas (archyvas) (*.joz)"
msgid "Session file (*.jos)"
-msgstr "Sesijos failas (*.jos)"
+msgstr "Seanso failas (*.jos)"
msgid "Save session"
-msgstr "Išsaugoti sesiją"
+msgstr "Išsaugoti seansą"
msgid "<html>Could not save session file ''{0}''.<br>Error is:<br>{1}</html>"
-msgstr "<html>Nepavyko įrašyti sesijos failo „{0}“.<br>Klaida:<br>{1}</html>"
+msgstr "<html>Nepavyko įrašyti seanso failo „{0}“.<br>Klaida:<br>{1}</html>"
msgid "Save Session"
-msgstr "Išsaugoti Sesiją"
+msgstr "Įrašyti seansą"
msgid "Save As"
msgstr "Įrašyti kaip"
@@ -1345,8 +1361,8 @@ msgstr "Parodyti būsenos suvestinę"
msgid ""
"Show status report with useful information that can be attached to bugs"
msgstr ""
-"Parodyti būsenos suvestinę su naudinga informacija, kuri gali būti prijungta "
-"prie klaidos pranešimo"
+"Parodyti būsenos suvestinę su naudinga informacija, kuri gali būti pridėta "
+"prie klaidos pranešimų"
msgid "Help: {0}"
msgstr "Žinynas: {0}"
@@ -1361,7 +1377,7 @@ msgid "Close"
msgstr "Užverti"
msgid "Simplify Way"
-msgstr "Supaprastinti Kelią"
+msgstr "Supaprastinti kelią"
msgid "Delete unnecessary nodes from a way."
msgstr "Pašalinti nereikalingus taškus iš kelio."
@@ -1376,7 +1392,7 @@ msgid "Simplify all selected ways"
msgstr "Supaprastinti visus parinktu kelius"
msgid "Cancel operation"
-msgstr "Atšaukti operaciją"
+msgstr "Nutraukti operaciją"
msgid ""
"The selection contains {0} ways. Are you sure you want to simplify them all?"
@@ -1389,13 +1405,13 @@ msgid "Simplify {0} way"
msgid_plural "Simplify {0} ways"
msgstr[0] "Supaprastinti {0} kelią"
msgstr[1] "Supaprastinti {0} kelius"
-msgstr[2] "Supaprastinti {0} kelius"
+msgstr[2] "Supaprastinti {0} kelių"
msgid "Simplify Way (remove {0} node)"
msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] "Supaprastinti Kelią (pašalinti {0} tašką)"
-msgstr[1] "Supaprastinti Kelią (pašalinti {0} taškus)"
-msgstr[2] "Supaprastinti Kelią (pašalinti {0} taškus)"
+msgstr[0] "Supaprastinti kelią (pašalinti {0} tašką)"
+msgstr[1] "Supaprastinti kelią (pašalinti {0} taškus)"
+msgstr[2] "Supaprastinti kelią (pašalinti {0} taškų)"
msgid "Split Way"
msgstr "Perskirti kelius"
@@ -1409,13 +1425,13 @@ msgstr ""
"Dabartinis pažymėjimas negali būti panaudotas dalinimui - nepažymėtas taškas."
msgid "The selected nodes do not share the same way."
-msgstr "Parinkti taškai nėra tame pačiame kelyje."
+msgstr "Pažymėti taškai nėra tame pačiame kelyje."
msgid "The selected node is not in the middle of any way."
msgid_plural "The selected nodes are not in the middle of any way."
-msgstr[0] "Parinktas taškas nėra kelio viduryje."
-msgstr[1] "Parinkti taškai nėra kelio viduryje."
-msgstr[2] "Parinkti taškai nėra kelio viduryje."
+msgstr[0] "Pažymėtas taškas nėra jokio kelio viduryje."
+msgstr[1] "Pažymėti taškai nėra jokio kelio viduryje."
+msgstr[2] "Pažymėti taškai nėra jokio kelio viduryje."
msgid ""
"There is more than one way using the node you selected. Please select the "
@@ -1460,7 +1476,7 @@ msgstr ""
msgid "Split way {0} into {1} part"
msgid_plural "Split way {0} into {1} parts"
msgstr[0] "Dalinti kelią {0} į {1} dalį"
-msgstr[1] "Dalinti kelią {0} į {1} dalių"
+msgstr[1] "Dalinti kelią {0} į {1} dalis"
msgstr[2] "Dalinti kelią {0} į {1} dalių"
msgid "Toggle GPX Lines"
@@ -1476,22 +1492,22 @@ msgid "Encourage/discourage upload"
msgstr "Skatinti/neskatinti įkėlimą"
msgid "UnGlue Ways"
-msgstr "Atskirti kelius"
+msgstr "Atjungti kelius"
msgid "Duplicate nodes that are used by multiple ways."
-msgstr "Duplikuoti taškus, kurie naudojami keleto kelių."
+msgstr "Dubliuoti taškus, kurie naudojami keleto kelių."
msgid "This node is not glued to anything else."
-msgstr "Šis taškas nepriklijuotas."
+msgstr "Šis taškas prie nieko neprijungtas."
msgid "None of these nodes are glued to anything else."
-msgstr "Taškai niekur neprilipdyti."
+msgstr "Šie taškai prie nieko neprijungti."
msgid "None of this way''s nodes are glued to anything else."
msgstr "Joks šio kelio taškas nėra prijungtas prie ko nors kito."
msgid "The current selection cannot be used for unglueing."
-msgstr "Parinktys negali būti panaudota atitaukimui."
+msgstr "Dabartinis pažymėjimas negali būti panaudotas atjungimui."
msgid "Select either:"
msgstr "Pasirinkite:"
@@ -1525,43 +1541,43 @@ msgid ""
"their\n"
"own copy and all nodes will be selected."
msgstr ""
-"Pastaba: Jei kelias parinktas, šis kelias gaus naujas kopjas nepriklijoutus\n"
-"taškus ir šie taškai bus parinkti. Kitu atveju, visi keliai gaus savo\n"
-"kopijas ir visi taškai bus parinkti."
+"Pastaba: Jei kelias pažymėtas, jis gaus neprijungtų taškų naujas\n"
+"kopijas ir šie taškai bus pažymėti. Kitu atveju, visi keliai gaus savo\n"
+"kopijas ir visi taškai bus pažymėti."
msgid "Unglued Node"
-msgstr "Atskirti tašką"
+msgstr "Atjungtas taškas"
msgid "Dupe into {0} node"
msgid_plural "Dupe into {0} nodes"
msgstr[0] "Kopijuoti į {0} tašką"
msgstr[1] "Kopijuoti į {0} taškus"
-msgstr[2] "Kopijuoti į {0} taškus"
+msgstr[2] "Kopijuoti į {0} taškų"
msgid "Dupe {0} node into {1} nodes"
msgid_plural "Dupe {0} nodes into {1} nodes"
msgstr[0] "Kopijuoti {0} tašką į {1} taškų"
msgstr[1] "Kopijuoti {0} taškus į {1} taškų"
-msgstr[2] "Kopijuoti {0} taškus į {1} taškų"
+msgstr[2] "Kopijuoti {0} taškų į {1} taškų"
msgid "Unglue confirmation"
-msgstr "Atklijavimo informacija"
+msgstr "Atjungimo patvirtinimas"
msgid ""
"You are about to unglue nodes outside of the area you have "
"downloaded.<br>This can cause problems because other objects (that you do "
"not see) might use them.<br>Do you really want to unglue?"
msgstr ""
-"Jūs ruošiatės atklijuoti taškus, kurie yra už atsiųstos zonos ribų.<br>Dėl "
-"to gali kilti problemų, nes kiti objektai (kurių jūs nematote) gali juos "
-"naudoti.<br>Ar tikrai norite atklijuoti?"
+"Jūs ruošiatės atjungti taškus, kurie yra už atsiųstos zonos ribų.<br>Dėl to "
+"gali kilti problemų, nes kiti objektai (kurių jūs nematote) gali juos "
+"naudoti.<br>Ar tikrai norite atjungti?"
msgid ""
"You are about to unglue incomplete objects.<br>This will cause problems "
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
-"Jūs ruošiatės atklijuoti nepilnus objektus.<br>Tai gali sukelti problemų, "
-"nes nematote pilno objekto.<br>Ar tikrai norite atklijuoti?"
+"Jūs ruošiatės atjungti nepilnus objektus.<br>Tai gali sukelti problemų, nes "
+"nematote tikro objekto.<br>Ar tikrai norite atjungti?"
msgid "Disconnect Node from Way"
msgstr "Atjungti tašką nuo kelio"
@@ -1593,16 +1609,16 @@ msgid "Undo the last action."
msgstr "Atšaukti paskutinį veiksmą."
msgid "Undo ..."
-msgstr "Atšaukti ..."
+msgstr "Atšaukti..."
msgid "Undo {0}"
msgstr "Atšaukti {0}"
msgid "Unselect All"
-msgstr "Neparinkti jokio"
+msgstr "Atžymėti visus"
msgid "Unselect all objects."
-msgstr "Neparinkti jokio objekto"
+msgstr "Atžymėti visus objektus"
msgid "Update data"
msgstr "Atnaujinti duomenis"
@@ -1640,10 +1656,10 @@ msgid "Selection empty"
msgstr "Pažymėjimas yra tuščias"
msgid "Upload data"
-msgstr "Išsiūsti duomenis"
+msgstr "Išsiųsti duomenis"
msgid "Upload all changes in the active data layer to the OSM server"
-msgstr "Įkelti visus aktyvaus sluoksnio duomenų pakeitimus į OSM serverį"
+msgstr "Išsiųsti visus aktyvaus sluoksnio duomenų pakeitimus į OSM serverį"
msgid ""
"<html>The data to be uploaded participates in unresolved conflicts of layer "
@@ -1661,34 +1677,34 @@ msgid ""
"require you subsequently have to revert your changes, or force other "
"contributors to.<br /><br />Are you sure you want to continue?"
msgstr ""
-"Jūs ruošiatės įkelti duomenis iš sluoksnio „{0}“.<br /><br />Duomenų siųsti "
-"iš šio sluoksnio <b>primygtinai nesiūlome</b>. Jei tęsite,<br />jums gali "
-"vėliau tekti atstatyti pakeitimus arba priversti ką nors kitą tai "
-"padaryti.<br /><br />Ar tikrai norite tęsti?"
+"Jūs ruošiatės išsiųsti duomenis iš sluoksnio „{0}“.<br /><br />Duomenų "
+"išsiųsti iš šio sluoksnio <b>primygtinai nesiūlome</b>. Jei tęsite,<br "
+"/>jums gali vėliau tekti atstatyti pakeitimus arba priversti ką nors kitą "
+"tai padaryti.<br /><br />Ar tikrai norite tęsti?"
msgid "Ignore this hint and upload anyway"
-msgstr "Ignoruoti šią pastabą ir vis tiek įkelti"
+msgstr "Ignoruoti šią pastabą ir vis tiek išsiųsti"
msgid "No changes to upload."
msgstr "Nėra pakeitimų išsiuntimui."
msgid "Nothing to upload. Get some data first."
-msgstr "Nėra ką išsiūsti. Pirma gaukite duomenis."
+msgstr "Nėra ką išsiųsti. Pirma gaukite duomenų."
msgid "Upload note changes to server"
-msgstr "Įkelti pastabų pakeitimus į serverį"
+msgstr "Išsiųsti pastabų pakeitimus į serverį"
msgid "Upload notes"
-msgstr "Įkelti pastabas"
+msgstr "Išsiųsti pastabas"
msgid "Uploading notes to server"
-msgstr "Pastabos įkeliamos į serverį"
+msgstr "Pastabos išsiunčiamos į serverį"
msgid "Upload selection"
-msgstr "Įkelti pažymėjimą"
+msgstr "Išsiųsti pažymėjimą"
msgid "Upload all changes in the current selection to the OSM server."
-msgstr "Įkelti visus dabartinio pažymėjimo pakeitimus į OSM serverį."
+msgstr "Išsiųsti visus dabartinio pažymėjimo pakeitimus į OSM serverį."
msgid "Checking parents for deleted objects"
msgstr "Tikrinami ištrintų objektų tėvai"
@@ -1719,8 +1735,8 @@ msgstr "Matomo ploto sekimas"
msgid "Enable/disable automatic moving of the map view to last placed node"
msgstr ""
-"Įjungia/išjungia automatinį rodomo ploto pastūmimą link paskutinio pridėto "
-"taško"
+"Įjungia/išjungia automatinį rodomo ploto pastūmimą paskutinio pridėto taško "
+"link"
msgid "Toggle Viewport Following"
msgstr "Perjungti matomo ploto sekimą"
@@ -1796,7 +1812,7 @@ msgstr "Šokti į pradžią"
msgctxt "audio"
msgid "Next Marker"
-msgstr "Kita Žymė"
+msgstr "Kita žyma"
msgctxt "audio"
msgid "Play next marker."
@@ -1811,7 +1827,7 @@ msgstr "Groti/Pristabdyti įrašą"
msgctxt "audio"
msgid "Previous Marker"
-msgstr "Ankstenė Žymė"
+msgstr "Ankstesnė žyma"
msgctxt "audio"
msgid "Play previous marker."
@@ -1844,7 +1860,31 @@ msgid "Downloading Notes"
msgstr "Atsiunčiamos pastabos"
msgid "Notes"
-msgstr "Banknotai"
+msgstr "Pastabos"
+
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] "Parsiųsta {0} pastaba."
+msgstr[1] "Parsiųstos {0} pastabos."
+msgstr[2] "Parsiųsta {0} pastabų."
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+"Kadangi atsiuntimo riba yra {0}, gali būti likę dar neatsiųstų pastabų."
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr "Nurodykite mažesnį plotą, kad tikrai atsiųstumėte visas pastabas."
+
+msgid "More notes to download"
+msgstr "Daugiau pastabų atsiuntimui"
+
+msgid "Download OSM Notes within Bounds"
+msgstr "Atsisiųsti OSM pastabas ribose"
+
+msgid "Download OSM Note by ID"
+msgstr "Atsiųsti OSM pastabą pagal ID"
msgid "Download Compressed OSM Change"
msgstr "Atsiųsti suspaustą OSM pokytį"
@@ -1855,6 +1895,9 @@ msgstr "Atsiųsti OSM pakeitimą"
msgid "Download Compressed OSM"
msgstr "Atsiųsti suspaustą OSM."
+msgid "Download OSM object by ID"
+msgstr "Atsiųsti OSM objektą pagal ID"
+
msgid "Download OSM"
msgstr "Atsiųsti OSM"
@@ -1883,7 +1926,7 @@ msgstr "OSM atsiuntimo URL"
msgid "There was {0} conflict during import."
msgid_plural "There were {0} conflicts during import."
msgstr[0] "Importuojant buvo {0} konfliktas."
-msgstr[1] "Importuojant buvo {0} konfliktų."
+msgstr[1] "Importuojant buvo {0} konfliktai."
msgstr[2] "Importuojant buvo {0} konfliktų."
msgid "Conflict during download"
@@ -1902,7 +1945,7 @@ msgid "({0}/{1}) Loading parents of relation {2}"
msgstr "({0}/{1}) Atsiunčiami ryšio {2} tėvai"
msgid "Download session"
-msgstr "Atsiųsti sesiją"
+msgstr "Atsiųsti seansą"
msgid "Download {0} of {1} ({2} left)"
msgstr "Atsiunčiama {0} iš {1} ({2} liko)"
@@ -1918,7 +1961,7 @@ msgid ""
"server"
msgstr ""
"Spauskite, kad patikrintumėte, ar jūsų vietinės duomenų aibės objektai yra "
-"ištrinti serveryje"
+"pašalinti serveryje"
msgid "Ignore"
msgstr "Ignoruoti"
@@ -1935,16 +1978,16 @@ msgid_plural ""
"server.<br>If you later try to delete or update them the server is likely to "
"report a conflict."
msgstr[0] ""
-"Yra {0} objektas jūsų vietinėje duomenų aibėje, kurie gali būti ištrinti "
-"serveryje.<br>Jei vėliau bandysite juos trinti ar keisti, serveris "
+"Yra {0} objektas jūsų vietinėje duomenų aibėje, kuris gali būti pašalintas "
+"serveryje.<br>Jei vėliau bandysite juos šalinti ar keisti, serveris "
"tikriausiai praneš apie konfliktą."
msgstr[1] ""
-"Yra {0} objektai jūsų vietinėje duomenų aibėje, kurie gali būti ištrinti "
-"serveryje.<br>Jei vėliau bandysite juos trinti ar keisti, serveris "
+"Yra {0} objektai jūsų vietinėje duomenų aibėje, kurie gali būti pašalinti "
+"serveryje.<br>Jei vėliau bandysite juos šalinti ar keisti, serveris "
"tikriausiai praneš apie konfliktą."
msgstr[2] ""
-"Yra {0} objektai jūsų vietinėje duomenų aibėje, kurie gali būti ištrinti "
-"serveryje.<br>Jei vėliau bandysite juos trinti ar keisti, serveris "
+"Yra {0} objektų jūsų vietinėje duomenų aibėje, kurie gali būti pašalinti "
+"serveryje.<br>Jei vėliau bandysite juos šalinti ar keisti, serveris "
"tikriausiai praneš apie konfliktą."
msgid ""
@@ -1965,7 +2008,7 @@ msgid "Click <strong>{0}</strong> to ignore.</html>"
msgstr "Spauskite <strong>{0}</strong>, jei norite ignoruoti.</html>"
msgid "Deleted or moved objects"
-msgstr "Ištrinti arba perkelti objektai"
+msgstr "Pašalinti arba perkelti objektai"
msgid "The following errors occurred during mass download: {0}"
msgstr "Vykdant masinį atsiuntimą įvyko šios klaidos: {0}"
@@ -2001,7 +2044,7 @@ msgid "Delete Mode"
msgstr "Trynimo režimas"
msgid "Delete nodes or ways."
-msgstr "Ištrinti taškus arba kelius."
+msgstr "Pašalinti taškus arba kelius."
msgid "Mode: {0}"
msgstr "Veiksena: {0}"
@@ -2023,7 +2066,7 @@ msgid "Mode: Draw Angle snapping"
msgstr "Režimas: paišymo kampo pritraukimas"
msgid "Backspace in Add mode"
-msgstr "Backspace mygtukas pridėjimo režime"
+msgstr "„Backspace“ klavišas pridėjimo veiksenoje"
msgid "helper line"
msgstr "pagalbos eilutė"
@@ -2050,13 +2093,13 @@ msgid "Create new node."
msgstr "Sukurti naują taką."
msgid "Select node under cursor."
-msgstr "Parinkti tašką po žymekliu."
+msgstr "Pažymėti tašką po žymekliu."
msgid "Insert new node into way."
msgid_plural "Insert new node into {0} ways."
msgstr[0] "Įterpti naują tašką į kelią."
msgstr[1] "Įterpti naują tašką į {0} kelius."
-msgstr[2] "Įterpti naują tašką į {0} kelius."
+msgstr[2] "Įterpti naują tašką į {0} kelių."
msgid "Start new way from last node."
msgstr "Pradėti nauja kelią nuo paskutinio taško."
@@ -2089,7 +2132,7 @@ msgid "Snap to node projections"
msgstr "Pritraukti prie taško projekcijų"
msgid "Disable"
-msgstr "Atšaukti"
+msgstr "Išjungti"
msgid "0,90,..."
msgstr "0,90,..."
@@ -2113,7 +2156,7 @@ msgid "Switch dual alignment mode while extruding"
msgstr "Perjungti dvigubo lygiavimo režimą išstumiant"
msgid "Extrude"
-msgstr "Ištemti"
+msgstr "Ištempti"
msgid "Create areas"
msgstr "Kurti plotus"
@@ -2148,13 +2191,13 @@ msgid "Draw a rectangle of the desired size, then release the mouse button."
msgstr "Pieškite norimo dydžio stačiakampį, tada atleiskite pelės klavišą."
msgid "Extrude: main line"
-msgstr "Išstrumti: pagrindinė linija"
+msgstr "Ištempti: pagrindinė linija"
msgid "Extrude: helper line"
msgstr "Išstumti: pagalbinė linija"
msgid "Extrude Way"
-msgstr "Ištemti kelią"
+msgstr "Ištempti kelią"
msgid "Improve Way Accuracy"
msgstr "Gerinti kelio tikslumą"
@@ -2199,13 +2242,13 @@ msgid "Add a new node to way"
msgid_plural "Add a new node to {0} ways"
msgstr[0] "Pridėti tašką į kelią"
msgstr[1] "Pridėti tašką į {0} kelius"
-msgstr[2] "Pridėti tašką į {0} kelius"
+msgstr[2] "Pridėti tašką į {0} kelių"
msgid "Cannot delete node that is referenced by multiple objects"
-msgstr "Negalima ištrinti taško, kurį naudoja keli objektai"
+msgstr "Negalima pašalinti taško, kurį naudoja keli objektai"
msgid "Cannot delete node that has tags"
-msgstr "Negalima ištrinti taško, turinčio žymų"
+msgstr "Negalima pašalinti taško, turinčio žymų"
msgid "Parallel"
msgstr "Lygiagretus"
@@ -2231,7 +2274,7 @@ msgid ""
"The ways selected must form a simple branchless path"
msgstr ""
"LygiagrečiųKeliųVeiksmas\n"
-"Parinkti keliai turi formuoti paprastą kelią be atsišakojimų"
+"Pažymėti keliai turi formuoti paprastą kelią be atsišakojimų"
msgid "Make parallel way error"
msgstr "Lygiagretaus kelio kūrimo klaida"
@@ -2247,16 +2290,16 @@ msgstr ""
"ten; SHIFT+paleiskite, kad sinchronizuotumėte garsą tame taške."
msgid "Select, move, scale and rotate objects"
-msgstr "Parinkti, perkelti, keiti dydį ir pasukti objektus"
+msgstr "Pažymėti, perkelti, pasukti objektus ir keisti jų dydį"
msgid "Move elements"
-msgstr "Perketi elementus"
+msgstr "Perkelti elementus"
msgid "Move them"
-msgstr "Perketi juos"
+msgstr "Perkelti juos"
msgid "Undo move"
-msgstr "Atšaukti perkėtimą"
+msgstr "Atšaukti perkėlimą"
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2275,13 +2318,13 @@ msgstr[1] ""
"dažniausiai yra klaida.\n"
"Tikrai juos perkelti?"
msgstr[2] ""
-"Jūs perkėlėte daugiau nei {0} elementus. Didelio kiekio elementų perkėlimas "
+"Jūs perkėlėte daugiau nei {0} elementų. Didelio kiekio elementų perkėlimas "
"dažniausiai yra klaida.\n"
"Tikrai juos perkelti?"
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
-"Atleiskite pelės mygtuką, kad parinktumėte objektus, esančius stačiakampyje."
+"Atleiskite pelės mygtuką, kad pažymėtumėte objektus, esančius stačiakampyje."
msgid "Ctrl to merge with nearest node."
msgstr "Ctrl suliejimui su artimiausiu tašku."
@@ -2307,7 +2350,7 @@ msgid "Add and move a virtual new node to way"
msgid_plural "Add and move a virtual new node to {0} ways"
msgstr[0] "Pridėti ir perkelti naują virtualų tašką į {0} kelią"
msgstr[1] "Pridėti ir perkelti naują virtualų tašką į {0} kelius"
-msgstr[2] "Pridėti ir perkelti naują virtualų tašką į {0} kelius"
+msgstr[2] "Pridėti ir perkelti naują virtualų tašką į {0} kelių"
msgid "Zoom"
msgstr "Priartinti"
@@ -2334,10 +2377,10 @@ msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
msgstr[0] "Pridėti pažymėjimą į {0} ryšį"
msgstr[1] "Pridėti pažymėjimą į {0} ryšius"
-msgstr[2] "Pridėti pažymėjimą į {0} ryšius"
+msgstr[2] "Pridėti pažymėjimą į {0} ryšių"
msgid "Delete the selected relation"
-msgstr "Ištrinti parinktus ryšį"
+msgstr "Šalinti pažymėtą ryšį"
msgid "Download all members of the selected relations"
msgstr "Atsiųsti visus pažymėtų ryšių narius"
@@ -2370,8 +2413,8 @@ msgstr[0] ""
"Jūs tuoj vienu metu atversite <b>{0}</b> skirtingų ryšių redaktorių.<br/>Ar "
"norite tęsti?"
msgstr[1] ""
-"Jūs tuoj vienu metu atversite <b>{0}</b> skirtingų ryšių redaktorių.<br/>Ar "
-"norite tęsti?"
+"Jūs tuoj vienu metu atversite <b>{0}</b> skirtingus ryšių "
+"redaktorius.<br/>Ar norite tęsti?"
msgstr[2] ""
"Jūs tuoj vienu metu atversite <b>{0}</b> skirtingų ryšių redaktorių.<br/>Ar "
"norite tęsti?"
@@ -2440,10 +2483,10 @@ msgid "<end-of-file>"
msgstr "<failo-pabaiga>"
msgid "Search..."
-msgstr "Iškoti..."
+msgstr "Ieškoti..."
msgid "Search for objects."
-msgstr "Iškoti objekto."
+msgstr "Ieškoti objektų."
msgid "{0}: "
msgstr "{0}: "
@@ -2491,7 +2534,7 @@ msgid "Search"
msgstr "Paieška"
msgid "Submit filter"
-msgstr "Įkelti filtrą"
+msgstr "Pateikti filtrą"
msgid "Start Search"
msgstr "Pradėti paiešką"
@@ -2508,161 +2551,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Netinkama paieškos išraiška"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Kepinių gatvė</b> - „Kepinių“ ir „gatvė“ bet kuriam rakte"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>„Kepinių gatvė“</b> - „Kepinių gatvė“ bet kuriam rakte"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>raktas:Bak</b> - „Bak“ bet kur rakte „raktas“"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<br>-key:Bak</b> - „Bak“ niekur rakte „raktas“"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-"<b>raktas=reikšmė</b> - raktas „raktas“ su konkrečia reikšme „reikšmė“"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>raktas=*</b> - raktas „raktas“ su bet kokia reikšme. Taipogi pabandykite "
-"<b>*=reikšmė</b>, <b>raktas=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>raktas:</b> - raktas „raktas“ turi bet kokią reikšmę"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>raktas?</b> - raktas „key“ su reikšme „yes“, „true“, „1“ arba „on“"
-
-msgid "Special targets"
-msgstr "Ypatingi tikslai"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>tipas:</b>... - atitinkamo tipo objektai (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - naudotojo pakeisti objektai"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - anoniminių naudotojų pakeisti objektai"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b> ... objektai su nurodytu ID (0 - naujiems objektams)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - nurodytos versijos objektai (0 objektai be priskirtos "
-"versijos)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - objektai su nurodytu pakeitimo ID (0 objektai be "
-"priskirto pakeitimo)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - objektai su nurodytu taškų skaičiumi "
-"(<b>nodes:</b>skaičius, <b>nodes:</b>min-maks, <b>nodes:</b>min- arba "
-"<b>nodes:</b>-maks"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - objektai su nurodytu žymų skaičiumi (<b>tags:</b>skaičius, "
-"<b>tags:</b>min-maks, <b>tags:</b>min- arba <b>tags:</b>-maks"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - objektai su nurodyta role ryšyje"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>timestamp - objektai su nurodytu paskutinio keitimo laiku "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr "<b>timestamp:</b>min/maks - objektai su paskutiniu keitimu intervale"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - uždari keliai su plotu m² (<b>areasize:</b>min-maks "
-"arba <b>areasize:</b>maks)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - visi pakeisti objektai"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - visi pažymėti objektai"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - visi nepilni objektai"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - visi nepažymėti objektai"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr "<b>closed</b> - visi uždari keliai (taškas nėra uždaras)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr "<b>child <i>expr</i></b> - visi išraišką atitinkančių objektų vaikai"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr "<b>parent <i>expr</i></b> - visi išraišką atitinkančių objektų tėvai"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - objektai (ir visi jų taškai / ryšių nariai), "
-"esantys atsiųstame plote"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> objektai „ir visi jų taškai / ryšių nariai) dabartiniame "
-"rodinyje"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Naudokite <b>|</b> arba <b>OR</b> sujungti loginiu „arba“"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Naudokite <b>\"</b> operatorių išskyrimui (pvz. jei rakte yra simbolis "
-"<b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Kabutėse išskirtose eilutėse prieš <b>\"</b> ir <b>\\</b> simbolius turi "
-"eiti <b>\\</b> (pvz. <b>\\\"</b> ir <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Naudokite <b>(</b> ir <b>)</b> išraiškų grupavimui"
-
msgid "basic examples"
msgstr "paprasti pavyzdžiai"
@@ -2702,6 +2590,15 @@ msgstr "atitinka, jei „žyma“ egzistuoja"
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr "atitinka, jei „žyma“ didesnė už „reikšmę“ (analogiškai su mažiau už)"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"veiksmų išskyrimas kabutėmis.<br>Kabutėmis išskirtame tekste prieš <b>\"</b> "
+"ir <b>\\<\\b> simbolius reikia rašyti <b>\\</b> (pvz. <b>\\\"</b> ir <b>\\\\"
+"</b>)."
+
msgid "combinators"
msgstr "kombinatoriai"
@@ -2717,15 +2614,6 @@ msgstr "loginis ne"
msgid "use parenthesis to group expressions"
msgstr "išraiškų grupavimui naudokite skliaustus"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"veiksmų išskyrimas kabutėmis.<br>Kabutėmis išskirtame tekste prieš <b>\"</b> "
-"ir <b>\\<\\b> simbolius reikia rašyti <b>\\</b> (pvz. <b>\\\"</b> ir <b>\\\\"
-"</b>)."
-
msgid "objects"
msgstr "objektai"
@@ -2760,10 +2648,16 @@ msgid "objects with last modification timestamp within range"
msgstr "objektai su paskutine keitimo data intervale"
msgid "properties"
-msgstr "ypatybęs"
+msgstr "savybės"
+
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+"keliai su ne mažiau nei 20 taškų arba ryšiai, kuriuose yra bent 20 taškų"
-msgid "objects with at least 20 nodes"
-msgstr "objektai su ne mažiau nei 20 taškų"
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr "taškai su bent 3 susijusiais keliais arba ryšiai su bent 3 keliais"
msgid "objects having 5 to 10 tags"
msgstr "objektai, turintys nuo 5 iki 10 žymų"
@@ -2774,6 +2668,9 @@ msgstr "objektai su nurodyta role ryšyje"
msgid "closed ways with an area of 100 m²"
msgstr "uždari keliai, kurių plotas 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr "keliai, ilgesni už 200 m"
+
msgid "state"
msgstr "būsena"
@@ -2838,11 +2735,11 @@ msgstr "Rasta {0} atitikmenų"
msgctxt "search"
msgid "CS"
-msgstr "CS"
+msgstr "SR"
msgctxt "search"
msgid "CI"
-msgstr "CI"
+msgstr "NR"
msgctxt "search"
msgid "RX"
@@ -2933,7 +2830,7 @@ msgid "API Capabilities Violation"
msgstr "API galimybių pažeidimas"
msgid "Cyclic dependency between relations:"
-msgstr "Ciklinis ryšys tarp ryšių:"
+msgstr "Ciklinė priklausomybė tarp ryšių:"
msgid "Removed obsolete tags"
msgstr "Pašalintos nebenaudojamos žymos"
@@ -2947,7 +2844,7 @@ msgid ""
"dependency.</html>"
msgstr ""
"<html>{0} ryšių sukuria ciklą, nes jie turi nuorodų vienas į kitą.<br>JOSM "
-"negali jų įkelti. Prašome pakeisti ryšius ir panaikinti ciklines "
+"negali jų išsiųsti. Prašome pakeisti ryšius ir panaikinti ciklines "
"priklausomybes.</html>"
msgid "Relation ..."
@@ -2957,10 +2854,10 @@ msgid "... refers to relation"
msgstr "...rodo į ryšį"
msgid "Cycling dependencies"
-msgstr "Ciklinė priklausomybė"
+msgstr "Ciklinės priklausomybės"
msgid "Uploading modified notes"
-msgstr "Įrašomos pakeistos pastabos"
+msgstr "Išsiunčiamos pakeistos pastabos"
msgid "Note {0} failed: {1}"
msgstr "Pastaba {0} nepavyko: {1}"
@@ -2989,22 +2886,22 @@ msgid "Warnings"
msgstr "Perspėjimai"
msgid "Fix these when possible."
-msgstr "Pataisykite jeigu imanoma."
+msgstr "Pataisykite, kai įmanoma."
msgid "Other"
-msgstr "KIta"
+msgstr "Kita"
msgid "Informational warnings, expect many false entries."
msgstr "Informaciniai įspėjimai, tikėkitės daug neteisingų įrašų."
msgid "Suspicious data found. Upload anyway?"
-msgstr "Rasti įtartini duomenys. Vis tiek įrašyti?"
+msgstr "Rasti įtartini duomenys. Vis tiek išsiųsti?"
msgid "Continue upload"
msgstr "Tęsti išsiuntimą"
msgid "Add node {0}"
-msgstr "Pridti tašką {0}"
+msgstr "Pridėti tašką {0}"
msgid "Add way {0}"
msgstr "Pridėti kelią {0}"
@@ -3055,25 +2952,25 @@ msgid "Remove \"{0}\" for {1} object"
msgid_plural "Remove \"{0}\" for {1} objects"
msgstr[0] "Išimti „{0}“ {1} objektui"
msgstr[1] "Išimti „{0}“ {1} objektams"
-msgstr[2] "Išimti „{0}“ {1} objektams"
+msgstr[2] "Išimti „{0}“ {1} objektų"
msgid "Set {0}={1} for {2} object"
msgid_plural "Set {0}={1} for {2} objects"
msgstr[0] "Nustatyti {0}={1} {2} objektui"
msgstr[1] "Nustatyti {0}={1} {2} objektams"
-msgstr[2] "Nustatyti {0}={1} {2} objektams"
+msgstr[2] "Nustatyti {0}={1} {2} objektų"
msgid "Deleted {0} tags for {1} object"
msgid_plural "Deleted {0} tags for {1} objects"
msgstr[0] "Ištrinta {0} žymų {1} objektui"
-msgstr[1] "Ištrinta {0} žymų {1} objektui"
-msgstr[2] "Ištrinta {0} žymų {1} objektui"
+msgstr[1] "Ištrinta {0} žymų {1} objektams"
+msgstr[2] "Ištrinta {0} žymų {1} objektų"
msgid "Set {0} tags for {1} object"
msgid_plural "Set {0} tags for {1} objects"
msgstr[0] "Nustatyta {0} žymų {1} objektui"
-msgstr[1] "Nustatyta {0} žymų {1} objektui"
-msgstr[2] "Nustatyta {0} žymų {1} objektui"
+msgstr[1] "Nustatyta {0} žymų {1} objektams"
+msgstr[2] "Nustatyta {0} žymų {1} objektų"
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Keisti „{0} į „{1}“"
@@ -3109,19 +3006,19 @@ msgid "Delete {0} node"
msgid_plural "Delete {0} nodes"
msgstr[0] "Trinti {0} tašką"
msgstr[1] "Trinti {0} taškus"
-msgstr[2] "Trinti {0} taškus"
+msgstr[2] "Trinti {0} taškų"
msgid "Delete {0} way"
msgid_plural "Delete {0} ways"
msgstr[0] "Trinti {0} kelią"
msgstr[1] "Trinti {0} kelius"
-msgstr[2] "Trinti {0} kelius"
+msgstr[2] "Trinti {0} kelių"
msgid "Delete {0} relation"
msgid_plural "Delete {0} relations"
-msgstr[0] "Ištrinti {0} ryšį"
-msgstr[1] "Ištrinti {0} ryšius"
-msgstr[2] "Ištrinti {0} ryšius"
+msgstr[0] "Šalinti {0} ryšį"
+msgstr[1] "Šalinti {0} ryšius"
+msgstr[2] "Šalinti {0} ryšių"
msgid "Deleted ''{0}''"
msgstr "Ištrintas „{0}“"
@@ -3134,16 +3031,16 @@ msgid ""
"downloaded.<br>This can cause problems because other objects (that you do "
"not see) might use them.<br>Do you really want to delete?"
msgstr ""
-"Jūs tuoj ištrinsite taškus už jūsų atsiųsto ploto ribų.<br>Dėl to gali kilti "
+"Ruošiatės pašalinti taškus už jūsų atsiųsto ploto ribų.<br>Dėl to gali kilti "
"problemų su kitais objektais (kurių jūs nematote), kurie gali naudoti tuos "
-"taškus.<br>Ar tikrai norite ištrinti?"
+"taškus.<br>Ar tikrai norite pašalinti?"
msgid ""
"You are about to delete incomplete objects.<br>This will cause problems "
"because you don''t see the real object.<br>Do you really want to delete?"
msgstr ""
-"Jūs tuoj ištrinsite nepilnus objektus.<br>Tai sukels problemų, nes jūs "
-"nematote tikro objekto.<br>Ar tikrai norite ištrinti?"
+"Ruošiatės pašalinti nepilnus objektus.<br>Tai sukels problemų, nes nematote "
+"tikro objekto.<br>Ar tikrai norite pašalinti?"
msgid ""
"You are about to delete {0} relation: {1}<br/>This step is rarely necessary "
@@ -3154,32 +3051,32 @@ msgid_plural ""
"and cannot be undone easily after being uploaded to the server.<br/>Do you "
"really want to delete?"
msgstr[0] ""
-"Jūs tuoj ištrinsite {0} ryšį: {1}<br/>Toks žingsnis retai reikalingas ir "
-"nėra lengvai atstatomas po to, kai pakeitimai nusiunčiami į serverį.<br/>Ar "
-"tikrai norite ištrinti?"
+"Ruošiatės pašalinti {0} ryšį: {1}<br/>Toks žingsnis retai reikalingas ir "
+"nėra lengvai atstatomas po to, kai pakeitimai išsiunčiami į serverį.<br/>Ar "
+"tikrai norite pašalinti?"
msgstr[1] ""
-"Jūs tuoj ištrinsite {0} ryšius: {1}<br/>Toks žingsnis retai reikalingas ir "
-"nėra lengvai atstatomas po to, kai pakeitimai nusiunčiami į serverį.<br/>Ar "
-"tikrai norite ištrinti?"
+"Ruošiatės pašalinti {0} ryšius: {1}<br/>Toks žingsnis retai reikalingas ir "
+"nėra lengvai atstatomas po to, kai pakeitimai išsiunčiami į serverį.<br/>Ar "
+"tikrai norite pašalinti?"
msgstr[2] ""
-"Jūs tuoj ištrinsite {0} ryšius: {1}<br/>Toks žingsnis retai reikalingas ir "
-"nėra lengvai atstatomas po to, kai pakeitimai nusiunčiami į serverį.<br/>Ar "
-"tikrai norite ištrinti?"
+"Ruošiatės pašalinti {0} ryšių: {1}<br/>Toks žingsnis retai reikalingas ir "
+"nėra lengvai atstatomas po to, kai pakeitimai išsiunčiami į serverį.<br/>Ar "
+"tikrai norite pašalinti?"
msgid "Delete relation?"
-msgstr "Ištrinti ryšį?"
+msgstr "Pašalinti ryšį?"
msgid "Move {0} node"
msgid_plural "Move {0} nodes"
msgstr[0] "Perkelti {0} tašką"
msgstr[1] "Perkelti {0} taškus"
-msgstr[2] "Perkelti {0} taškus"
+msgstr[2] "Perkelti {0} taškų"
msgid "Purged {0} object"
msgid_plural "Purged {0} objects"
msgstr[0] "Išvalytas {0} objektas"
msgstr[1] "Išvalyti {0} objektai"
-msgstr[2] "Išvalyti {0} objektai"
+msgstr[2] "Išvalyta {0} objektų"
msgid "Removed nodes from {0}"
msgstr "Išimti taškai iš {0}"
@@ -3188,7 +3085,7 @@ msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Pasukti {0} tašką"
msgstr[1] "Pasukti {0} taškus"
-msgstr[2] "Pasukti {0} taškus"
+msgstr[2] "Pasukti {0} taškų"
msgid "Scale {0} node"
msgid_plural "Scale {0} nodes"
@@ -3200,7 +3097,7 @@ msgid "Selected {0} object"
msgid_plural "Selected {0} objects"
msgstr[0] "Pažymėtas {0} objektas"
msgstr[1] "Pažymėti {0} objektai"
-msgstr[2] "Pažymėti {0} objektai"
+msgstr[2] "Pažymėta {0} objektų"
msgid "Sequence: {0}"
msgstr "Seka: {0}"
@@ -3209,7 +3106,7 @@ msgid "Transform {0} node"
msgid_plural "Transform {0} nodes"
msgstr[0] "Transformuoti {0} tašką"
msgstr[1] "Transformuoti {0} taškus"
-msgstr[2] "Transformuoti {0} taškus"
+msgstr[2] "Transformuoti {0} taškų"
msgid ""
"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>This "
@@ -3260,19 +3157,19 @@ msgid "Resolve {0} tag conflict in node {1}"
msgid_plural "Resolve {0} tag conflicts in node {1}"
msgstr[0] "Išspręsti {0} žymų konfliktą taške {1}"
msgstr[1] "Išspręsti {0} žymų konfliktus taške {1}"
-msgstr[2] "Išspręsti {0} žymų konfliktus taške {1}"
+msgstr[2] "Išspręsti {0} žymų konfliktų taške {1}"
msgid "Resolve {0} tag conflict in way {1}"
msgid_plural "Resolve {0} tag conflicts in way {1}"
msgstr[0] "Išspręsti {0} žymų konfliktą kelyje {1}"
msgstr[1] "Išspręsti {0} žymų konfliktus kelyje {1}"
-msgstr[2] "Išspręsti {0} žymų konfliktus kelyje {1}"
+msgstr[2] "Išspręsti {0} žymų konfliktų kelyje {1}"
msgid "Resolve {0} tag conflict in relation {1}"
msgid_plural "Resolve {0} tag conflicts in relation {1}"
msgstr[0] "Išspręsti {0} žymų konfliktą ryšyje {1}"
msgstr[1] "Išspręsti {0} žymų konfliktus ryšyje {1}"
-msgstr[2] "Išspręsti {0} žymų konfliktus ryšyje {1}"
+msgstr[2] "Išspręsti {0} žymų konfliktų ryšyje {1}"
msgid "Resolve version conflict for node {0}"
msgstr "Išspręsti taško {0} versijos konfliktą"
@@ -3336,13 +3233,13 @@ msgid "Old key"
msgstr "Senasis raktas"
msgid "Old value"
-msgstr "Senoji vertė"
+msgstr "Sena reikšmė"
msgid "New key"
msgstr "Naujas raktas"
msgid "New value"
-msgstr "Nauja vertė"
+msgstr "Nauja reikšmė"
msgid "Apply selected changes"
msgstr "Pritaikyti pažymėtus pakeitimus"
@@ -3351,7 +3248,7 @@ msgid "Do not apply changes"
msgstr "Netaikyti pakeitimų"
msgid "Please select which changes you want to apply."
-msgstr "Prašome parinkti, kuriuos pakeitimus taikyti"
+msgstr "Prašome parinkti, kuriuos pakeitimus taikyti."
msgid "Tags of "
msgstr "Žymos "
@@ -3373,7 +3270,7 @@ msgstr ""
"Įvesties klaida kuriant failą, automatinis įrašymas bus praleistas: {0}"
msgid "Unable to delete old backup file {0}"
-msgstr "Nepavyksta ištrinti seną atsarginį failą {0}"
+msgstr "Nepavyko pašalinti seno atsarginio failo {0}"
msgid "Your work has been saved automatically."
msgstr "Jūsų darbas buvo automatiškai įrašytas."
@@ -3397,7 +3294,7 @@ msgid "Enter text"
msgstr "Įveskite tekstą"
msgid "Installing plugins"
-msgstr "Diegiami priedai"
+msgstr "Diegiami papildiniai"
msgid ""
"<html>Settings file asks to append preferences to <b>{0}</b>,<br/> but its "
@@ -3412,7 +3309,7 @@ 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ūkstamą podėlio aplanką: {0}</html>"
+msgstr "<html>Nepavyko sukurti trūkstamo podėlio aplanko: {0}</html>"
msgid ""
"Failed to initialize preferences. Preference directory ''{0}'' is not a "
@@ -3472,7 +3369,7 @@ msgstr ""
"numatytuoju: {0}"
msgid "Paint style {0}: {1}"
-msgstr "Paišymo stilus {0}: {1}"
+msgstr "Paišymo stilius {0}: {1}"
msgid "Layer: {0}"
msgstr "Sluoksnis: {0}"
@@ -3551,7 +3448,7 @@ msgid "ID > 0 expected. Got {0}."
msgstr "Tikėtasi ID > 0. Gauta {0}."
msgid "Version > 0 expected. Got {0}."
-msgstr "Tikėtasi Version > 0. Gauta {0}"
+msgstr "Tikėtasi versijos > 0. Gauta {0}."
msgid ""
"Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is "
@@ -3630,19 +3527,19 @@ msgid "node"
msgid_plural "nodes"
msgstr[0] "taškas"
msgstr[1] "taškai"
-msgstr[2] "taškai"
+msgstr[2] "taškų"
msgid "way"
msgid_plural "ways"
msgstr[0] "kelias"
msgstr[1] "keliai"
-msgstr[2] "keliai"
+msgstr[2] "kelių"
msgid "relation"
msgid_plural "relations"
msgstr[0] "ryšys"
msgstr[1] "ryšiai"
-msgstr[2] "ryšiai"
+msgstr[2] "ryšių"
msgid "closedway"
msgstr "uždaras kelias"
@@ -3694,7 +3591,8 @@ msgid ""
"Can''t activate map renderer class ''{0}'', because it isn''t a subclass of "
"''{1}''."
msgstr ""
-"Negalima aktyvuoti žemėlapio braižymo klasės „{0}“, nes ji yra „{1}“ poklasė."
+"Negalima aktyvuoti žemėlapio braižymo klasės „{0}“, nes ji nėra „{1}“ "
+"poklasis."
msgid ""
"Can''t activate map renderer class ''{0}'', because it isn''t registered as "
@@ -3719,7 +3617,7 @@ msgid "inactive"
msgstr "neaktyvus"
msgid "selected"
-msgstr "parinkti"
+msgstr "pažymėta"
msgid "Relation: selected"
msgstr "Ryšys: pažymėtas"
@@ -3884,682 +3782,710 @@ msgid "E-mail address contains an invalid domain: {0}"
msgstr "E-pašto adrese yra netinkamas domenas: {0}"
msgid "URL contains non-ascii characters"
-msgstr ""
+msgstr "URL aptikti ne ascii simboliai"
msgid "URL is invalid"
-msgstr ""
+msgstr "URL netinkamas"
msgid "URL contains an invalid protocol: {0}"
-msgstr ""
+msgstr "URL aptiktas netinkamas protokolas: {0}"
msgid "URL contains an invalid authority: {0}"
-msgstr ""
+msgstr "URL aptikti netinkami įgaliojimai: {0}"
msgid "URL contains an invalid path: {0}"
-msgstr ""
+msgstr "URL aptiktas netinkamas kelias: {0}"
msgid "URL contains an invalid query: {0}"
-msgstr ""
+msgstr "URL aptikta netinkama užklausa: {0}"
msgid "URL contains an invalid fragment: {0}"
-msgstr ""
+msgstr "URL aptiktas netinkamas fragmentas: {0}"
msgid "Addresses"
msgstr "Adresai"
msgid "Checks for errors in addresses and associatedStreet relations."
-msgstr ""
+msgstr "Tikrina klaidas adresuose ir associatedStreet ryšiuose."
msgid "Multiple associatedStreet relations"
-msgstr ""
+msgstr "Keli associatedStreet ryšiai"
msgid "House number without street"
msgstr "Namo numeris be gatvės"
msgid "House number ''{0}'' duplicated"
-msgstr ""
+msgstr "Namo numerio „{0}“ dublis"
msgid "Duplicate house numbers"
msgstr "Dubliuoti namo numeriai"
msgid "Multiple street names in relation"
-msgstr ""
+msgstr "Kely gatvių pavadinimai ryšyje"
msgid "House number too far from street"
msgstr "Namo numeris per toli nuo gatvės"
msgid "API Capabilities"
-msgstr ""
+msgstr "API galimybės"
msgid "Checks for errors against API capabilities"
-msgstr ""
+msgstr "Tikrina klaidas pagal API galimybes"
msgid ""
"Way contains more than {0} nodes. It should be replaced by a multipolygon"
-msgstr ""
+msgstr "Kelyje yra daugiau nei {0} taškų. Jį reikia pakeisti multipoligonu"
msgid "Way contains more than {0} nodes. It should be split or simplified"
msgstr ""
+"Kelyje yra daugiau nei {0} taškų. Jį reikia padalinti arba supaprastinti"
msgid "Barriers and entrances"
msgstr "Barjerai ir įėjimai"
msgid "Checks for errors in barriers and entrances."
-msgstr ""
+msgstr "Tikrina klaidas barjeruose ir įėjimuose."
msgid "Barrier entrance not set on a barrier"
-msgstr ""
+msgstr "Barjerui nenurodytas barjero įėjimas"
msgid "Coastlines"
-msgstr ""
+msgstr "Kranto linijos"
msgid "This test checks that coastlines are correct."
-msgstr ""
+msgstr "Šis testas tikrina, ar teisingos kranto linijos."
msgid "Unconnected coastline"
-msgstr ""
+msgstr "Neprijungta kranto linija"
msgid "Unordered coastline"
-msgstr ""
+msgstr "Nesurikiuota kranto linija"
msgid "Reversed coastline"
-msgstr ""
+msgstr "Atbula kranto linija"
msgid "Conditional Keys"
-msgstr ""
+msgstr "Sąlyginiai raktai"
msgid "Tests for the correct usage of ''*:conditional'' tags."
-msgstr ""
+msgstr "Teisingo „*:conditional“ žymų naudojimo testai."
msgid "Does not match pattern ''restriction value @ condition''"
-msgstr ""
+msgstr "Neatitinka šablono „apribojimo reikšmė @ sąlyga“"
msgid "{0} is not a valid restriction value"
-msgstr ""
+msgstr "{0} nėra tinkama apribojimo reikšmė"
msgid "Wrong syntax in {0} key"
-msgstr ""
+msgstr "Neteisinga sintaksė rakte {0}"
msgid "Error in {0} value: {1}"
-msgstr ""
+msgstr "Klaida {0} reikšmėje: {1}"
msgid "Crossing ways"
-msgstr ""
+msgstr "Susikertantys keliai"
msgid "Crossing buildings"
-msgstr ""
+msgstr "Susikertantys pastatai"
msgid "Crossing waterways"
-msgstr ""
+msgstr "Susikertantys vandens keliai"
msgid "Crossing waterway/highway"
-msgstr ""
+msgstr "Susikertantis vanduo ir kelias"
msgid "Crossing boundaries"
-msgstr ""
+msgstr "Susikertančios ribos"
msgid "Crossing barriers"
-msgstr ""
+msgstr "Susikertantys barjerai"
msgid ""
"This test checks if two roads, railways, waterways or buildings crosses in "
"the same layer, but are not connected by a node."
msgstr ""
+"Testas tikrina, ar du keliai, geležinkeliai, vandens keliai ar pastatai "
+"kertasi tame pačiame lygmenyje, bet nėra sujungti tašku."
msgid "Duplicated nodes"
-msgstr ""
+msgstr "Dubliuoti taškai"
msgid "This test checks that there are no nodes at the very same location."
-msgstr ""
+msgstr "Testas tikrina, ar nėra kelių taškų toje pačioje pozicijoje."
msgid "Mixed type duplicated nodes"
-msgstr ""
+msgstr "Skirtingų tipų taškų dubliai"
msgid "Highway duplicated nodes"
-msgstr ""
+msgstr "Kelio taškų dubliai"
msgid "Railway duplicated nodes"
-msgstr ""
+msgstr "Geležinkelio taškų dubliai"
msgid "Waterway duplicated nodes"
-msgstr ""
+msgstr "Vandens kelių taškų dubliai"
msgid "Boundary duplicated nodes"
-msgstr ""
+msgstr "Ribų taškų dubliai"
msgid "Power duplicated nodes"
-msgstr ""
+msgstr "Elektros linijų taškų dubliai"
msgid "Natural duplicated nodes"
-msgstr ""
+msgstr "Gamtos plotų taškų dubliai"
msgid "Building duplicated nodes"
-msgstr ""
+msgstr "Pastatų taškų dubliai"
msgid "Landuse duplicated nodes"
-msgstr ""
+msgstr "Žemėnaudos taškų dubliai"
msgid "Other duplicated nodes"
-msgstr ""
+msgstr "Kiti taškų dubliai"
msgid "Nodes at same position"
-msgstr ""
+msgstr "Taškai toje pačioje pozicijoje"
msgid "Duplicated relations"
-msgstr ""
+msgstr "Ryšių dubliai"
msgid ""
"This test checks that there are no relations with same tags and same members "
"with same roles."
msgstr ""
+"Šis testas tikrina, ar nėra ryšių su tomis pačiomis žymomis ir tais pačiais "
+"nariais su tomis pačiomis rolėmis."
msgid "Relations with same members"
-msgstr ""
+msgstr "Ryšiai su tais pačiais nariais"
msgid "Delete duplicate relations"
-msgstr ""
+msgstr "Šalinti ryšių dublius"
msgid "Duplicated ways"
-msgstr ""
+msgstr "Kelių dubliai"
msgid ""
"This test checks that there are no ways with same node coordinates and "
"optionally also same tags."
msgstr ""
+"Testas tikrina ar nėra kelių su tomis pačiomis taškų koordinatėmis ir galbūt "
+"tomis pačiomis žymomis."
msgid "Ways with same position"
-msgstr ""
+msgstr "Keliai su ta pačia pozicija"
msgid "Delete duplicate ways"
-msgstr ""
+msgstr "Šalinti kelių dublius"
msgid "Duplicated way nodes"
-msgstr ""
+msgstr "Kelių taškų dubliai"
msgid "Checks for ways with identical consecutive nodes."
-msgstr ""
+msgstr "Tikrina kelius su identiška taškų seka."
msgid "Highways"
msgstr "Keliai"
msgid "Performs semantic checks on highways."
-msgstr ""
+msgstr "Vykdo semantinį kelių tikrinimą."
msgid "Incorrect roundabout (highway: {0} instead of {1})"
-msgstr ""
+msgstr "Netinkamas žiedas (kelias: {0} vietoje {1})"
msgid "Highway link is not linked to adequate highway/link"
-msgstr ""
+msgstr "Kelio jungtis neprijungta prie tinkamo kelio/jungties"
msgid "Missing pedestrian crossing information"
-msgstr ""
+msgstr "Trūksta pėsčiųjų perėjos informacijos"
msgid "Unknown country code: {0}"
-msgstr ""
+msgstr "Nežinomas šalies kodas: {0}"
msgid "Unknown source:maxspeed context: {0}"
-msgstr ""
+msgstr "Nežinomas source:maxspeed kontekstas: {0}"
msgid "Internet tags"
-msgstr ""
+msgstr "Interneto žymos"
msgid "Checks for errors in internet-related tags."
-msgstr ""
+msgstr "Ieško klaidų su internetu susijusiose žymose."
msgid " URL cannot be converted to ASCII: {0}"
-msgstr ""
+msgstr " URL negalima konvertuoti į ASCII: {0}"
msgid "''{0}'': {1}"
-msgstr ""
+msgstr "„{0}“: {1}"
msgid "Lane tags"
-msgstr ""
+msgstr "Juostų žymos"
msgid "Test that validates ''lane:'' tags."
-msgstr ""
+msgstr "Testas tikrina „lane:“ žymas."
msgid "Number of {0} greater than {1}"
-msgstr ""
+msgstr "{0} skaičius didesnis už {1}"
msgid "{0}+{1}"
msgstr "{0} + {1}"
msgid "Number of lane dependent values inconsistent"
-msgstr ""
+msgstr "Nenuoseklus skaičius nuo juostų priklausančių reikšmių"
msgid "Number of lane dependent values inconsistent in forward direction"
-msgstr ""
+msgstr "Nenuoseklus skaičius nuo juostų priklausančių reikšmių pirmyn"
msgid "Number of lane dependent values inconsistent in backward direction"
-msgstr ""
+msgstr "Nenuoseklus skaičius nuo juostų priklausančių reikšmių atgal"
msgid "Tag checker (MapCSS based)"
-msgstr ""
+msgstr "Žymų tikrinimas (pagal MapCSS)"
msgid "This test checks for errors in tag keys and values."
-msgstr ""
+msgstr "Šis testas ieško klaidų žymose ir jų reikšmėse."
msgid "Unable to replace argument {0} in {1}: {2}"
-msgstr ""
+msgstr "Nepavyksta pakeisti argumento {0} esančio {1}: {2}"
msgid "Fix of {0}"
-msgstr ""
+msgstr "{0} pataisymas"
msgid " or "
msgstr " arba "
msgid "{0}, use {1} instead"
-msgstr ""
+msgstr "{0}, vietoje jo naudokite {1}"
msgid "Adding {0} to tag checker"
-msgstr ""
+msgstr "Prie žymų tikrintojo pridedamas {0}"
msgid "Failed to add {0} to tag checker"
-msgstr ""
+msgstr "Nepavyko pridėti {0} į žymų tikrintoją"
msgid "Multipolygon"
-msgstr ""
+msgstr "Multipoligonas"
msgid "This test checks if multipolygons are valid."
-msgstr ""
+msgstr "Šis testas tikrina, ar teisingi multipoligonai."
msgid "Area style way is not closed"
-msgstr ""
+msgstr "Ploto tipo kelias neuždaras"
msgid "No outer way for multipolygon"
-msgstr ""
+msgstr "Multipoligonas neturi išorinio kelio"
msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
+msgstr "„{0}“ rolė turėtų būti „{1}“"
msgid "No area style for multipolygon"
-msgstr ""
+msgstr "Multipoligonas neturi ploto stiliaus"
msgid ""
"Multipolygon relation should be tagged with area tags and not the outer way"
msgid_plural ""
"Multipolygon relation should be tagged with area tags and not the outer ways"
msgstr[0] ""
+"Ploto žymos turi būti multipoligono ryšyje, o ne išoriniame kelyje"
msgstr[1] ""
+"Ploto žymos turi būti multipoligono ryšyje, o ne išoriniuose keliuose"
+msgstr[2] ""
+"Ploto žymos turi būti multipoligono ryšyje, o ne išoriniuose keliuose"
msgid ""
"With the currently used mappaint style the style for inner way equals the "
"multipolygon style"
msgstr ""
+"Su dabar naudojamu mappaint stiliumi, vidinio kelio stilius sutampa su "
+"multipoligono stiliumi"
msgid "Style for outer way mismatches"
-msgstr ""
+msgstr "Netinkamas išorinio kelio stilius"
msgid ""
"With the currently used mappaint style(s) the style for outer way mismatches "
"polygon"
msgstr ""
+"Su dabar parinktu mappaint stiliumi išorinio kelio stilius neatitinka "
+"poligono"
msgid "Area style on outer way"
-msgstr ""
+msgstr "Ploto stilius išoriniame kelyje"
msgid "Multipolygon is not closed"
-msgstr ""
+msgstr "Neuždaras multipoligonas"
msgid "Multipolygon inner way is outside"
-msgstr ""
+msgstr "Multipoligono vidinis kelias yra išorėje"
msgid "Intersection between multipolygon ways"
-msgstr ""
+msgstr "Multipoligono kelių susikirtimas"
msgid "No useful role for multipolygon member"
-msgstr ""
+msgstr "Nėra naudingos multipoligono nario rolės"
msgid "Non-Way in multipolygon"
-msgstr ""
+msgstr "Ne kelias multipoligone"
msgid "Missing name:* translation"
-msgstr ""
+msgstr "Trūksta name:* vertimo"
msgid ""
"This test finds multilingual objects whose ''name'' attribute is not equal "
"to some ''name:*'' attribute and not a composition of ''name:*'' attributes, "
"e.g., Italia - Italien - Italy."
msgstr ""
+"Šis testas randa objektus, kurių „name“ atributas nėra lygus kuriam nors "
+"„name:*“ atributui ir nėra sudarytas iš kitų „name:*“ atributų, pvz., "
+"Nemunėlis – Mēmele."
-msgid "A name:* translation is missing."
-msgstr ""
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr "Trūksta name:*={0}. Pridėkite žymą su teisingu kalbos raktu."
msgid "A name is missing, even though name:* exists."
-msgstr ""
+msgstr "Trūksta pavadinimo (name), nors yra name:*."
msgid "Opening hours syntax"
-msgstr ""
+msgstr "Darbo laiko sintaksė"
msgid "This test checks the correct usage of the opening hours syntax."
-msgstr ""
+msgstr "Šis testas tikrina teisingą darbo laiko sintaksę."
msgid "opening_hours value can be prettified"
-msgstr ""
+msgstr "opening_hours reikšmė gali būti pagražinta"
msgid "Unexpected token:"
-msgstr ""
+msgstr "Netikėta žyma"
msgid "Unexpected token (school holiday parser):"
-msgstr ""
+msgstr "Netikėta žyma (mokyklos atostogų analizatorius):"
msgid "Unexpected token in number range:"
-msgstr ""
+msgstr "Netikėta žyma skaičių intervale:"
msgid "Unexpected token in week range:"
-msgstr ""
+msgstr "Netikėta žyma svaitės intervale:"
msgid "Unexpected token in weekday range:"
-msgstr ""
+msgstr "Netikėta žyma savaitės dienų intervale:"
msgid "Unexpected token in month range:"
-msgstr ""
+msgstr "Netikėta žyma mėnesių intervale:"
msgid "Unexpected token in year range:"
-msgstr ""
+msgstr "Netikėta žyma metų intervale:"
msgid "Invalid/unsupported syntax."
-msgstr ""
+msgstr "Neteisinga/nepalaikoma sintaksė."
msgid "Overlapping ways"
-msgstr ""
+msgstr "Persidengiantys keliai"
msgid ""
"This test checks that a connection between two nodes is not used by more "
"than one way."
msgstr ""
+"Šis testas tikrina, kad jungtis tarp dviejų taškų nebūtų naudojama daugiau "
+"nei viename kelyje."
msgid "Areas share segment"
-msgstr ""
+msgstr "Plotai dalinasi segmentu"
msgid "Highways share segment with area"
-msgstr ""
+msgstr "Kelias dalinasi segmentu su plotu"
msgid "Railways share segment with area"
-msgstr ""
+msgstr "Geležinkelis dalinasi segmentu su plotu"
msgid "Ways share segment with area"
-msgstr ""
+msgstr "Keliai dalinasi segmentu su plotu"
msgid "Overlapping highways"
-msgstr ""
+msgstr "Persidengiantys keliai"
msgid "Overlapping railways"
-msgstr ""
+msgstr "Persidengiantys geležinkeliai"
msgid "Way contains segment twice"
-msgstr ""
+msgstr "Segmentas du kartus įtrauktas į kelią"
msgid "Power lines"
-msgstr ""
+msgstr "Elektros linijos"
msgid ""
"Checks for nodes in power lines that do not have a power=tower/pole tag."
msgstr ""
+"Tikrina taškus elektros linijose, kurie neturi power=tower/pole žymos."
msgid "Missing power tower/pole within power line"
-msgstr ""
+msgstr "Elektros linijoje trūksta bokšto/stulpo"
msgid "Role verification problem"
-msgstr ""
+msgstr "Rolės tikrinimo problema"
msgid "Relation checker"
msgstr "Ryšių kontrolė"
msgid "Checks for errors in relations."
-msgstr ""
+msgstr "Ieško klaidų ryšiuose."
msgid ""
"Route scheme is unspecified. Add {0} ({1}=public_transport; {2}=legacy)"
msgstr ""
+"Nenurodyta maršruto schema. Pridėkite {0} ({1}=public_transport; {2}=legacy)"
msgid "Relation type is unknown"
-msgstr ""
+msgstr "Nežinomas ryšio tipas"
msgid "Relation is empty"
-msgstr ""
+msgstr "Ryšys yra tuščias"
msgid "Role member does not match expression {0} in template {1}"
-msgstr ""
+msgstr "Ryšio narys neatitinka išraiškos {0} šablone {1}"
msgid ""
"Role member type {0} does not match accepted list of {1} in template {2}"
-msgstr ""
+msgstr "Ryšio nario tipas {0} neatitinka priimtinų sąrašo {1} šablone {2}"
msgid "<empty>"
msgstr "<tuščias>"
msgid "Role {0} unknown in templates {1}"
-msgstr ""
+msgstr "Rolė {0} nežinoma šablonuose {1}"
msgid "Empty role type found when expecting one of {0}"
-msgstr ""
+msgstr "Rastas tuščias rolės tipas, kai buvo tikėtasi vieno iš {0}"
msgid "Role {0} missing"
-msgstr ""
+msgstr "Trūksta rolės {0}"
msgid "Number of {0} roles too low ({1})"
-msgstr ""
+msgstr "Per mažai {0} rolių ({1})"
msgid "Number of {0} roles too high ({1})"
-msgstr ""
+msgstr "Per daug {0} rolių ({1})"
msgid "Self-intersecting ways"
-msgstr ""
+msgstr "Save kertantys keliai"
msgid ""
"This test checks for ways that contain some of their nodes more than once."
msgstr ""
+"Šis testas ieško kelių, kuriuose kuris nors taškas kartojasi daugiau nei "
+"kartą."
msgid "Similarly named ways"
-msgstr ""
+msgstr "Panašiai pavadinti keliai"
msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
+"Šis testas ieško kelių, kurių pavadinimai panašūs, todėl gali būti parašyti "
+"su klaida."
msgid "Tag checker"
-msgstr ""
+msgstr "Žymų tikrintojas"
msgid "Adding {0} to ignore tags"
-msgstr ""
+msgstr "{0} pridedama prie ignoruojamų žymų"
msgid "Invalid tagchecker line - {0}: {1}"
-msgstr ""
+msgstr "Netinkama žymų tikrintojo eilutė - {0}: {1}"
msgid "Invalid spellcheck line: {0}"
-msgstr ""
+msgstr "Netinkama rašybos tikrinimo eilutė: {0}"
msgid "Adding {0} to spellchecker"
-msgstr ""
+msgstr "{0} pridedama prie rašybos tikrinimo"
msgid ""
"Could not access data file(s):\n"
"{0}"
msgstr ""
+"Nepavyko prieiti prie duomenų failo(ų):\n"
+"{0}"
msgid "Suspicious tag/value combinations"
-msgstr ""
+msgstr "Įtartina žymos/reikšmės kombinacija"
msgid "Key ''{0}'' invalid."
msgstr "Raktas „{0}“ neteisingas."
msgid "Tag value contains character with code less than 0x20"
-msgstr ""
+msgstr "Žymos reikšmėje yra simbolis, kurio reikšmė mažesnė už 0x20"
msgid "Tag key contains character with code less than 0x20"
-msgstr ""
+msgstr "Žymoje yra simbolis, kurio reikšmė mažesnė už 0x20"
msgid "Tag value longer than allowed"
-msgstr ""
+msgstr "Žymos reikšmė ilgesnė už leistiną"
msgid "Tag key longer than allowed"
-msgstr ""
+msgstr "Žyma ilgesnė nei leistina"
msgid "Tags with empty values"
-msgstr ""
+msgstr "Žymos su tuščiomis reikšmėmis"
msgid "Invalid property key"
-msgstr ""
+msgstr "Netinkamas savybės raktas"
msgid "Invalid white space in property key"
-msgstr ""
+msgstr "Netinkamas tarpas savybės rakte"
msgid "Property values start or end with white space"
-msgstr ""
+msgstr "Savybės reikšmė prasideda ar baigiasi tarpu"
msgid "Property values contain HTML entity"
-msgstr ""
+msgstr "Savybės reikšmėje yra HTML esybė"
msgid "Key ''{0}'' not in presets."
-msgstr ""
+msgstr "Rakto „{0}“ nėra ruošiniuose."
msgid "Presets do not contain property key"
-msgstr ""
+msgstr "Išankstiniuose rinkiniuose nėra savybės rakto"
msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr ""
+msgstr "Rakto „{1}“ reikšmės „{0}“ nėra ruošiniuose."
msgid "Presets do not contain property value"
-msgstr ""
+msgstr "Išankstiniuose rinkiniuose nėra savybės reikšmės"
msgid "FIXMES"
msgstr "PATAISYKMANE"
msgid "Check property keys."
-msgstr ""
+msgstr "Tikrinti savybių raktus."
msgid "Validate that property keys are valid checking against list of words."
-msgstr ""
+msgstr "Tikrinta, kad savybių raktai tinkami pagal žodžių sąrašą."
msgid "Use complex property checker."
-msgstr ""
+msgstr "Naudoti sudėtingą savybių tikrintoją."
msgid "Validate property values and tags using complex rules."
-msgstr ""
+msgstr "Tikrinti savybių reikšmes ir žymas naudojant sudėtingas taisykles."
msgid "TagChecker source"
-msgstr ""
+msgstr "TagChecker šaltinis"
msgid "Data sources ({0})"
msgstr "Duomenų šaltiniai ({0})"
msgid "Check property values."
-msgstr ""
+msgstr "Tikrinti savybių reikšmes"
msgid "Validate that property values are valid checking against presets."
-msgstr ""
+msgstr "Tikrinti, kad savybių reikšmės yra tinkamos pagal ruošinius."
msgid "Check for FIXMES."
-msgstr ""
+msgstr "Ieškoti FIXME."
msgid "Looks for nodes or ways with FIXME in any property value."
-msgstr ""
+msgstr "Ieško taškų ar kelių, turinių FIXME savybių reikšmėse."
msgid "Fix tags"
-msgstr ""
+msgstr "Taisyti žymas"
msgid "Could not find element type"
-msgstr ""
+msgstr "Nerastas elemento tipas"
msgid "Incorrect number of parameters"
-msgstr ""
+msgstr "Netinkamas parametrų skaičius"
msgid "Could not find warning level"
-msgstr ""
+msgstr "Nerastas įspėjimo lygis"
msgid "Illegal expression ''{0}''"
-msgstr ""
+msgstr "Netinkama išraiška „{0}“"
msgid "Illegal regular expression ''{0}''"
-msgstr ""
+msgstr "Netinkama reguliari išraiška „{0}“"
msgid "Turnrestrictions"
-msgstr ""
+msgstr "Sukimo apribojimai"
msgid "This test checks if turnrestrictions are valid."
-msgstr ""
+msgstr "Šis testas tikrina, ar teisingi sukimo apribojimai."
msgid "Unknown role"
msgstr "Nežinoma rolė"
msgid "Unknown member type"
-msgstr ""
+msgstr "Nežinomas nario tipas"
msgid "More than one \"from\" way found"
-msgstr ""
+msgstr "Rastas daugiau nei vienas „from“ (iš) kelias"
msgid "More than one \"to\" way found"
-msgstr ""
+msgstr "Rastas daugiau nei vienas „to“ (į) kelias"
msgid "More than one \"via\" node found"
-msgstr ""
+msgstr "Rastas daugiau nei vienas „via“ (per) taškas"
msgid "Cannot mix node and way for role \"via\""
-msgstr ""
+msgstr "Rolei „via“ (per) negalima maišyti taško ir kelio"
msgid "No \"from\" way found"
-msgstr ""
+msgstr "Nerastas „from“ (iš) kelias"
msgid "No \"to\" way found"
-msgstr ""
+msgstr "Nerastas „to“ (į) kelias"
msgid "No \"via\" node or way found"
-msgstr ""
+msgstr "Nerastas „via“ (per) taškas arba kelias"
msgid "The \"from\" way does not start or end at a \"via\" node."
-msgstr ""
+msgstr "„from“ (iš) kelias neprasideda ar nesibaigia „via“ (per) taške."
msgid "Superfluous turnrestriction as \"to\" way is oneway"
-msgstr ""
+msgstr "Nereikalingas sukimo apribojimas, nes „to“ (į) kelias yra vienpusis"
msgid "The \"to\" way does not start or end at a \"via\" node."
-msgstr ""
+msgstr "„to“ (į) kelias neprasideda ir nesibaigia „via“ (per) taške"
msgid "The \"from\" and the first \"via\" way are not connected."
-msgstr ""
+msgstr "„from“ (iš) ir pirmas „via“ (per) keliai nesijungia."
msgid "The \"via\" ways are not connected."
-msgstr ""
+msgstr "„via“ (per) keliai nėra sujungti."
msgid "The last \"via\" and the \"to\" way are not connected."
-msgstr ""
+msgstr "Paskutinis „via“ (per) ir „to“ (į) keliai nesusijungia."
msgid "Unclosed Ways"
msgstr "Atviri Keliai"
msgid "This tests if ways which should be circular are closed."
-msgstr ""
+msgstr "Šis testas tikrina, kad keliai, kurie turi būti apvalūs yra uždari."
msgid "Unclosed way"
msgstr "Atviras kelias"
msgid "natural type {0}"
-msgstr ""
+msgstr "natūralus tipas {0}"
msgid "landuse type {0}"
-msgstr ""
+msgstr "žemėnaudos tipas {0}"
msgid "amenities type {0}"
-msgstr ""
+msgstr "paslaugų tipas {0}"
msgid "sport type {0}"
-msgstr ""
+msgstr "sporto tipas {0}"
msgid "tourism type {0}"
-msgstr ""
+msgstr "turizmo tipas {0}"
msgid "shop type {0}"
-msgstr ""
+msgstr "parduotuvės tipas {0}"
msgid "leisure type {0}"
-msgstr ""
+msgstr "laisvalaikio tipas {0}"
msgid "waterway type {0}"
-msgstr ""
+msgstr "vandens kelių tipas {0}"
msgid "boundary type {0}"
-msgstr ""
+msgstr "ribos tipas {0}"
msgid "building"
msgstr "pastatas"
@@ -4568,67 +4494,69 @@ msgid "area"
msgstr "plotas"
msgid "Unconnected highways"
-msgstr ""
+msgstr "Neprijungti keliai"
msgid "Unconnected railways"
-msgstr ""
+msgstr "Neprijungti geležinkeliai"
msgid "Unconnected waterways"
-msgstr ""
+msgstr "Neprijungti vandens keliai"
msgid "Unconnected natural lands and landuses"
-msgstr ""
+msgstr "Neprijungti natūralios gamtos ir žemėnaudos plotai"
msgid "Unconnected power ways"
-msgstr ""
+msgstr "Neprijungtos elektros linijos"
msgid "This test checks if a way has an endpoint very near to another way."
-msgstr ""
+msgstr "Testas tikrina, ar kelio paskutinis taškas nėra šalia kito kelio."
msgid "Way end node near other highway"
-msgstr ""
+msgstr "Kelio paskutinis taškas šalia kito kelio"
msgid "Way end node near other way"
-msgstr ""
+msgstr "Kelio paskutinis taškas šalia kito kelio"
msgid "Way node near other way"
-msgstr ""
+msgstr "Kelio taškas šalia kito kelio"
msgid "Connected way end node near other way"
-msgstr ""
+msgstr "Prijungto kelio paskutinis taškas šalia kito kelio"
msgid "Untagged and unconnected nodes"
-msgstr ""
+msgstr "Neprijungti taškai be žymų"
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
+"Šis testas ieško tašku, kurie neturi jokių žymų ir nepriklauso kitiems "
+"keliams."
msgid "Unconnected nodes without physical tags"
-msgstr ""
+msgstr "Neprijungti taškai be fizinių žymų"
msgid "No tags"
msgstr "Be žymių"
msgid "Has tag containing ''fixme'' or ''FIXME''"
-msgstr ""
+msgstr "Turi žymą su „fixme“ ar „FIXME“"
msgid "Has key ''note'' or ''comment'' or ''description''"
-msgstr ""
+msgstr "Turi raktą „note“ arba „comment“ arba „description“"
msgid "Has key ''created_by'' or ''converted_by''"
-msgstr ""
+msgstr "Turi raktą „created_by“ arba „converted_by“"
msgid "Has key ''watch''"
-msgstr ""
+msgstr "Turi raktą „watch“"
msgid "Has key ''source''"
-msgstr ""
+msgstr "Turi raktą „source“"
msgid "Untagged, empty and one node ways"
-msgstr ""
+msgstr "Keliai be žymų, tušti ar vieno taško keliai"
msgid "This test checks for untagged, empty and one node ways."
-msgstr ""
+msgstr "Šis testas ieško kelių be žymų, tuščių ar vieno taško kelių."
msgid "Unnamed ways"
msgstr "Bevardžiai keliai"
@@ -4652,34 +4580,34 @@ msgid "Way connected to Area"
msgstr "Kelias prijunktas prie Srities"
msgid "Checks for ways connected to areas."
-msgstr ""
+msgstr "Ieško kelių, prijungtų prie plotų."
msgid "Way terminates on Area"
-msgstr ""
+msgstr "Kelias baigiasi ties plotu"
msgid "Wrongly Ordered Ways"
-msgstr ""
+msgstr "Blogai surikiuoti keliai"
msgid "This test checks the direction of water, land and coastline ways."
-msgstr ""
+msgstr "Šis testas tikrina vandens, žemės ir kranto kelių kryptį."
msgid "Reversed coastline: land not on left side"
-msgstr ""
+msgstr "Atbulas krantas: žemė ne kairėje pusėje"
msgid "Reversed land: land not on left side"
-msgstr ""
+msgstr "Atbula žemė: žemė ne kairėje pusėje"
msgid "Show this dialog again the next time"
-msgstr ""
+msgstr "Kitą kartą ir vėl rodyti šį dialogą"
msgid "Do not show again (this operation)"
-msgstr ""
+msgstr "Daugiau nerodyti (šiam veiksmui)"
msgid "Do not show again (this session)"
-msgstr ""
+msgstr "Daugiau nerodyti (šiame seanse)"
msgid "Do not show again (remembers choice)"
-msgstr ""
+msgstr "Daugiau nerodyti (atsiminti pasirinkimą)"
msgid " [id: {0}]"
msgstr " [id: {0}]"
@@ -4691,13 +4619,13 @@ msgid "House {0}"
msgstr "Namas {0}"
msgid "House number {0} at {1}"
-msgstr ""
+msgstr "Namo numeris {0} esantis {1}"
msgid "House number {0}"
-msgstr ""
+msgstr "Namo numeris {0}"
msgid "highway"
-msgstr "greitkeliai"
+msgstr "greitkelis"
msgid "railway"
msgstr "geležinkeliai"
@@ -4706,48 +4634,49 @@ msgid "waterway"
msgstr "vandens keliai"
msgid "landuse"
-msgstr "žemės plotai"
+msgstr "žemėnauda"
msgid "{0} node"
msgid_plural "{0} nodes"
msgstr[0] "{0} taškas"
msgstr[1] "{0} taškai"
-msgstr[2] "{0} taškai"
+msgstr[2] "{0} taškų"
msgid "{0} member"
msgid_plural "{0} members"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} narys"
+msgstr[1] "{0} nariai"
+msgstr[2] "{0} narių"
msgid "public transport"
msgstr "viešasis transportas"
msgid "Changeset {0}"
-msgstr ""
+msgstr "Pakeitimas {0}"
msgid "Precondition violation"
-msgstr ""
+msgstr "Nepatenkinta sąlyga"
msgid "Security exception"
-msgstr ""
+msgstr "Saugumo klaida"
msgid "Network exception"
-msgstr ""
+msgstr "Tinklo klaida"
msgid "IO Exception"
-msgstr ""
+msgstr "Įvesties/išvesties klaida"
msgid "Illegal Data"
msgstr "Nelegalūs Duomenys"
msgid "Offline mode"
-msgstr ""
+msgstr "Režimas neprisijungus"
msgid "Internal Server Error"
msgstr "Vidinė serverio klaida"
msgid "Bad Request"
-msgstr "Bloga Užklausa"
+msgstr "Bloga užklausa"
msgid "Not Found"
msgstr "Nerasta"
@@ -4759,19 +4688,19 @@ msgid "Authentication Failed"
msgstr "Nepavyko nustatyti tapatybės"
msgid "Access to redacted version ''{0}'' of {1} {2} is forbidden."
-msgstr ""
+msgstr "Prieiga prie pašalintos {1} {2} versijos „{0}“ yra uždrausta."
msgid "Authorisation Failed"
-msgstr ""
+msgstr "Autorizacija nepavyko"
msgid "Client Time Out"
-msgstr ""
+msgstr "Klientui baigėsi laikas"
msgid "Bandwidth Limit Exceeded"
-msgstr ""
+msgstr "Išnaudotas pralaidumo apribojimas"
msgid "Communication with OSM server failed"
-msgstr ""
+msgstr "Ryšys su OSM serveriu nepavyko"
msgid "Authentication failed"
msgstr "Tapatybės nustatyti nepavyko"
@@ -4781,9 +4710,9 @@ msgstr "Nežinomas serveris"
msgid "Object deleted"
msgid_plural "Objects deleted"
-msgstr[0] "Objektas ištrintas"
-msgstr[1] "Objektai ištrinti"
-msgstr[2] "Objektai ištrinti"
+msgstr[0] "Objektas pašalintas"
+msgstr[1] "Objektai pašalinti"
+msgstr[2] "Objektai pašalinti"
msgid "Show help information"
msgstr "Rodyti pagalbą"
@@ -4792,29 +4721,29 @@ msgid "Downloading \"Message of the day\""
msgstr "Parsiunčiamas dienos pranešimas"
msgid "Failed to read MOTD. Exception was: {0}"
-msgstr ""
+msgstr "Nepavyko perskaityti MOTD. Klaida: {0}"
msgid "Message of the day not available"
-msgstr ""
+msgstr "Nepasiekiamas dienos pranešimas"
msgid "Click to close the dialog"
-msgstr ""
+msgstr "Spauskite, kad uždarytumėte dialogą"
msgid "Imagery offset"
-msgstr ""
+msgstr "Vaizdų poslinkis"
msgid "Imagery"
-msgstr ""
+msgstr "Vaizdai"
msgctxt "layer"
msgid "Offset"
msgstr "Poslinkis"
msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
-msgstr ""
+msgstr "Tikėtasi netuščios parametro „{0}“ reikšmės, gauta „{1}“"
msgid "usage"
-msgstr ""
+msgstr "naudojimas"
msgid "options"
msgstr "parinktys"
@@ -4823,83 +4752,91 @@ msgid "Show this help"
msgstr "Rodyti šį žinyną"
msgid "Standard unix geometry argument"
-msgstr ""
+msgstr "Standartinis unix geometrijos argumentas"
msgid "Download the bounding box"
-msgstr ""
+msgstr "Atsiųsti apibrėžtą stačiakampį"
msgid "Download the location at the URL (with lat=x&lon=y&zoom=z)"
-msgstr ""
+msgstr "Atsiųsti URL vietą (su lat=x&lon=y&zoom=z)"
msgid "Open a file (any file type that can be opened with File/Open)"
msgstr ""
+"Atverti failą (bet koks failo tipas, kurį galima atidaryti su Failas/Atverti)"
msgid "Download the bounding box as raw GPS"
-msgstr ""
+msgstr "Atsiųsti apibrėžimą stačiakampių kaip pradinį GPS"
msgid "Download the location at the URL (with lat=x&lon=y&zoom=z) as raw GPS"
-msgstr ""
+msgstr "Atsiųsti vietą iš URL (su lat=x&lon=y&zoom=z) kaip pradinį GPS"
msgid "Select with the given search"
-msgstr ""
+msgstr "Parinkti su nurodyta paieška"
msgid "Launch in maximized mode"
-msgstr ""
+msgstr "Paleisti išdidintame režime"
msgid "Reset the preferences to default"
-msgstr ""
+msgstr "Atkurti numatytąsias parinkčių reikšmes"
msgid "Changes preferences according to the XML file"
-msgstr ""
+msgstr "Pakeičia parinktis pagal XML failą"
msgid "Set preference key to value"
-msgstr ""
+msgstr "Keisti nustatymo rakto reikšmę"
msgid "Set the language"
-msgstr ""
+msgstr "Nustatyti kalbą"
msgid "Displays the JOSM version and exits"
-msgstr ""
+msgstr "Parodo JOSM versiją ir išsijungia"
msgid "Print debugging messages to console"
-msgstr ""
+msgstr "Spausdinti tinkinimo pranešimus į konsolę"
+
+msgid "Skip loading plugins"
+msgstr "Nutraukti priedų įkėlimą"
msgid "Disable access to the given resource(s), separated by comma"
-msgstr ""
+msgstr "Išjungti prieigą prie nurodytų resursų, atskirtų kableliu"
msgid "options provided as Java system properties"
-msgstr ""
+msgstr "parinktys, pateiktos kaip Java sistemos savybės"
msgid "/PATH/TO/JOSM/PREF "
-msgstr ""
+msgstr "/KELIAS/IKI/JOSM/NUSTATYMŲ "
msgid "Set the preferences directory"
-msgstr ""
+msgstr "Nurodyti nustatymų aplanką"
msgid "/PATH/TO/JOSM/USERDATA"
-msgstr ""
+msgstr "/KELIAS/IKI/JOSM/NAUDOTOJO_DUOMENŲ"
msgid "Set the user data directory"
-msgstr ""
+msgstr "Nurodykite naudotojo duomenų aplanką"
msgid "/PATH/TO/JOSM/CACHE "
-msgstr ""
+msgstr "/KELIAS/IKI/JOSM/PODĖLIO "
msgid "Set the cache directory"
-msgstr ""
+msgstr "Nurodykite podėlio aplanką"
msgid "/PATH/TO/JOSM/HOMEDIR "
-msgstr ""
+msgstr "/KELIAS/IKI/JOSM/NAMŲ_APLANKO "
msgid ""
"Relocate all 3 directories to homedir. Cache directory will be in "
"homedir/cache"
msgstr ""
+"Perkelti visus 3 aplankus į namų aplanką. Podėlio aplankas bus "
+"namų_aplankas/cache"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
"general one"
msgstr ""
+"-Djosm.home turi mažesnį prioritetą, t.y. konkretus nustatymas permuša "
+"bendrąjį"
msgid ""
"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4907,6 +4844,10 @@ msgid ""
" Java option to specify the maximum size of allocated memory in "
"megabytes"
msgstr ""
+"pastaba: Kai kurioms užduotims JOSM reikia daug atminties. Gali prireikti "
+"pridėti šią\n"
+" Java parinktį, kad nurodytumėte maksimalų naudojamos atminties kiekį "
+"megabaitais"
msgid "examples"
msgstr "pavyzdžiai"
@@ -4915,33 +4856,38 @@ msgid ""
"Parameters --download, --downloadgps, and --selection are processed in this "
"order."
msgstr ""
+"Parametrai --download, --downloadgps ir --selection apdorojami šia tvarka."
msgid "Make sure you load some data if you use --selection."
msgstr ""
+"Įsitikinkite, kad įkeliate kokius nors duomenis, jei naudojate --selection"
msgid "Printing debugging messages to console"
-msgstr ""
+msgstr "Tinkinimo pranešimai rašomi į konsolę"
+
+msgid "Plugin loading skipped"
+msgstr "Priedų įkėlimas praleistas"
msgid "Enabled detailed debug level (trace)"
-msgstr ""
+msgstr "Įjungtas detalus tinkinimo lygis (pėdsakai)"
msgid "Initializing"
msgstr "Inicijuojama"
msgid "Updating plugins"
-msgstr "Atnaujinami priedai"
+msgstr "Atnaujinami papildiniai"
msgid "Installing updated plugins"
-msgstr "Diegiami atnaujinti priedai"
+msgstr "Diegiami atnaujinti papildiniai"
msgid "Loading early plugins"
msgstr "Įkeliami ankstyvieji papildiniai"
msgid "Setting defaults"
-msgstr ""
+msgstr "Nustatomos numatytosios reikšmės"
msgid "Creating main GUI"
-msgstr "Kuriamas pagrindinis GUI"
+msgstr "Kuriama pagrindinė grafinė sąsaja"
msgid "Loading plugins"
msgstr "Įkeliami papildiniai"
@@ -4950,13 +4896,19 @@ msgid ""
"''{0}'' is not a valid value for argument ''{1}''. Possible values are {2}, "
"possibly delimited by commas."
msgstr ""
+"„{0}“ yra netinkama argumento „{1}“ reikšmė. Galimos reikšmės yra {2}, "
+"galbūt atskirtos kableliais."
msgid ""
"JOSM is running in offline mode. This resource will not be available: {0}"
msgid_plural ""
"JOSM is running in offline mode. These resources will not be available: {0}"
msgstr[0] ""
+"JOSM dirba neprisijungusiame režime. Šis resursas bus neprieinamas: {0}"
msgstr[1] ""
+"JOSM dirba neprisijungusiame režime. Šie resursai bus neprieinami: {0}"
+msgstr[2] ""
+"JOSM dirba neprisijungusiame režime. Šie resursai bus neprieinami: {0}"
msgid "Unsaved osm data"
msgstr "Neišsaugoti osm duomenys"
@@ -4969,27 +4921,32 @@ msgstr "Atmesti"
msgid "JOSM found {0} unsaved osm data layer. "
msgid_plural "JOSM found {0} unsaved osm data layers. "
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "JOSM rado {0} neįrašyta osm duomenų sluoksnį. "
+msgstr[1] "JOSM rado {0} neįrašytus osm duomenų sluoksnius. "
+msgstr[2] "JOSM rado {0} neįrašytų osm duomenų sluoksnių. "
msgid ""
"It looks like JOSM crashed last time. Would you like to restore the data?"
msgstr ""
+"Panašu, kad paskutinį kartą JOSM nulūžo. Ar norėtumėte atstatyti duomenis?"
msgid "Change proxy settings"
-msgstr ""
+msgstr "Keisti šliuzo nustatymus"
msgid "Proxy errors occurred"
-msgstr ""
+msgstr "Įvyko šliuzo klaidos"
msgid ""
"JOSM tried to access the following resources:<br>{0}but <b>failed</b> to do "
"so, because of the following proxy errors:<br>{1}Would you like to change "
"your proxy settings now?"
msgstr ""
+"JOSM bandė prieiti prie šių resursų:<br>{0}, bet <b>nesugebėjo</b> tai "
+"padaryti dėl šių šliuzo klaidų:<br>{1}Ar norėtumėte dabar pakeisti savo "
+"šliuzo nustatymus?"
msgid "Network errors occurred"
-msgstr ""
+msgstr "Įvyko tinklo klaidų"
msgid ""
"JOSM tried to access the following resources:<br>{0}but <b>failed</b> to do "
@@ -4997,12 +4954,15 @@ msgid ""
"missing proxy configuration.<br>Would you like to change your proxy settings "
"now?"
msgstr ""
+"JOSM bandė prieiti prie šių resursų:<br>{0}, bet <b>nesugebėjo</b> to "
+"padaryti dėl šių tinklo klaidų:<br>{1}Šito priežastis galėjo būti trūkstama "
+"šliuzo konfigūracija.<br>Ar norėtumėte dabar pakeisti šliuzo nustatymus?"
msgid "File"
msgstr "Failas"
msgid "Session"
-msgstr "Sesija"
+msgstr "Seansas"
msgid "View"
msgstr "Rodyti"
@@ -5017,7 +4977,7 @@ msgid "Data"
msgstr "Duomenys"
msgid "Selection"
-msgstr "Parinktys"
+msgstr "Pažymėjimas"
msgid "Presets"
msgstr "Ruošiniai"
@@ -5035,28 +4995,28 @@ msgid "Menu: {0}"
msgstr "Meniu: {0}"
msgid "Save and load the current session (list of layers, etc.)"
-msgstr ""
+msgstr "Įrašyti ir įkelti dabartinį seansą (sluoksnių sąrašą ir t. t.)"
msgid "Edit toolbar"
-msgstr ""
+msgstr "Keitimo įrankinė"
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
-msgstr ""
+msgstr "Keičia keitimo įrankinės (vertikalios juostos) matomumą"
msgid "Preset preferences"
-msgstr ""
+msgstr "Išankstinių nuostatų savybės"
msgid "Click to open the tagging presets tab in the preferences"
-msgstr ""
+msgstr "Spauskite, kad atvertumėte žymėjimo ruošinių kortelę nustatymuose"
msgid "Imagery preferences"
-msgstr ""
+msgstr "Vaizdų nuostatos"
msgid "Click to open the imagery tab in the preferences"
-msgstr ""
+msgstr "Spauskite vaizdų kortelei nuostatose atverti"
msgid "Search menu items"
-msgstr ""
+msgstr "Ieškoti meniu elementų"
msgid "Audio"
msgstr "Audio"
@@ -5068,13 +5028,13 @@ msgid "Hide this button"
msgstr "Slėpti šį mygtuką"
msgid "Click the arrow at the bottom to show it again."
-msgstr ""
+msgstr "Spauskite rodyklę apačioje, kad vėl jį rodytumėte."
msgid "Hide edit toolbar"
-msgstr ""
+msgstr "Slėpti keitimo įrankinę"
msgid "Hide or show this toggle button"
-msgstr ""
+msgstr "Slėpti ar rodyti šį perjungimo mygtuką"
msgid "Move right"
msgstr "Perkelti dešinėn"
@@ -5098,91 +5058,96 @@ msgid "Zoom out"
msgstr "Atitolinti"
msgid "scale"
-msgstr ""
+msgstr "mastelis"
msgid "Status bar background"
msgstr "Būsenos juostos fonas"
msgid "Status bar background: active"
-msgstr ""
+msgstr "Būsenos juostos fonas: aktyvus"
msgid "Status bar foreground"
-msgstr ""
+msgstr "Būsenos juostos tekstas"
msgid "Status bar foreground: active"
-msgstr ""
+msgstr "Būsenos juostos tekstas: aktyvus"
msgid "{0} ({1})"
msgstr "{0} ({1})"
msgid "The geographic latitude at the mouse pointer."
-msgstr ""
+msgstr "Pelės žymeklio geografinė platuma"
msgid "The geographic longitude at the mouse pointer."
-msgstr ""
+msgstr "Pelės žymeklio geografinė ilguma"
msgid "The (compass) heading of the line segment being drawn."
-msgstr ""
+msgstr "Braižomo linijos segmento (kompaso) kryptis."
msgid "The angle between the previous and the current way segment."
-msgstr ""
+msgstr "Kampas tarp ankstesnio ir dabartinio kelio segmento."
msgid "The length of the new way segment being drawn."
-msgstr ""
+msgstr "Naujo braižomo kelio segmento ilgis."
msgid "The name of the object at the mouse pointer."
-msgstr ""
+msgstr "Objekto ties pelės žymekliu pavadinimas"
msgid ""
"Middle click again to cycle through.<br>Hold CTRL to select directly from "
"this list with the mouse.<hr>"
msgstr ""
+"Spauskite vidurinį mygtuką dar kartą, kad pereitumėte prie kito "
+"elemento.<br>Laikykite CTRL, kad pažymėtumėte tiesiai iš šio sąrašo su "
+"pele.<hr>"
msgid "(no object)"
-msgstr ""
+msgstr "(nėra objekto)"
msgid "User:"
-msgstr "Vartotojas:"
+msgstr "Naudotojas:"
msgid "Do not hide status bar"
-msgstr ""
+msgstr "Neslėpti būsenos juostos"
msgid "System of measurement changed to {0}"
-msgstr ""
+msgstr "Matavimo sistema pakeista į {0}"
msgid "Layer not in list."
-msgstr ""
+msgstr "Sluoksnis ne sąraše."
msgid "Layer ''{0}'' must be in list of layers"
-msgstr ""
+msgstr "Sluoksnis „{0}“ turi būti sluoksnių sąraše"
msgid "Default (open, closed, new)"
-msgstr ""
+msgstr "Numatytas (atviros, uždarytos, naujos)"
msgid "Username"
-msgstr "Vartotojo Vardas"
+msgstr "Naudotojo vardas"
msgid "Created date"
-msgstr ""
+msgstr "Sukūrimo data"
msgid "Last change date"
-msgstr ""
+msgstr "Paskutinio pakeitimo data"
msgid "Select note sorting method"
-msgstr ""
+msgstr "Parinktie pastabų rikiavimo metodą"
msgid "Click to cancel the current operation"
-msgstr ""
+msgstr "Spauskite, kad nutrauktumėte dabartinį veiksmą"
msgid "In background"
-msgstr ""
+msgstr "Fone"
msgid "Click to run job in background"
-msgstr ""
+msgstr "Spauskite, kad vykdytumėte darbą fone"
msgid ""
"Aerial imagery might be misaligned. Please check its offset using GPS tracks!"
msgstr ""
+"Oro nuotraukos gali būti neteisingai pozicionuotos. Prašome patikrinti "
+"poslinkį naudojant GPS pėdsakus!"
msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
msgstr "http://wiki.openstreetmap.org/wiki/Using_Imagery"
@@ -5191,36 +5156,43 @@ msgid "Details..."
msgstr "Išsamiau..."
msgid "Hide this message and never show it again"
-msgstr ""
+msgstr "Slėpti šį pranešimą ir niekada jo daugiau nerodyti"
msgid ""
"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
"relation</strong>.</html>"
msgstr ""
+"<html>Prašome patvirtinkite <strong>1 objekto</strong> išėmimą iš <strong>1 "
+"ryšio</strong>.</html>"
msgid ""
"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
"relations</strong>.</html>"
msgstr ""
+"<html>Prašome patvirtinti <strong>1 objekto</strong> išėmimą iš <strong>{0} "
+"ryšių</strong>.</html>"
msgid ""
"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
"relations</strong>.</html>"
msgstr ""
+"<html>Prašome patvirtinti <strong>{0} objektų</strong> išėmimą iš "
+"<strong>{1} ryšių</strong>.</html>"
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Trinamas {0} objektas"
+msgstr[1] "Trinami {0} objektai"
+msgstr[2] "Trinama {0} objektų"
msgid "Delete objects"
msgstr "Šalinti objektus"
msgid "To delete"
-msgstr ""
+msgstr "Bus pašalinti"
msgid "From Relation"
-msgstr ""
+msgstr "Iš ryšio"
msgid "Pos."
msgstr "Poz."
@@ -5229,24 +5201,26 @@ msgid "Role"
msgstr "Rolė"
msgid "Click to close the dialog and remove the object from the relations"
-msgstr ""
+msgstr "Spauskite, kad uždarytumėte dialogą ir ištrintumėte objektą iš ryšių"
msgid "Click to close the dialog and to abort deleting the objects"
-msgstr ""
+msgstr "Spauskite, kad uždarytumėte dialogą ir netrintumėte objektų"
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
msgstr ""
+"<html>Prašome parinkite <strong>OSM kaladėlių intervalą</strong> nurodytame "
+"mastelio lygyje.</html>"
msgid "Zoom level:"
-msgstr ""
+msgstr "Mastelio lygis:"
msgid "from tile"
-msgstr ""
+msgstr "iš kaladėlės"
msgid "up to tile"
-msgstr ""
+msgstr "iki kaladėlės"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -5254,129 +5228,133 @@ msgid ""
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
+"<html>Taipogi galite įvesti <strong>kaladėlės adresą</strong> vienai "
+"kaladėlei formatu <i>zoomlevel/x/y</i>, pvz. <i>15/256/223</i>. Taip pat "
+"tinka kaladėlės formatas <i>zoom,x,y</i> arba <i>zoom;x;y</i>.</html>"
msgid "Tile address:"
-msgstr ""
+msgstr "Kaladėlių adresas:"
msgid "Apply the tile address"
-msgstr ""
+msgstr "Pritaikyti kaladėlių adresą"
msgid "Please enter a tile address"
-msgstr ""
+msgstr "Prašome įvesti kaladėlių adresą"
msgid "The current value isn''t a valid tile address"
-msgstr ""
+msgstr "Dabartinė reikšmė nėra tinkamas kaladėlių adresas"
msgid "Please enter a tile index"
-msgstr ""
+msgstr "Prašome įvesti kaladėlių indeksą"
msgid "The current value isn''t a valid tile index for the given zoom level"
msgstr ""
+"Dabartinė reikšmė nėra tinkamas kaladėlių indeksas nurodytame mastelyje"
msgid "Conflict background: no conflict"
-msgstr ""
+msgstr "Konflikto fonas: nėra konflikto"
msgid "Conflict background: decided"
-msgstr ""
+msgstr "Konflikto fonas: nuspręstas"
msgid "Conflict background: undecided"
-msgstr ""
+msgstr "Konflikto fonas: nenuspręstas"
msgid "Conflict background: drop"
-msgstr ""
+msgstr "Konflikto fonas: išmesti"
msgid "Conflict background: keep"
-msgstr ""
+msgstr "Konflikto fonas: palikti"
msgid "Conflict background: combined"
-msgstr ""
+msgstr "Konflikto fonas: kombinuota"
msgid "Conflict background: selected"
-msgstr ""
+msgstr "Konflikto fonas: parinkta"
msgid "Conflict foreground: undecided"
-msgstr ""
+msgstr "Konflikto tekstas: neapsispręsta"
msgid "Conflict foreground: drop"
-msgstr ""
+msgstr "Konflikto tekstas: išmesti"
msgid "Conflict foreground: keep"
-msgstr ""
+msgstr "Konflikto tekstas: palikti"
msgid "Conflict background: empty row"
-msgstr ""
+msgstr "Konflikto fonas: tuščia eilutė"
msgid "Conflict background: frozen"
-msgstr ""
+msgstr "Konflikto fonas: užšaldyta"
msgid "Conflict background: in comparison"
-msgstr ""
+msgstr "Konflikto fonas: lyginama"
msgid "Conflict foreground: in comparison"
-msgstr ""
+msgstr "Konflikto tekstas: lyginama"
msgid "Conflict background"
-msgstr ""
+msgstr "Konflikto fonas"
msgid "Conflict foreground"
-msgstr ""
+msgstr "Konflikto tekstas"
msgid "Conflict background: not in opposite"
-msgstr ""
+msgstr "Konflikto fonas: nėra priešingame"
msgid "Conflict background: in opposite"
-msgstr ""
+msgstr "Konflikto fonas: yra priešingame"
msgid "Conflict background: same position in opposite"
-msgstr ""
+msgstr "Konflikto fonas: ta pati padėtis priešingame"
msgid "Conflict background: keep one tag"
-msgstr ""
+msgstr "Konflikto fonas: palikti vieną žymą"
msgid "Conflict foreground: keep one tag"
-msgstr ""
+msgstr "Konflikto tekstas: palikti vieną žymą"
msgid "Conflict background: drop tag"
-msgstr ""
+msgstr "Konflikto fonas: išmesti žymą"
msgid "Conflict foreground: drop tag"
-msgstr ""
+msgstr "Konflikto tekstas: išmesti žymą"
msgid "Conflict background: keep all tags"
-msgstr ""
+msgstr "Konflikto fonas: palikti visas žymas"
msgid "Conflict foreground: keep all tags"
-msgstr ""
+msgstr "Konflikto tekstas: palikti visas žymas"
msgid "Conflict background: sum all numeric tags"
-msgstr ""
+msgstr "Konflikto fonas: sumuoti visas skaitmenines žymas"
msgid "Conflict foreground: sum all numeric tags"
-msgstr ""
+msgstr "Konflikto tekstas: sumuoti visas skaitmenines žymas"
msgid "Conflict background: keep member"
-msgstr ""
+msgstr "Konflikto fonas: palikti narį"
msgid "Conflict foreground: keep member"
-msgstr ""
+msgstr "Konflikto tekstas: palikti narį"
msgid "Conflict background: remove member"
-msgstr ""
+msgstr "Konflikto fonas: išimti narį"
msgid "Conflict foreground: remove member"
-msgstr ""
+msgstr "Konflikto tekstas: išimti narį"
msgid "My with Their"
-msgstr ""
+msgstr "Mano su jų"
msgid "My with Merged"
-msgstr ""
+msgstr "Mano su sulietu"
msgid "Their with Merged"
-msgstr ""
+msgstr "Jų su sulietu"
msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
+msgstr "Rolė {0} nedalyvauja poros {1} palyginime."
msgid "Properties"
msgstr "Savybės"
@@ -5391,56 +5369,62 @@ msgid "Members"
msgstr "Nariai"
msgid "No pending tag conflicts to be resolved"
-msgstr ""
+msgstr "Nėra spręstinų žymų konfliktų"
msgid "Tags({0} conflict)"
msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Žymos({0} konfliktas)"
+msgstr[1] "Žymos({0} konfliktai)"
+msgstr[2] "Žymos({0} konfliktų)"
msgid "{0} pending tag conflict to be resolved"
msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} spręstinas žymų konfliktas"
+msgstr[1] "{0} spręstinų žymų konfliktas"
+msgstr[2] "{0} spręstinų žymų konfliktas"
msgid "Nodes(resolved)"
-msgstr ""
+msgstr "Taškai (išspręsta)"
msgid ""
"Merged node list frozen. No pending conflicts in the node list of this way"
msgstr ""
+"Taškų suliejimo sąrašas užšaldytas. Šio kelio taškų sąraše nėra spręstinų "
+"konfliktų"
msgid "Nodes(with conflicts)"
-msgstr ""
+msgstr "Taškai (su konfliktais)"
msgid "Pending conflicts in the node list of this way"
-msgstr ""
+msgstr "Šio kelio taškų sąrašo spręstini konfliktai"
msgid "Members(resolved)"
-msgstr ""
+msgstr "Nariai (išspręsta)"
msgid ""
"Merged member list frozen. No pending conflicts in the member list of this "
"relation"
msgstr ""
+"Sulietų narių sąrašas užšaldytas. Nėra šio ryšio narių sąrašo spręstinų "
+"konfliktų"
msgid "Members(with conflicts)"
-msgstr ""
+msgstr "Nariai (su konfliktais)"
msgid "Pending conflicts in the member list of this relation"
-msgstr ""
+msgstr "Šio ryšio narių spręstini konfliktai"
msgid "No pending property conflicts"
-msgstr ""
+msgstr "Nėra spręstinų savybių konfliktų"
msgid "Properties(with conflicts)"
-msgstr ""
+msgstr "Savybės (su konfliktais)"
msgid "Pending property conflicts to be resolved"
-msgstr ""
+msgstr "Spręstini savybių konfliktai"
msgid "Conflict Resolution"
-msgstr ""
+msgstr "Konflikto sprendimas"
msgid "{0} more..."
msgstr "{0} daugiau..."
@@ -5449,21 +5433,23 @@ msgid ""
"The following objects could not be copied to the target object<br>because "
"they are deleted in the target dataset:"
msgstr ""
+"Šių objektų nepavyko nukopijuoti į paskirties objektą,<br>nes jie pašalinti "
+"paskirties duomenų rinkinyje:"
msgid "Merging deleted objects failed"
-msgstr ""
+msgstr "Nepavyko sulieti ištrintų objektų"
msgid "List in role {0} is currently not participating in a compare pair."
-msgstr ""
+msgstr "Rolės {0} sąrašas šiuo metu nedalyvauja lyginimo poroje."
msgid "Unexpected value of parameter ''index''. Got {0}."
-msgstr ""
+msgstr "Netikėta parametro „index“ reikšmė. Gauta {0}."
msgid "Item {0} not found in list."
-msgstr ""
+msgstr "Elementas {0} nerastas sąraše."
msgid "lock scrolling"
-msgstr ""
+msgstr "užrakinti prasukimą"
msgid "Compare "
msgstr "Palyginti "
@@ -5472,7 +5458,7 @@ msgid "My version"
msgstr "Mano versija"
msgid "List of elements in my dataset, i.e. the local dataset"
-msgstr ""
+msgstr "Mano duomenų aibės elementų sąrašas, pvz. lokali duomenų aibė."
msgid "Merged version"
msgstr "Sulieta versija"
@@ -5481,32 +5467,37 @@ msgid ""
"List of merged elements. They will replace the list of my elements when the "
"merge decisions are applied."
msgstr ""
+"Sulietų elementų sąrašas. Jie pakeis mano elementų sąrašą, kai bus "
+"pritaikyti suliejimo sprendimai."
msgid "Their version"
-msgstr ""
+msgstr "Jų versija"
msgid "List of elements in their dataset, i.e. the server dataset"
-msgstr ""
+msgstr "Jų duomenų aibės elementų sąrašas, pvz. serverio duomenų aibė"
msgid "> top"
msgstr "> viršus"
msgid "Copy my selected nodes to the start of the merged node list"
-msgstr ""
+msgstr "Kopijuoti mano pažymėtus taškus į sulieto taškų sąrašo pradžią"
msgid "> bottom"
msgstr "> apačia"
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+"Kopijuoti mano pažymėtus elementus į sulieto elementų sąrašo pabaigą."
msgid "> before"
-msgstr ""
+msgstr "> prieš"
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+"Kopijuoti mano pažymėtus elementus prieš pirmą pažymėtą elementą sulietų "
+"elementų sąraše."
msgid "> after"
msgstr "> po to"
@@ -5515,20 +5506,22 @@ msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+"Kopijuoti mano pažymėtos elementus po pirmo pažymėto elemento sulietų "
+"elementų sąraše."
msgid "< top"
-msgstr ""
+msgstr "< viršus"
msgid ""
"Copy their selected element to the start of the list of merged elements."
-msgstr ""
+msgstr "Kopijuoti jų pažymėtus elementus į sulietų elementų sąrašo pradžią."
msgid "< bottom"
msgstr "< apačia"
msgid ""
"Copy their selected elements to the end of the list of merged elements."
-msgstr ""
+msgstr "Kopijuoti jų parinktus elementus į sulietų elementų sąrašo pabaigą."
msgid "< before"
msgstr "< prieš"
@@ -5537,6 +5530,8 @@ msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+"Kopijuoti jų pažymėtus elementus prieš pirmą pažymėta sulietų elementų "
+"sąrašo elementą."
msgid "< after"
msgstr "< po"
@@ -5545,93 +5540,104 @@ msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
msgstr ""
+"Kopijuoti jų pažymėtą elementą po pirmo pažymėto elemento sulietų elementų "
+"sąraše"
msgid "Copy all my elements to the target"
-msgstr ""
+msgstr "Kopijuoti visus mano elementus į paskirtį"
msgid "Copy all their elements to the target"
-msgstr ""
+msgstr "Kopijuoti visus jų elementus į paskirtį"
msgid "Up"
msgstr "Aukštyn"
msgid "Move up the selected entries by one position."
-msgstr ""
+msgstr "Pakelti pažymėtus įrašus viena pozicija aukštyn"
msgid "Down"
msgstr "Žemyn"
msgid "Move down the selected entries by one position."
-msgstr ""
+msgstr "Nuleisti pažymėtus įrašus viena pozicija žemyn"
msgid "Remove"
msgstr "Pašalinti"
msgid "Remove the selected entries from the list of merged elements."
-msgstr ""
+msgstr "Išimti pažymėtus įrašus iš sulietų elementų sąrašo."
msgid "Freeze"
msgstr "Fiksuoti"
msgid "Freeze the current list of merged elements."
-msgstr ""
+msgstr "Užšaldyti dabartinį sulietų elementų sąrašą."
msgid "Unfreeze"
msgstr "Nefiksuoti"
msgid "Unfreeze the list of merged elements and start merging."
-msgstr ""
+msgstr "Atšaldyti sulietų elementų sąrašą ir pradėti suliejimą."
msgid ""
"<html>Click <strong>{0}</strong> to start merging my and their "
"entries.</html>"
msgstr ""
+"<html>Spauskite <strong>{0}</strong>, kad pradėtumėte mano ir jų įrašų "
+"suliejimą.</html>"
msgid ""
"<html>Click <strong>{0}</strong> to finish merging my and their "
"entries.</html>"
msgstr ""
+"<html>Spauskite <strong>{0}</strong>, kad baigtumėte mano ir jų įrašų "
+"suliejimą.</html>"
msgid "My version ({0} entry)"
msgid_plural "My version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Mano versija ({0} įrašas)"
+msgstr[1] "Mano versija ({0} įrašai)"
+msgstr[2] "Mano versija ({0} įrašų)"
msgid "Merged version ({0} entry)"
msgid_plural "Merged version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Sulieta versija ({0} įrašas)"
+msgstr[1] "Sulieta versija ({0} įrašai)"
+msgstr[2] "Sulieta versija ({0} įrašų)"
msgid "Their version ({0} entry)"
msgid_plural "Their version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Jų versija ({0} įrašas)"
+msgstr[1] "Jų versija ({0} įrašai)"
+msgstr[2] "Jų versija ({0} įrašų)"
msgid "Node"
msgstr "Taškas"
msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr ""
+msgstr "Sulieti taškai dar neužšaldyti. Negalima sukurti sprendimo komandos."
msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
+msgstr "Mano duomenų aibės savybės, t. y., vietinės duomenų aibės"
msgid ""
"Properties in the merged element. They will replace properties in my "
"elements when merge decisions are applied."
msgstr ""
+"Sulieto elemento savybės. Jos pakeis savybes mano elemente, kai bus "
+"pritaikyti suliejimo sprendimai."
msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
+msgstr "Jų duomenų aibės savybės, t.y. serverio duomenų aibės"
msgid "Coordinates:"
msgstr "Koordinatės:"
msgid "Deleted State:"
-msgstr ""
+msgstr "Ištrinta būsena:"
msgid "Referenced by:"
-msgstr ""
+msgstr "Priklauso:"
msgid "(none)"
msgstr "(nėra)"
@@ -5643,85 +5649,85 @@ msgid "not deleted"
msgstr "ne ištrintas"
msgid "Keep my coordinates"
-msgstr ""
+msgstr "Palikti mano koordinates"
msgid "Keep their coordinates"
-msgstr ""
+msgstr "Palikti jų koordinates"
msgid "Undecide conflict between different coordinates"
-msgstr ""
+msgstr "Nenuspręsti konflikto dėl skirtingų koordinačių"
msgid "Keep my deleted state"
-msgstr ""
+msgstr "Palikti mano ištrintą būseną"
msgid "Keep their deleted state"
-msgstr ""
+msgstr "Palikti jų ištrintą būseną"
msgid "Undecide conflict between deleted state"
-msgstr ""
+msgstr "Nenuspręsti konflikto dėl ištrintos būsenos"
msgid "Primitive"
-msgstr ""
+msgstr "Primityvas"
msgid "Merged nodes not frozen yet. Cannot build resolution command"
-msgstr ""
+msgstr "Sulieti taškai dar neužšaldyti. Negalima sukurti sprendimo komandos"
msgid "<undefined>"
msgstr "<neapibrėžta>"
msgid "The merged dataset will not include a tag with key {0}"
-msgstr ""
+msgstr "Sulietoje duomenų aibėje nebus žymos su raktu {0}"
msgid "My dataset does not include a tag with key {0}"
-msgstr ""
+msgstr "Mano duomenų aibėje nėra žymos su raktu {0}"
msgid "Key"
msgstr "Raktas"
msgid "Value"
-msgstr "Vertė"
+msgstr "Reikšmė"
msgid "Cannot apply undecided tag merge item."
-msgstr ""
+msgstr "Negalima pritaikyti nenuspręstą žymos suliejimo elementą."
msgid "My version (local dataset)"
-msgstr ""
+msgstr "Mano versija (vietinė duomenų aibė)"
msgid "Their version (server dataset)"
-msgstr ""
+msgstr "Jų versija (serverio duomenų aibė)"
msgid "Keep the selected key/value pairs from the local dataset"
-msgstr ""
+msgstr "Palikti pažymėtą rakto/reikšmės porą iš vietinės duomenų aibės"
msgid "Keep the selected key/value pairs from the server dataset"
-msgstr ""
+msgstr "Palikti pažymėtą rakto/reikšmės porą iš serverio duomenų aibės"
msgid "Undecide"
-msgstr ""
+msgstr "Nenuspręsti"
msgid "Mark the selected tags as undecided"
-msgstr ""
+msgstr "Nustatyti pažymėtą žymą kaip nenuspręstą"
msgid "Their dataset does not include a tag with key {0}"
-msgstr ""
+msgstr "Jų duomenų aibėje nėra žymos su raktu {0}"
msgid "Conflicts when combining primitives"
-msgstr ""
+msgstr "Konfliktai jungiant primityvus"
msgid "Conflicts when combining ways - combined way is ''{0}''"
-msgstr ""
+msgstr "Konfliktai jungiant kelius - sujungtas kelias yra „{0}“"
msgid "Conflicts when merging nodes - target node is ''{0}''"
-msgstr ""
+msgstr "Konfliktai suliejant taškus - galutinis taškas yra „{0}“"
msgid "No conflicts to resolve"
-msgstr ""
+msgstr "Nėra spręstinų konfliktų"
msgid "Cancel conflict resolution"
-msgstr ""
+msgstr "Nutraukti konfliktų sprendimą"
msgid "Apply resolved conflicts"
-msgstr ""
+msgstr "Pritaikyti išspręstus konfliktus"
msgid "Apply"
msgstr "Pritaikyti"
@@ -5739,16 +5745,29 @@ msgid_plural ""
"are shown a dialog to decide how to adapt the relations.<br/><br/>Do you "
"want to continue?"
msgstr[0] ""
+"Jūs tuoj sujungsite {1} objektą, kuris yra {0} ryšio dalis:<br/>{2}Šių "
+"objektų suliejimas gali sugadinti šį ryšį. Jei nesate tikri, prašome "
+"nutraukti šį veiksmą.<br/>Jei norite tęsti, jums bus parodytas dialogas, "
+"kuriame galėsite nuspręsti, kaip pritaikyti ryšį.<br/><br/>Ar norite tęsti?"
msgstr[1] ""
+"Jūs tuoj sujungsite {1} objektus, kurie yra {0} ryšių dalis:<br/>{2}Šių "
+"objektų suliejimas gali sugadinti šį ryšį. Jei nesate tikri, prašome "
+"nutraukti šį veiksmą.<br/>Jei norite tęsti, jums bus parodytas dialogas, "
+"kuriame galėsite nuspręsti, kaip pritaikyti ryšį.<br/><br/>Ar norite tęsti?"
+msgstr[2] ""
+"Jūs tuoj sujungsite {1} objektų, kurie yra {0} ryšių dalis:<br/>{2}Šių "
+"objektų suliejimas gali sugadinti šį ryšį. Jei nesate tikri, prašome "
+"nutraukti šį veiksmą.<br/>Jei norite tęsti, jums bus parodytas dialogas, "
+"kuriame galėsite nuspręsti, kaip pritaikyti ryšį.<br/><br/>Ar norite tęsti?"
msgid "Combine confirmation"
-msgstr ""
+msgstr "Sujungimo patvirtinimas"
msgid ", "
msgstr ", "
msgid "<i>missing</i>"
-msgstr ""
+msgstr "<i>trūksta</i>"
msgid ""
"You are about to combine {0} objects, but the following tags are used "
@@ -5761,56 +5780,70 @@ msgid_plural ""
"may have unwanted tags.<br/>If you want to continue, you are shown a dialog "
"to fix the conflicting tags.<br/><br/>Do you want to continue?"
msgstr[0] ""
+"Jūs tuoj sujungsite {0} objektus, bet šios žymos naudojamos "
+"skirtingai:<br/>{1}Jei objektai bus sujungti, gautas objektas gali turėti "
+"nereikalingų žymų.<br/>Jei norite tęsti, jums bus parodytas dialogas, "
+"leidžiantis sutvarkyti žymas.<br/><br/>Ar norite tęsti?"
msgstr[1] ""
+"Jūs tuoj sujungsite {0} objektus, bet šios žymos naudojamos "
+"skirtingai:<br/>{1}Jei objektai bus sujungti, gautas objektas gali turėti "
+"nereikalingų žymų.<br/>Jei norite tęsti, jums bus parodytas dialogas, "
+"leidžiantis sutvarkyti žymas.<br/><br/>Ar norite tęsti?"
+msgstr[2] ""
+"Jūs tuoj sujungsite {0} objektus, bet šios žymos naudojamos "
+"skirtingai:<br/>{1}Jei objektai bus sujungti, gautas objektas gali turėti "
+"nereikalingų žymų.<br/>Jei norite tęsti, jums bus parodytas dialogas, "
+"leidžiantis sutvarkyti žymas.<br/><br/>Ar norite tęsti?"
msgid "Choose a value"
msgstr "Pasirinkite reikšmę"
msgid "none"
-msgstr ""
+msgstr "nėra"
msgid "all"
-msgstr ""
+msgstr "visi"
msgid "sum"
-msgstr ""
+msgstr "suma"
msgid "Please decide which values to keep"
-msgstr ""
+msgstr "Prašome nuspręsti, kurias reikšmes palikti"
msgid "Value ''{0}'' is going to be applied for key ''{1}''"
-msgstr ""
+msgstr "Reikšmė „{0}“ bus pritaikyta raktui „{1}“"
msgid ""
"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
msgstr ""
+"Visos skaitinės reikšmės susumuotos kaip „{0}“ bus pritaikytos raktui „{1}“"
msgid "The key ''{0}'' and all its values are going to be removed"
-msgstr ""
+msgstr "Raktas „{0}“ ir jo reikšmės bus pašalintos"
msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
-msgstr ""
+msgstr "Visos reikšmės, sujungtos kaip „{0}“ bus pritaikytos raktui „{1}“"
msgid "Tag collection does not include the selected value ''{0}''."
-msgstr ""
+msgstr "Žymų rinkinyje nėra pažymėtos reikšmės „{0}“"
msgid "Not decided yet."
-msgstr ""
+msgstr "Dar nenuspręsta."
msgid "Tags from nodes"
-msgstr ""
+msgstr "Žymos iš taškų"
msgid "Tags from ways"
-msgstr ""
+msgstr "Žymos iš kelių"
msgid "Tags from relations"
-msgstr ""
+msgstr "Žymos iš ryšių"
msgid "Conflicts in pasted tags"
-msgstr ""
+msgstr "Konfliktai įdėtose žymose"
msgid "Paste ..."
-msgstr "Įdėti ..."
+msgstr "Įdėti..."
msgid "From ..."
msgstr "Iš ..."
@@ -5820,30 +5853,33 @@ msgstr "Į ..."
msgid "{0} tag"
msgid_plural "{0} tags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} žyma"
+msgstr[1] "{0} žymos"
+msgstr[2] "{0} žymų"
msgid "{0} way"
msgid_plural "{0} ways"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} kelias"
+msgstr[1] "{0} keliai"
+msgstr[2] "{0} kelių"
msgid "{0} relation"
msgid_plural "{0} relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} ryšys"
+msgstr[1] "{0} ryšiai"
+msgstr[2] "{0} ryšių"
msgid "Position {0} is out of range. Current number of members is {1}."
-msgstr ""
+msgstr "Vieta {0} yra už ribų. Dabartinis narių skaičius yra {1}."
msgid "Remove this relation member from the relation"
-msgstr ""
+msgstr "Išimti šį narį iš ryšio"
msgid "Keep"
msgstr "Palikti"
msgid "Keep this relation member for the target object"
-msgstr ""
+msgstr "Palikti šį ryšio narį galutiniame objekte"
msgid "Undecided"
msgstr "Nenuspręsta"
@@ -5852,18 +5888,20 @@ msgid "Not decided yet"
msgstr "Dar nenuspręsta"
msgid "Role:"
-msgstr ""
+msgstr "Rolė:"
msgid "Enter a role for all relation memberships"
-msgstr ""
+msgstr "Įveskite rolę visoms ryšio narystėms"
msgid "Tag modified relations with "
-msgstr ""
+msgstr "Pažymėti pakeistus ryšius su "
msgid ""
"<html>Select to enable entering a tag which will be applied<br>to all "
"modified relations.</html>"
msgstr ""
+"<html>Pažymėkite, kad įjungtumėte įvedimą žymos, kuri bus "
+"pritaikyta<br>visiems pakeistiems ryšiams.</html>"
msgctxt "tag"
msgid "Key:"
@@ -5871,6 +5909,7 @@ msgstr "Raktas:"
msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
+"<html>Įveskite žymos raktą, pvz. <strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "Reikšmė:"
@@ -5878,6 +5917,8 @@ msgstr "Reikšmė:"
msgid ""
"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
+"<html>Įveskite žymos reikšmę, pvz. <strong><tt>patikrinti "
+"narius</tt></strong></html>"
msgid ""
"<html>The combined ways are members in one or more relations. Please decide "
@@ -5887,6 +5928,12 @@ msgid ""
"ways that are members of the same relation: the combined way will take the "
"place of the original way in the relation.</html>"
msgstr ""
+"<html>Sujungti keliai yra vieno ar kelių ryšių nariai. Prašome nuspręsti, ar "
+"norite sujungtus kelius <strong>palikti</strong> nariais ar norite juos "
+"<strong>išimti</strong>.<br>Numatytoji elgsena yra <strong>palikti</strong> "
+"pirmą kelią ir <strong>išimti</strong> visus kitus kelius, kurie yra to "
+"paties ryšio nariai: sujungtas kelias užims pradinio kelio poziciją "
+"ryšyje.</html>"
msgid ""
"<html>The merged nodes are members in one or more relations. Please decide "
@@ -5896,24 +5943,30 @@ msgid ""
"other nodes that are members of the same relation: the target node will take "
"the place of the original node in the relation.</html>"
msgstr ""
+"<html>Sujungti taškai yra vieno ar daugiau ryšių nariai. Prašome nuspręsti, "
+"ar norite <strong>palikti</strong> gautus sujungtus taškus nariais ar norite "
+"juos <strong>išimti</strong>.<br>Numatytoji elgsena yra "
+"<strong>palikti</strong> pirmą tašką ir <strong>išimti</strong> visus kitus "
+"taškus, kurie yra to paties ryšio nariai: galutinis taškas užims pradinio "
+"taško vietą ryšyje.</html>"
msgid "Apply this role to all members"
-msgstr ""
+msgstr "Pritaikyti šią rolę visiems nariams"
msgid "Orig. Way"
-msgstr ""
+msgstr "Prad. kelias"
msgid "Decision"
msgstr "Sprendimas"
msgid "<html>Please select the values to keep for the following tags.</html>"
-msgstr ""
+msgstr "<html>Prašome parinkti kurias reikšmes palikti šioms žymoms.</html>"
msgid "Show tags with conflicts only"
-msgstr ""
+msgstr "Rodyti tik žymas su konfliktais"
msgid "Show tags with multiple values only"
-msgstr ""
+msgstr "Rodyti žymas tik su keliomis reikšmėmis"
msgid "For selected objects only"
msgstr "Tik pažymėtiems objektams"
@@ -5923,110 +5976,118 @@ msgid ""
"only.<br>Unselect to show all changesets for objects in the current data "
"layer.</html>"
msgstr ""
+"<html>Parinkite rodymui pokyčių tik dabar pažymėtiems "
+"objektams.<br>Nužymėkite, kad rodytumėte visus pokyčius visiems dabartinio "
+"sluoksnio objektams.</html>"
msgid "Changesets"
-msgstr ""
+msgstr "Pakeitimai"
msgid "Open the list of changesets in the current layer."
-msgstr ""
+msgstr "Atverti dabartinio sluoksnio pakeitimų sąrašą."
msgid "Select all objects assigned to the currently selected changesets"
-msgstr ""
+msgstr "Pažymėti visus objektus priskirtus dabar pažymėtiems pakeitimams"
msgid "Download"
msgstr "Atsisiųsti"
msgid ""
"Download information about the selected changesets from the OSM server"
-msgstr ""
+msgstr "Atsiųsti informaciją apie pažymėtus pakeitimus iš OSM serverio"
msgid "Closes the selected open changesets"
-msgstr ""
+msgstr "Uždaro pažymėtus atvirus pakeitimus"
msgid "Show info"
msgstr "Rodyti informaciją"
msgid "Open a web page for each selected changeset"
-msgstr ""
+msgstr "Atverti tinklalapį kiekvienam pažymėtam pakeitimui"
msgid "Details"
msgstr "Informacija"
msgid "Opens the Changeset Manager window for the selected changesets"
-msgstr ""
+msgstr "Atidaro pakeitimų tvarkytuvės langą pažymėtiems pakeitimams"
msgid "Command Stack"
msgstr "Komandų dėklas"
msgid "Open a list of all commands (undo buffer)."
-msgstr ""
+msgstr "Atverti visų komandų sąrašą (atstatymo buferis)"
msgid "Toggle: {0}"
-msgstr ""
+msgstr "Perjungti {0}"
msgid "Command Stack: Undo: {0} / Redo: {1}"
-msgstr ""
+msgstr "Komandų atmintis: Atstatyti: {0} / pakartoti: {1}"
msgid ""
"Selects the objects that take part in this command (unless currently deleted)"
msgstr ""
+"Pažymi objektus, dalyvaujančius šioje komandoje (nebent jie pašalinti)"
msgid "Select and zoom"
-msgstr ""
+msgstr "Pažymėti ir didinti"
msgid ""
"Selects the objects that take part in this command (unless currently "
"deleted), then and zooms to it"
msgstr ""
+"Pažymi objektus, kurie dalyvauja šioje komandoje (nebent jie pašalinti), "
+"tada pastumia vaizdą prie jų"
msgid "Undo the selected and all later commands"
-msgstr ""
+msgstr "Atšaukti pažymėtas ir visas vėlesnes komandas"
msgid "Redo the selected and all earlier commands"
-msgstr ""
+msgstr "Pakartoti visas pažymėtas ir vėlesnes komandas"
msgid "Resolve conflicts."
-msgstr ""
+msgstr "Išspręsti konfliktus"
msgid "Conflict: {0} unresolved"
msgid_plural "Conflicts: {0} unresolved"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Konfliktas: {0} neišspręstas"
+msgstr[1] "Konfliktai: {0} neišspręsti"
+msgstr[2] "Konfliktų: {0} neišspręstų"
msgid "Rel.:{0} / Ways:{1} / Nodes:{2}"
-msgstr ""
+msgstr "Ryšiai: {0} / Keliai: {1} / Taškai: {2}"
msgid "Resolve"
-msgstr ""
+msgstr "Išspręsti"
msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
+msgstr "Atverti suliejimo dialogą visiems aukščiau rodomo sąrašo elementams."
msgid "There was {0} conflict detected."
msgid_plural "There were {0} conflicts detected."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Aptiktas {0} konfliktas."
+msgstr[1] "Aptikti {0} konfliktai."
+msgstr[2] "Aptikta {0} konfliktų."
msgid "Click to close this dialog and continue editing"
-msgstr ""
+msgstr "Spauskite, kad uždarytumėte šį dialogą ir tęstumėte redagavimą"
msgid "Conflicts detected"
-msgstr ""
+msgstr "Aptikti konfliktai"
msgid "Cancel conflict resolution and close the dialog"
-msgstr ""
+msgstr "Nutraukti konfliktų sprendimą ir uždaryti dialogą"
msgid "Apply resolved conflicts and close the dialog"
-msgstr ""
+msgstr "Pritaikyti konfliktų sprendimą ir uždaryti dialogą"
msgid "Apply Resolution"
-msgstr ""
+msgstr "Pritaikyti sprendimą"
msgid "Close anyway"
msgstr "Užverti vis tiek"
msgid "Continue resolving"
-msgstr ""
+msgstr "Tęsti sprendimą"
msgid ""
"<html>You did not finish to merge the differences in this "
@@ -6036,64 +6097,69 @@ msgid ""
"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
"conflicts.</html>"
msgstr ""
+"<html>Jūs nebaigėte sulieti šio konflikto skirtumų.<br>Konflikto sprendimai "
+"nebus pritaikyti, kol neišspręsti visi skirtumai.<br>Spauskite "
+"<strong>{0}</strong>, kad vis tiek uždarytumėte.<br><strong>Jau išspręsti "
+"skirtumai nebus pritaikyti.</strong><br>Spauskite <strong>{1}</strong>, kad "
+"grįžtumėte spręsti konfliktus.</html>"
msgid "Conflict not resolved completely"
-msgstr ""
+msgstr "Konfliktai pilnai neišspręstas"
msgid "Resolve conflicts"
-msgstr ""
+msgstr "Išspręsti konfliktus"
msgid "Resolve conflicts for ''{0}''"
-msgstr ""
+msgstr "Išspręsti „{0}“ konfliktus"
msgid "Filter objects and hide/disable them."
-msgstr ""
+msgstr "Filtruoti objektus ir slėpti/išjungti juos."
msgid "Enable filter"
msgstr "Įjungti filtrą"
msgid "Multikey: {0}"
-msgstr ""
+msgstr "Kelios žymos: {0}"
msgid "Hide filter"
msgstr "Slėpti filtrą"
msgid "Hiding filter"
-msgstr ""
+msgstr "Slėpimo filtras"
msgid "Inverse filter"
-msgstr ""
+msgstr "Atvirkštinis filtras"
msgid "Filter mode"
-msgstr ""
+msgstr "Filtro veiksena"
msgid "Add"
msgstr "Pridėti"
msgid "Add filter."
-msgstr ""
+msgstr "Pridėti filtrą."
msgid "Edit filter."
-msgstr ""
+msgstr "Redaguoti filtrą."
msgid "Delete filter."
-msgstr ""
+msgstr "Šalinti filtrą."
msgid "Move filter up."
-msgstr ""
+msgstr "Pakelti filtrą."
msgid "Move filter down."
-msgstr ""
+msgstr "Nuleisti filtrą."
msgid "Filter Hidden:{0} Disabled:{1}"
-msgstr ""
+msgstr "Pagal filtrą paslėpta: {0}, išjungta: {1}"
msgid "Error in filter"
msgstr "Klaida filtre"
msgctxt "filter"
msgid "E"
-msgstr ""
+msgstr "Įj"
msgctxt "filter"
msgid "H"
@@ -6105,23 +6171,23 @@ msgstr "Tekstas"
msgctxt "filter"
msgid "I"
-msgstr ""
+msgstr "I"
msgctxt "filter"
msgid "M"
-msgstr ""
+msgstr "R"
msgctxt "filter"
msgid "R"
-msgstr ""
+msgstr "K"
msgctxt "filter"
msgid "A"
-msgstr ""
+msgstr "P"
msgctxt "filter"
msgid "D"
-msgstr ""
+msgstr "Iš"
msgctxt "filter"
msgid "F"
@@ -6132,19 +6198,22 @@ msgstr "<h2>Filtras aktyvus</h2>"
msgid "<p><b>{0}</b> object hidden"
msgid_plural "<p><b>{0}</b> objects hidden"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "<p><b>{0} objektas paslėptas"
+msgstr[1] "<p><b>{0} objektai paslėpti"
+msgstr[2] "<p><b>{0} objektų paslėpta"
msgid "<b>{0}</b> object disabled"
msgid_plural "<b>{0}</b> objects disabled"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "<b>{0}</b> objektas išjungtas"
+msgstr[1] "<b>{0}</b> objektai išjungti"
+msgstr[2] "<b>{0}</b> objektų išjungta"
msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
msgstr ""
+"</p><p>Užverkite filtro dialogo langą visiems objektams pamatyti.<p></html>"
msgid "Advanced object info"
-msgstr ""
+msgstr "Sudėtingesnė objekto info"
msgid "map style"
msgstr "žemėlapio stilius"
@@ -6153,135 +6222,149 @@ msgid " ({0})"
msgstr " ({0})"
msgid "not in data set"
-msgstr ""
+msgstr "ne duomenų aibėje"
msgid "Node: "
-msgstr ""
+msgstr "Taškas: "
msgid "Way: "
-msgstr ""
+msgstr "Kelias: "
msgid "Relation: "
-msgstr ""
+msgstr "Ryšys: "
msgid "deleted-on-server"
-msgstr ""
+msgstr "ištrintas-serveryje"
msgid "modified"
msgstr "pakeistas"
msgid "filtered/hidden"
-msgstr ""
+msgstr "atfiltruota/paslėpta"
msgid "filtered/disabled"
-msgstr ""
+msgstr "atfiltruota/išjungta"
msgid "has direction keys (reversed)"
-msgstr ""
+msgstr "turi krypties raktus (atbulus)"
msgid "has direction keys"
-msgstr ""
+msgstr "turi krypties raktus"
msgid "State: "
msgstr "Būsena: "
msgid "Data Set: "
-msgstr ""
+msgstr "Duomenų aibė: "
msgid "Edited at: "
-msgstr ""
+msgstr "Pakeista: "
msgid "<new object>"
msgstr "<naujas objektas>"
msgid "Edited by: "
-msgstr ""
+msgstr "Pakeitė: "
msgid "Version: "
msgstr "Versija: "
msgid "In changeset: "
-msgstr ""
+msgstr "Pakeitime: "
msgid "Tags: "
-msgstr ""
+msgstr "Žymos: "
msgid "Centroid: "
-msgstr ""
+msgstr "Centroidas: "
msgid "{0} Member: "
msgid_plural "{0} Members: "
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} narys: "
+msgstr[1] "{0} nariai: "
+msgstr[2] "{0} narių: "
msgid " as \"{0}\""
msgstr " kaip \"{0}\""
msgid "{0} Nodes: "
-msgstr ""
+msgstr "{0} raškai: "
msgid "Bounding box: "
-msgstr ""
+msgstr "Apimties stačiakampis: "
msgid "Bounding box (projected): "
-msgstr ""
+msgstr "Apimties stačiakampis (projektuotas): "
msgid "Center of bounding box: "
-msgstr ""
+msgstr "Apimties stačiakampio centras: "
msgid "Coordinates: "
msgstr "Koordinatės: "
msgid "Coordinates (projected): "
-msgstr ""
+msgstr "Koordinatės (projektuotos): "
msgid "Part of: "
-msgstr ""
+msgstr "Dalis: "
msgid "In conflict with: "
-msgstr ""
+msgstr "Konfliktuoja su: "
msgid "Styles Cache for \"{0}\":"
-msgstr ""
+msgstr "„{0}“ stilių podėlis:"
msgid ""
"\n"
"\n"
"> applying {0} style \"{1}\"\n"
msgstr ""
+"\n"
+"\n"
+"> pritaikomas {0} stilius „{1}“\n"
msgid ""
"\n"
"Range:{0}"
msgstr ""
+"\n"
+"Intervalas: {0}"
msgid ""
"\n"
"\n"
"> skipping \"{0}\" (not active)"
msgstr ""
+"\n"
+"\n"
+"> praleidžiamas „{0}“ (neaktyvus)"
msgid ""
"\n"
"\n"
"List of generated Styles:\n"
msgstr ""
+"\n"
+"\n"
+"Sugeneruotų stilių sąrašas:\n"
msgid "The 2 selected objects have identical style caches."
-msgstr ""
+msgstr "2 pažymėti objektai turi identiškus stilių podėlius."
msgid "The 2 selected objects have different style caches."
-msgstr ""
+msgstr "2 pažymėti objektai turi skirtingus stilių podėlius."
msgid ""
"Warning: The 2 selected objects have equal, but not identical style caches."
msgstr ""
+"Įspėjimas: 2 pažymėti objektai turi lygius, bet ne identiškus stilių "
+"podėlius."
msgid "xml"
msgstr "xml"
msgid "mapcss"
-msgstr ""
+msgstr "mapcss"
msgid "unknown"
msgstr "nežinoma"
@@ -6298,67 +6381,76 @@ msgid ""
"<tt>°</tt>, <tt>'</tt>, <tt>′</tt>, <tt>"</tt>, "
"<tt>″</tt> are optional.<br/><br/>Some examples:<ul>{0}</ul>"
msgstr ""
+"Įveskite naujo taško koordinates.<br/>Ilgumą ir platumą galite atskirti "
+"tarpu, kableliu ar kabliataškiu.<br/>Teigiami skaičiai arba N, E simboliai "
+"reiškia Šiaurę (N) arba Rytus (E).<br/>Pietums naudokite arba neigiamus "
+"skaičius, arba S (Pietūs) ar W (Vakarai) raides.<br/>Koordinačių reikšmes "
+"galima rašyti vienu iš trijų "
+"formatų:<ul><li><i>laipsniai</i><tt>°</tt></li><li><i>laipsniai</i><tt>&d"
+"eg;</tt> <i>minutės</i><tt>'</tt></li><li><i>laipsniai</i><tt>°</tt> "
+"<i>minutės</i><tt>'</tt> "
+"<i>sekundės</i><tt>"</tt></li></ul>Simboliai <tt>°</tt>, "
+"<tt>'</tt>, <tt>′</tt>, <tt>"</tt>, <tt>″</tt> "
+"neprivalomi.<br/><br/>Keli pavyzdžiai:<ul>{0}</ul>"
msgid "Projected coordinates:"
-msgstr ""
+msgstr "Projektuotos koordinatės:"
msgid ""
"Enter easting and northing (x and y) separated by space, comma or semicolon."
msgstr ""
+"Įveskite rytus ir šiaurę (x ir y), atskirtus tarpu, kableliu ar kabliataškiu."
msgid "Lat/Lon"
-msgstr ""
+msgstr "Plat/Ilg"
msgid "East/North"
-msgstr ""
-
-msgid "Ok"
-msgstr "Gerai"
+msgstr "Rytai/Šiaurė"
msgid "Please enter a GPS coordinates"
-msgstr ""
+msgstr "Prašome įvesti GPS koordinates"
msgid "Please enter a Easting and Northing"
-msgstr ""
+msgstr "Prašome įvesti Rytus ir Šiaurę"
msgid "Toggle visibility of layer: {0}"
-msgstr ""
+msgstr "Perjungti sluoksnio matomumą: {0}"
msgid "Open a list of all loaded layers."
-msgstr ""
+msgstr "Atverti visų įkeltų sluoksnių sąrašą."
msgid "Delete the selected layers."
-msgstr ""
+msgstr "Šalinti pažymėtus sluoksnius."
msgid "Show/hide"
msgstr "Rodyti/slėpti"
msgid "Toggle visible state of the selected layer."
-msgstr ""
+msgstr "Perjungti pažymėto sluoksnio matomumą."
msgid "Show/hide layer"
-msgstr ""
+msgstr "Rodyti/slėpti sluoksnį"
msgid "Opacity"
msgstr "Permatomumas"
msgid "Adjust opacity of the layer."
-msgstr ""
+msgstr "Keisti sluoksnio permatomumą."
msgid "Activate"
msgstr "Aktyvinti"
msgid "Activate the selected layer"
-msgstr ""
+msgstr "Aktyvuoti pažymėtą sluoksnį"
msgid "Activate layer"
-msgstr ""
+msgstr "Aktyvuoti sluoksnį"
msgid "Merge this layer into another layer"
-msgstr ""
+msgstr "Sulieti šį sluoksnį su kitu sluoksniu"
msgid "Duplicate this layer"
-msgstr ""
+msgstr "Kopijuoti šį sluoksnį"
msgid "Copy of {0}"
msgstr "{0} kopija"
@@ -6367,34 +6459,35 @@ msgid "Copy {1} of {0}"
msgstr "{0} kopija {1}"
msgid "layer is currently visible (click to hide layer)"
-msgstr ""
+msgstr "sluoksnis šiuo metu matomas (spauskite, kad paslėptumėte)"
msgid "layer is currently hidden (click to show layer)"
-msgstr ""
+msgstr "sluoksnis šiuo metu paslėptas (spauskite, kad parodytumėte)"
msgid "this layer is the active layer"
-msgstr ""
+msgstr "šis sluoksnis yra aktyvus sluoksnis"
msgid "this layer is not currently active (click to activate)"
msgstr ""
+"šis sluoksnis šiuo metu neaktyvus (spauskite, kad padarytumėte aktyviu)"
msgid "Move the selected layer one row up."
-msgstr ""
+msgstr "Perkelti pažymėtą sluoksnį viena eilute aukštyn."
msgid "Move the selected layer one row down."
-msgstr ""
+msgstr "Perkelti pažymėtą sluoksnį viena eilute žemyn."
msgid "Information about layer"
msgstr "Sluoksnio informacija"
msgid "Map paint preferences"
-msgstr ""
+msgstr "Žemėlapio braižymo nustatymai"
msgid "Map Paint Styles"
msgstr "Žemėlapio atvaizdavimo stiliai"
msgid "configure the map painting style"
-msgstr ""
+msgstr "konfigūruoti žemėlapio paišymo stilių"
msgid "MapPaint"
msgstr "MapPaint"
@@ -6403,43 +6496,43 @@ msgid "On/Off"
msgstr "Įjungti/Išjungti"
msgid "Turn selected styles on or off"
-msgstr ""
+msgstr "Įjungti arba išjungti pažymėtus stilius"
msgid "Move the selected entry one row down."
-msgstr ""
+msgstr "Perkelti pažymėtą įrašą viena eilute žemyn."
msgid "Move the selected entry one row up."
-msgstr ""
+msgstr "Perkelti pažymėtą įrašą viena eilute aukštyn."
msgid "Reload from file"
-msgstr ""
+msgstr "Iš naujo įkelti iš failo"
msgid "reload selected styles from file"
-msgstr ""
+msgstr "iš naujo įkelti pažymėtus stilius iš failo"
msgid "Save as..."
msgstr "Išsaugoti kaip..."
msgid "Save a copy of this Style to file and add it to the list"
-msgstr ""
+msgstr "Įrašyti šio stiliaus kopiją į failą ir pridėti jį į sąrašą"
msgid "Map paint style file (*.mapcss, *.zip)"
-msgstr ""
+msgstr "Žemėlapio paišymo stilius (*.mapcss, *.zip)"
msgid "Map paint style file (*.xml, *.zip)"
-msgstr ""
+msgstr "Žemėlapio paišymo stilius (*.xml, *.zip)"
msgid "Reloading style sources"
-msgstr ""
+msgstr "Iš naujo įkeliami stilių šaltiniai"
msgid "Save style ''{0}'' as ''{1}''"
-msgstr ""
+msgstr "Įrašyti stilių „{0}“ kaip „{1}“"
msgid "view meta information, error log and source definition"
-msgstr ""
+msgstr "peržiūrėti meta informaciją, klaidų žurnalą ir šaltinio apibrėžimą"
msgid "Map Style info"
-msgstr ""
+msgstr "Žemėlapio stiliaus info"
msgid "Source"
msgstr "Šaltinis"
@@ -6451,7 +6544,7 @@ msgid "URL:"
msgstr "URL:"
msgid "Built-in Style, internal path:"
-msgstr ""
+msgstr "Vidinis stilius, vidinis kelias:"
msgid "Path:"
msgstr "Kelias:"
@@ -6463,55 +6556,55 @@ msgid "Background:"
msgstr "Fonas:"
msgid "Style is currently active?"
-msgstr ""
+msgstr "Stilius dabar aktyvus?"
msgid "No"
msgstr "Ne"
msgid "Style settings"
-msgstr ""
+msgstr "Stiliaus nustatymai"
msgid "Customize the style"
-msgstr ""
+msgstr "Tinkinti stilių"
msgid "List of notes"
-msgstr ""
+msgstr "Pastabų sąrašas"
msgid "Add comment"
-msgstr ""
+msgstr "Pridėti komentarą"
msgid "Comment"
msgstr "Komentaras"
msgid "Comment on note"
-msgstr ""
+msgstr "Komentuoti pastabą"
msgid "Add comment to note:"
-msgstr ""
+msgstr "Pridėti komentarą prie pastabos:"
msgid "Close note"
-msgstr ""
+msgstr "Uždaryti pastabą"
msgid "Close note with message:"
-msgstr ""
+msgstr "Uždaryti pastabą su pranešimu:"
msgid "Create a new note"
-msgstr ""
+msgstr "Sukurti naują pastabą"
msgid "Create"
-msgstr ""
+msgstr "Sukurti"
msgid "Reopen note"
-msgstr ""
+msgstr "Iš naujo atidaryti pastabą"
msgid "Reopen"
-msgstr ""
+msgstr "Iš naujo atidaryti"
msgid "Reopen note with message:"
-msgstr ""
+msgstr "Iš naujo atidaryti pastabą su pranešimu:"
msgid "Sort notes"
-msgstr ""
+msgstr "Rikiuoti pastabas"
msgid "Sort"
msgstr "Rikiuoti"
@@ -6537,11 +6630,16 @@ msgid ""
"mixed mode, specify objects like this: {1}<br/>({2} stands for <i>node</i>, "
"{3} for <i>way</i>, and {4} for <i>relation</i>)"
msgstr ""
+"Objektų ID galima atskirti kableliais arba tarpais.<br/>Pavyzdžiui: "
+"{0}<br/>Mišriam režime, objektus nurodykite taip: {1}<br/>({2} nurodo "
+"<i>tašką</i>, {3} - <i>kelią</i>, o {4} - <i>ryšį</i>)"
msgid ""
"Invalid ID list specified\n"
"Cannot continue."
msgstr ""
+"Nurodytas netinkamas ID sąrašas\n"
+"Negalima tęsti."
msgid "Relations"
msgstr "Ryšiai"
@@ -6550,7 +6648,7 @@ msgid "Open a list of all relations."
msgstr "Atverti ryšių sąrašą"
msgid "Relation list filter"
-msgstr ""
+msgstr "Ryšių sąrašo filtras"
msgid "Create a new relation"
msgstr "Sukurti naują ryšį"
@@ -6559,37 +6657,37 @@ msgid "New"
msgstr "Naujas"
msgid "Relations: {0}/{1}"
-msgstr ""
+msgstr "Ryšiai: {0}/{1}"
msgid "Relations: {0}"
msgstr "Ryšiai: {0}"
msgid "Open a selection list window."
-msgstr ""
+msgstr "Atverti pažymėjimo sąrašo langą."
msgid "Current Selection"
-msgstr ""
+msgstr "Dabartinis pažymėjimas"
msgid "Search for objects"
-msgstr ""
+msgstr "Ieškoti objektų"
msgid "Display the history of the selected objects."
msgstr "Parodyti pasirinktų objektų istoriją."
msgid "Zoom to selection"
-msgstr ""
+msgstr "Padidinti pažymėjimą"
msgid "Zoom to selected element(s)"
-msgstr ""
+msgstr "Rodyti pažymėtus elementus"
msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
-msgstr ""
+msgstr "Paž.: Ryš:{0} / Kel:{1} / Taškai:{2}"
msgid "Unselectable now"
-msgstr ""
+msgstr "Dabar nepažymimi"
msgid "Selection: {0}"
-msgstr ""
+msgstr "Pažymėjimas: {0}"
msgid "Always shown"
msgstr "Visada rodoma"
@@ -6601,29 +6699,31 @@ msgid "Always hidden"
msgstr "Visada paslėpta"
msgid "Toggle dynamic buttons"
-msgstr ""
+msgstr "Perjungti dinaminius mygtukus"
msgid "Open preferences for this panel"
-msgstr ""
+msgstr "Atverti šio skydelio nuostatas"
msgid "Undock the panel"
-msgstr ""
+msgstr "Atkabinti skydelį"
msgid ""
"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
+"Uždaryti šį skydelį. Vėliau galite jį iš naujo atverti mygtukais įrankinėje "
+"kairėje."
msgid "Click to minimize/maximize the panel content"
-msgstr ""
+msgstr "Spauskite skydelio turiniui suskleisti/išskleisti"
msgid "Side buttons"
-msgstr ""
+msgstr "Krašto mygtukai"
msgid "Authors"
msgstr "Autoriai"
msgid "Open a list of people working on the selected objects."
-msgstr ""
+msgstr "Atverti sąrašą žmonių, dirbančių su pažymėtais objektais."
msgid "{0} Author"
msgid_plural "{0} Authors"
@@ -6632,21 +6732,24 @@ msgstr[1] "{0} autoriai"
msgstr[2] "{0} autorių"
msgid "Select objects submitted by this user"
-msgstr ""
+msgstr "Pažymėti objektus, įkeltus šio naudotojo"
msgid "Launches a browser with information about the user"
-msgstr ""
+msgstr "Paleidžia naršyklę su informacija apie naudotoją"
msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
+"Info naršyklės paleidžiamos tik pirmiems {0} iš {1} pažymėtų naudotojų"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
"this system.</html>"
msgstr ""
+"<html>Nepavyko sukurti URL, nes koduotės „{0}“<br>nėra šioje "
+"sistemoje.</html>"
msgid "Missing encoding"
-msgstr ""
+msgstr "Trūksta koduotės"
msgid "Author"
msgstr "Autorius"
@@ -6655,13 +6758,13 @@ msgid "# Objects"
msgstr "# Objektai"
msgid "Validation Results"
-msgstr ""
+msgstr "Tikrinimo rezultatai"
msgid "Open the validation window."
-msgstr ""
+msgstr "Atverti tikrinimo langą."
msgid "Validation results"
-msgstr ""
+msgstr "Tikrinimo rezultatai"
msgid "Fix"
msgstr "Pataisyti"
@@ -6673,10 +6776,10 @@ msgid "Ignore the selected issue next time."
msgstr "Kitą karta ignoruoti parinkta problema."
msgid "Whole group"
-msgstr "Visa grupė"
+msgstr "Visą grupę"
msgid "Single elements"
-msgstr "Vienas elementas"
+msgstr "Pavienius elementus"
msgid "Nothing"
msgstr "Nieko"
@@ -6697,28 +6800,28 @@ msgid "Updating map ..."
msgstr "Atnaujinamas žemėlapis ..."
msgid "anonymous"
-msgstr "anonimalus"
+msgstr "anoniminis"
msgid "Display the basic properties of the changeset"
-msgstr ""
+msgstr "Rodyti pagrindines pakeitimo savybes"
msgid "Display the tags of the changeset"
-msgstr ""
+msgstr "Rodyti pakeitimo žymas"
msgid "Content"
msgstr "Turinys"
msgid "Display the objects created, updated, and deleted by the changeset"
-msgstr ""
+msgstr "Rodyti objektus, sukurtus, pakeistus ir pašalintus šiuo pakeitimu"
msgid "Discussion"
-msgstr ""
+msgstr "Diskusija"
msgid "Display the public discussion around this changeset"
-msgstr ""
+msgstr "Rodyti viešą šio pakeitimo aptarimą"
msgid "Changeset Management Dialog"
-msgstr ""
+msgstr "Pakeitimų valdymo dialogo langas"
msgid "Close the dialog"
msgstr "Užverti dialogą"
@@ -6727,45 +6830,49 @@ msgid "Query"
msgstr "Užklausa"
msgid "Launch the dialog for querying changesets"
-msgstr ""
+msgstr "Paleisti pakeitimų užklausų dialogo langą"
msgid "Remove from cache"
-msgstr ""
+msgstr "Išimti iš podėlio"
msgid "Remove the selected changesets from the local cache"
-msgstr ""
+msgstr "Išimti pažymėtus pakeitimus iš vietinio podėlio"
msgid "Close the selected changesets"
-msgstr ""
+msgstr "Užverti pažymėtus pakeitimus"
msgid "Update changeset"
-msgstr ""
+msgstr "Atnaujinti pakeitimą"
msgid "Updates the selected changesets with current data from the OSM server"
msgstr ""
+"Atnaujina pažymėtus pakeitimus pagal dabartinius duomenis OSM serveryje"
msgid "Download changeset content"
-msgstr ""
+msgstr "Atsiųsti pakeitimo turinį"
msgid "Download the content of the selected changesets from the server"
-msgstr ""
+msgstr "Atsiųsti pažymėtų pakeitimų turinį iš serverio"
msgid "My changesets"
msgstr "Mano pakeitimai"
msgid "Download my changesets from the OSM server (max. 100 changesets)"
msgstr ""
-"Parsiūsti mano pakeitimus iš OSM servetrio (daugiausiai 100 pakeitimų)"
+"Parsiųsti mano pakeitimus iš OSM serverio (daugiausiai 100 pakeitimų)"
msgid ""
"<html>JOSM is currently running with an anonymous user. It cannot "
"download<br>your changesets from the OSM server unless you enter your OSM "
"user name<br>in the JOSM preferences.</html>"
msgstr ""
+"<html>JOSM šiuo metu veikia su anoniminiu naudotoju. Jis negali "
+"atsiųsti<br>jūsų pakeitimų iš OSM serverio, nebent jūs įvesite savo OSM "
+"naudotojo vardą<br>JOSM nustatymuose.</html>"
msgctxt "changeset.upload-comment"
msgid "empty"
-msgstr "tusčias"
+msgstr "tuščias"
msgctxt "changeset.state"
msgid "Open"
@@ -6791,7 +6898,7 @@ msgid "Closed at"
msgstr "Užvertas"
msgid "Discussions"
-msgstr ""
+msgstr "Diskusijos"
msgid "Downloading changeset content"
msgstr "Parsiunčiamas pakeitimo turinys"
@@ -6809,13 +6916,20 @@ msgid_plural ""
"<html>None of the selected objects is available in the current<br>edit layer "
"''{0}''.</html>"
msgstr[0] ""
+"<html>Pažymėtas objektas nepasiekiamas dabartiniame<br>keičiamame sluoksnyje "
+"„{0}“.</html>"
msgstr[1] ""
+"<html>Nei vienas iš pažymėtų objektų nepasiekiamas "
+"dabartiniame<br>keičiamame sluoksnyje „{0}“.</html>"
+msgstr[2] ""
+"<html>Nei vienas iš pažymėtų objektų nepasiekiamas "
+"dabartiniame<br>keičiamame sluoksnyje „{0}“.</html>"
msgid "Download content"
-msgstr "Parsiunčiams turinys"
+msgstr "Atsiųsti turinį"
msgid "Download the changeset content from the OSM server"
-msgstr "Parsiunčiams pakeitimo turtinys iš OSM serverio"
+msgstr "Atsiųsti pakeitimo turiį iš OSM serverio"
msgid "Update content"
msgstr "Atnaujinamas turinys"
@@ -6824,34 +6938,34 @@ msgid "Update the changeset content from the OSM server"
msgstr "Atnaujinti pakeitimo turinį iš OSM serverio"
msgid "Download and show the history of the selected objects"
-msgstr "Parsiųsti ir parodyti parinktų objektų istoriją"
+msgstr "Atsiųsti ir parodyti pažymėtų objektų istoriją"
msgid "Select in layer"
msgstr "Parinkti sluoksnyje"
msgid "Select the corresponding primitives in the current data layer"
-msgstr ""
+msgstr "Pažymėti atitinkamus primityvus dabartiniame duomenų sluoksnyje"
msgid "Nothing to select"
msgstr "Nėra ką parinkti"
msgid "Zoom to in layer"
-msgstr ""
+msgstr "Padidinti sluoksnį"
msgid "Zoom to the corresponding objects in the current data layer"
-msgstr ""
+msgstr "Padidinti atitinkamus objektus dabartiniame duomenų sluoksnyje"
msgid "Nothing to zoom to"
-msgstr ""
+msgstr "Nėra ko padidinti"
msgid "The content of this changeset is not downloaded yet."
-msgstr ""
+msgstr "Šio pakeitimo turinys dar neatsiųstas."
msgid "Download now"
msgstr "Atsisiųsti dabar"
msgid "Download the changeset content"
-msgstr ""
+msgstr "Atsiųsti pakeitimo turinį"
msgid "Created"
msgstr "Sukurtas"
@@ -6863,7 +6977,7 @@ msgid "Deleted"
msgstr "Ištrintas"
msgid "Name"
-msgstr "Vardas"
+msgstr "Pavadinimas"
msgid "ID:"
msgstr "ID:"
@@ -6872,7 +6986,7 @@ msgid "Comment:"
msgstr "Komentaras:"
msgid "Open/Closed:"
-msgstr "Atvertas/Užvetas:"
+msgstr "Atvertas/Užvertas:"
msgid "Created by:"
msgstr "Sukurtas:"
@@ -6884,40 +6998,43 @@ msgid "Closed on:"
msgstr "Užvertas su:"
msgid "Remove the changeset in the detail view panel from the local cache"
-msgstr ""
+msgstr "Išimti pakeitimą detalaus rodinio kortelėje iš vietinio podėlio"
msgid "Update the changeset from the OSM server"
-msgstr ""
+msgstr "Atnaujinti pakeitimą iš OSM serverio"
msgid ""
"Select the primitives in the content of this changeset in the current data "
"layer"
-msgstr ""
+msgstr "Pažymėti šio pakeitimo primityvus dabartiniame duomenų sluoksnyje"
msgid ""
"<html>None of the objects in the content of changeset {0} is available in "
"the current<br>edit layer ''{1}''.</html>"
msgstr ""
+"<html>Nei vienas iš pakeitimo {0} turinio objektų neprieinamas "
+"dabartiniame<br>keičiamame sluoksnyje „{1}“.</html>"
msgid ""
"Zoom to the objects in the content of this changeset in the current data "
"layer"
msgstr ""
+"Padidinti šio pakeitimo turinio objektus dabartiniame duomenų sluoksnyje"
msgid "Update changeset discussion"
-msgstr ""
+msgstr "Atnaujinti pakeitimo aptarimą"
msgid "Update the changeset discussion from the OSM server"
-msgstr ""
+msgstr "Atnaujinti pakeitimo aptarimą iš OSM serverio"
msgid "Date"
msgstr "Data"
msgid "Download changesets"
-msgstr ""
+msgstr "Atsiųsti pakeitimus"
msgid "{0} [incomplete]"
-msgstr ""
+msgstr "{0} [nebaigta]"
msgid "open"
msgstr "atvertas"
@@ -6926,67 +7043,73 @@ msgid "closed"
msgstr "užvertas"
msgid "Changeset ID: "
-msgstr "Pakeitimas ID: "
+msgstr "Pakeitimo ID: "
msgid "Enter a changeset id"
-msgstr ""
+msgstr "Įveskite pakeitimo id"
msgid ""
"Download the changeset with the specified id, including the changeset content"
-msgstr ""
+msgstr "Atsiųsti pakeitimą su nurodytu id, įskaitant ir pokyčio turinį"
msgid "Select changesets owned by specific users"
-msgstr ""
+msgstr "Pažymėti pakeitimus priklausančius konkretiems naudotojams"
msgid "Select changesets depending on whether they are open or closed"
-msgstr ""
+msgstr "Pažymėti pakeitimus priklausomai nuo to, ar jie atverti, ar užverti"
msgid ""
"Select changesets based on the date/time they have been created or closed"
msgstr ""
+"Pažymėti pakeitimus pagal datą/laiką, kai jie buvo sukurti ar užverti"
msgid "Select only changesets related to a specific bounding box"
msgstr ""
+"Pažymėti tik pakeitimus, susijusius su konkrečiu apimties stačiakampiu"
msgid "Query open changesets only"
-msgstr ""
+msgstr "Ieškoti tik atvertuose pakeitimuose"
msgid "Query closed changesets only"
-msgstr ""
+msgstr "Ieškoti tik užvertuose pakeitimuose"
msgid "Query both open and closed changesets"
-msgstr ""
+msgstr "Ieškoti ir atvertuose, ir užvertuose pakeitimuose"
msgid "User ID:"
-msgstr "Vartotojos ID:"
+msgstr "Naudotojo ID:"
msgid "User name:"
-msgstr "Vartotojo vardas:"
+msgstr "Naudotojo vardas:"
msgid "Only changesets owned by myself"
-msgstr ""
+msgstr "Tik pakeitimuose, priklausančiuose man"
msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
+msgstr "Tik pakeitimai, priklausantys naudotojui su šiuo naudotojo ID"
msgid "Only changesets owned by the user with the following user name"
-msgstr ""
+msgstr "Tik pakeitimai, priklausantys naudotojui su šiuo naudotojo vardu"
msgid ""
"Only changesets owned by myself (disabled. JOSM is currently run by an "
"anonymous user)"
msgstr ""
+"Tik man priklausantys pakeitimai (išjungta. JOSM šiuo metu veikia kaip "
+"anoniminis naudotojas)"
msgid ""
"Cannot restrict changeset query to the current user because the current user "
"is anonymous"
msgstr ""
+"Negalima apriboti pakeitimų užklausos dabartiniu naudotoju, nes dabartinis "
+"naudotojas yra anonimas"
msgid "Current value ''{0}'' for user ID is not valid"
-msgstr ""
+msgstr "Dabartinė naudotojo ID reikšmė „{0}“ yra netinkama"
msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
+msgstr "Negalima apriboti pakeitimų užklausos naudotojo vardu „{0}“"
msgid "Please enter a valid user ID"
msgstr "Įveskite tinkamą naudotojo ID"
@@ -6995,10 +7118,10 @@ msgid "Invalid user ID"
msgstr "Netinkamas naudotojo ID"
msgid "Please enter a non-empty user name"
-msgstr ""
+msgstr "Prašome įvesti ne tuščią naudotojo vardą"
msgid "Invalid user name"
-msgstr "Klaidingas vartotojos vardas"
+msgstr "Klaidingas naudotojo vardas"
msgid "Date: "
msgstr "Data: "
@@ -7016,69 +7139,87 @@ msgid "Created before - "
msgstr "Sukurtas prieš - "
msgid "Only changesets closed after the following date/time"
-msgstr ""
+msgstr "Tik pakeitimai, užverti po šios datos/laiko"
msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
+msgstr "Tik pakeitimai, užverti po ir sukurti prieš nurodytą datą/laiką"
msgid ""
"Cannot build changeset query with time based restrictions. Input is not "
"valid."
msgstr ""
+"Negalima sukurti pakeitimų užklausos su laiko apribojimais. Netinkama "
+"įvestis."
msgid ""
"<html>Please enter valid date/time values to restrict<br>the query to a "
"specific time range.</html>"
msgstr ""
+"<html>Prašome įvesti tinkamas datos/laiko reikšmes, kad "
+"apribotumėte<br>užklausą konkrečiame laiko intervale.</html>"
msgid "Invalid date/time values"
-msgstr ""
+msgstr "Netinkamos datos/laiko reikšmės"
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
msgstr ""
+"Negalima apriboti pakeitimų užklausos konkrečiam apimties stačiakampiui. "
+"Netinkama įvestis."
msgid ""
"<html>Please enter valid longitude/latitude values to restrict<br>the "
"changeset query to a specific bounding box.</html>"
msgstr ""
+"<html>Prašome įvesti tinkamas ilgumos/platumos reikšmes, kad "
+"apribotumėte<br>pakeitimų užklausą konkrečiame apimties stačiakampyje.</html>"
msgid "Invalid bounding box"
-msgstr ""
+msgstr "Netinkamas apribojantis stačiakampis"
msgid ""
"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
+"Dabartinė reikšmė netinka naudotojo ID. Prašome įvesti teigiamą sveiką "
+"skaičių"
msgid "Please enter an integer value > 0"
-msgstr ""
+msgstr "Prašome įvesti teigiamą sveiką skaičių"
msgid ""
"<html>The current value is not a valid user name.<br>Please enter an non-"
"empty user name.</html>"
msgstr ""
+"<html>Ši reikšmė nėra tinkamas naudotojo vardas.<br>Prašome įvesti ne tuščią "
+"naudotojo vardą.</html>"
msgid "Please enter an non-empty user name"
-msgstr ""
+msgstr "Prašome įvesti ne tuščią naudotoo vardą"
msgid ""
"Please enter a date in the usual format for your locale.<br>Example: "
"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
+"Prašome įvesti datą jūsų lokalei įprastu formatu.<br>Pavyzdžiui: "
+"{0}<br>Pavyzdžiui: {1}<br>Pavyzdžiui: {2}<br>Pavyzdžiui: {3}<br>"
msgid ""
"Please enter a valid time in the usual format for your locale.<br>Example: "
"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
+"Prašome įvesti tinkamą laiką įprastu jūsų lokalei formatu.<br>Pavyzdys: "
+"{0}<br>Pavyzdys: {1}<br>Pavyzdys: {2}<br>Pavyzdys: {3}<br>"
msgid "Download my changesets only"
-msgstr ""
+msgstr "Atsiųsti tik mano pakeitimus"
msgid ""
"<html>Select to restrict the query to your changesets only.<br>Unselect to "
"include all changesets in the query.</html>"
msgstr ""
+"<html>Pažymėkite, kad apribotumėte užklausą tik jūsų "
+"pakeitimams.<br>Atžymėkite visų pakeitimų įtraukimui.</html>"
msgid ""
"<html>Please select one the following <strong>standard "
@@ -7086,81 +7227,91 @@ msgid ""
"only want to download changesets created by yourself.<br>Note that JOSM will "
"download max. 100 changesets.</html>"
msgstr ""
+"<html>Prašome pažymėti vieną iš šių <strong>standartinių užklausų</strong>. "
+"Pažymėkite <strong>Atsiųsti tik mano pakeitimus</strong>, jei norite "
+"atsiųsti tik jūsų sukurtus pakeitimus.<br>Atkreipkite dėmesį, kad JOSM "
+"atsiųs ne daugiau 100 pakeitimų.</html>"
msgid "<html>Download the latest changesets</html>"
-msgstr ""
+msgstr "<html>Atsiųsti paskutinius pakeitimus</html>"
msgid ""
"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
"user name in the preferences first.</em></html>"
msgstr ""
+"<html>Atsiųsti mano atvirus pakeitimus<br><em>Išjungta. Iš pradžių "
+"nustatymuose įveskite savo OSM naudotojo vardą.</em></html>"
msgid "<html>Download my open changesets</html>"
-msgstr ""
+msgstr "<html>Atsiųsti mano atvirus pakeitimus</html>"
msgid ""
"<html>Download changesets in the current map view.<br><em>Disabled. There is "
"currently no map view active.</em></html>"
msgstr ""
+"<html>Atsiųsti pakeitimus dabartiniame žemėlapio rodinyje.<br><em>Išjungta. "
+"Šiuo metu nėra aktyvaus žemėlapio rodinio.</em></html>"
msgid "<html>Download changesets in the current map view</html>"
-msgstr ""
+msgstr "<html>Atsiųsti pakeitimus dabartiniame žemėlapio rodinyje</html>"
msgid ""
"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
"query."
msgstr ""
+"Netikėta nustatymo „{0}“ reikšmė, gauta „{1}“. Grąžinama numatytoji užklausa."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
+"Nepavyksta sukurti užklausos anoniminio naudotojo atviriems pakeitimams"
msgid "Basic"
msgstr "Paprastas"
msgid "Download changesets using predefined queries"
-msgstr ""
+msgstr "Atsiųsti pakeitimus naudojant išankstines užklausas"
msgid "From URL"
msgstr "Iš URL"
msgid "Query changesets from a server URL"
-msgstr ""
+msgstr "Užklausti pakeitimų iš serverio URL"
msgid "Advanced"
msgstr "Sudėtingesnis"
msgid "Use a custom changeset query"
-msgstr ""
+msgstr "Naudoti savo pakeitimų užklausą"
msgid "Query changesets"
-msgstr ""
+msgstr "Užklausti pakeitimų"
msgid "Query and download changesets"
-msgstr ""
+msgstr "Užklausti ir atsiųsti pakeitimų"
msgid "Please enter a valid changeset query URL first."
-msgstr ""
+msgstr "Įveskite tinkamą pakeitimų užklausos URL."
msgid "Illegal changeset query URL"
-msgstr ""
+msgstr "Netinkamas pakeitimų užklausos URL"
msgid "Close the dialog and abort querying of changesets"
-msgstr ""
+msgstr "Užverti dialogo langą ir nutraukti pakeitimų užklausą"
msgid "Querying and downloading changesets"
-msgstr ""
+msgstr "Užklausiami ir atsiunčiami pakeitimai"
msgid "Determine user id for current user..."
-msgstr ""
+msgstr "Nustatyti dabartinio naudotojo id..."
msgid "Query and download changesets ..."
-msgstr ""
+msgstr "Užklausti ir atsiųsti pakeitimus..."
msgid "URL: "
msgstr "URL: "
msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
-msgstr ""
+msgstr "Prašome įvesti arba įdėti URL, kad gautumėte pakeitimus iš OSM API."
msgid "Examples"
msgstr "Pavyzdžiai"
@@ -7169,33 +7320,47 @@ msgid ""
"Note that changeset queries are currently always submitted to ''{0}'', "
"regardless of the host, port and path of the URL entered below."
msgstr ""
+"Atkreipkite dėmesį, kad pakeitimų užklausos dabar visada siunčiamos į „{0}“, "
+"nepriklausomai nuo URL serverio, prievado ir kelio, įvesto žemiau."
msgid "This changeset query URL is invalid"
-msgstr ""
+msgstr "Šis pakeitimų užklausos URL yra netinkamas"
msgid "Discardable key: selection Foreground"
-msgstr ""
+msgstr "Išmetamas raktas: pažymėjimo tekstas"
msgid "Discardable key: selection Background"
-msgstr ""
+msgstr "Išmetamas raktas: pažymėjimo fonas"
msgid "Discardable key: foreground"
-msgstr ""
+msgstr "Išmetamas raktas: tekstas"
msgid "Discardable key: background"
-msgstr ""
+msgstr "Išmetamas raktas: fonas"
-msgid "<different>"
-msgstr ""
+msgid "{0} ''{1}''"
+msgstr "{0} ''{1}''"
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] "{0} skirtinga"
+msgstr[1] "{0} skirtingos"
+msgstr[2] "{0} skirtingų"
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ", {0} nuimti"
+msgstr[1] ", {0} nuimti"
+msgstr[2] ", {0} nuimti"
msgid "Select objects for which to change tags."
-msgstr ""
+msgstr "Parinkite objektus, kuriems keisti žymas."
msgid "Tags/Memberships"
-msgstr ""
+msgstr "Žymos/narystės"
msgid "Tags for selected objects."
-msgstr ""
+msgstr "Žymos, pažymėtiems objektams"
msgid "Member Of"
msgstr "Šio narys"
@@ -7203,50 +7368,56 @@ msgstr "Šio narys"
msgid "Position"
msgstr "Padėtis"
+msgid "<different>"
+msgstr "<įvairūs>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr "Objektai: {2} / Žymos: {0} / Narystės: {1}"
+
msgid "Tags: {0} / Memberships: {1}"
-msgstr ""
+msgstr "Žymos: {0} / Narystės: {1}"
msgid "Tags / Memberships"
-msgstr ""
+msgstr "Žymos / narystės"
msgid "Delete the selected key in all objects"
-msgstr ""
+msgstr "Šalinti pažymėtą raktą visiems objektams"
msgid "Delete Tags"
-msgstr ""
+msgstr "Šalinti žymas"
msgid "Change relation"
-msgstr ""
+msgstr "Keisti ryšį"
msgid "Delete from relation"
-msgstr ""
+msgstr "Išimti iš ryšio"
msgid "Really delete selection from relation {0}?"
-msgstr ""
+msgstr "Tikrai trinti pažymėjimą iš ryšio {0}?"
msgid "Add a new key/value pair to all objects"
-msgstr ""
+msgstr "Pridėti naują rakto/reikšmės porą į visus objektus"
msgid "Add Tag"
msgstr "Pridėti žymę"
msgid "Edit the value of the selected key for all objects"
-msgstr ""
+msgstr "Keisti pažymėto rakto reikšmę visuose objektuose"
msgid "Edit Tags"
-msgstr ""
+msgstr "Keisti žymas"
msgid "Go to OSM wiki for tag help (F1)"
-msgstr ""
+msgstr "OSM wiki žymos pagalba (F1)"
msgid "Launch browser with wiki help for selected object"
-msgstr ""
+msgstr "Paleisti naršyklę su pažymėto objekto wiki pagalba"
msgid "Paste Value"
-msgstr ""
+msgstr "Įdėti reikšmę"
msgid "Paste the value of the selected tag from clipboard"
-msgstr ""
+msgstr "Įdėti pažymėtos žymos reikšmę iš iškarpinės"
msgid "Copy Value"
msgstr "Kopijuoti Vertę"
@@ -7255,30 +7426,32 @@ msgid "Copy the value of the selected tag to clipboard"
msgstr "Kopijuoti parinktos žymės vertę į iškarpinę"
msgid "Copy selected Key(s)/Value(s)"
-msgstr ""
+msgstr "Kopijuoti pažymėtus raktus/reikšmes"
msgid "Copy the key and value of the selected tag(s) to clipboard"
-msgstr ""
+msgstr "Kopijuoti pažymėtos(ų) žymos(ų) raktus ir reikšmes į iškarpinę"
msgid "Copy all Keys/Values"
msgstr "Kopijuoti visus Raktus/Vertes"
msgid "Copy the key and value of all the tags to clipboard"
-msgstr ""
+msgstr "Kopijuoti visų žymų raktus ir reikšmes į iškarpinę"
msgid "Search Key/Value/Type"
-msgstr "Iškoti Raktą/Vetę/Tipą"
+msgstr "Ieškoti Rakto/Vertės/Tipo"
msgid ""
"Search with the key and value of the selected tag, restrict to type (i.e., "
"node/way/relation)"
msgstr ""
+"Ieškoti su pažymėtos žymos raktu ir reikšme, apriboti pagal tipą (t.y. "
+"tašką/kelią/ryšį)"
msgid "Search Key/Value"
-msgstr ""
+msgstr "Ieškoti pagal raktą/reikšmę"
msgid "Search with the key and value of the selected tag"
-msgstr ""
+msgstr "Ieškoti pagal pažymėtos žymos raktą ir reikšmę"
msgid "Overwrite key"
msgstr "Perrašyti raktą"
@@ -7287,39 +7460,43 @@ msgid "Replace"
msgstr "Pakeisti"
msgid "The new key is already used, overwrite values?"
-msgstr ""
+msgstr "Naujas raktas jau panaudotas, perrašyti reikšmes?"
msgid "Change value?"
msgid_plural "Change values?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Keisti reikšmę?"
+msgstr[1] "Keisti reikšmes?"
+msgstr[2] "Keisti reikšmes?"
msgid "This will change {0} object."
msgid_plural "This will change up to {0} objects."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tai pakeis {0} objektą."
+msgstr[1] "Tai pakeis iki {0} objektų."
+msgstr[2] "Tai pakeis iki {0} objektų."
msgid "An empty value deletes the tag."
-msgstr ""
+msgstr "Tuščia reikšmė ištrina žymą."
msgid "You changed the key from ''{0}'' to ''{1}''."
-msgstr ""
+msgstr "Jūs pakeitėte raktą iš „{0}“ į „{1}“."
msgid "Change properties of up to {0} object"
msgid_plural "Change properties of up to {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Keisti savybes ne daugiau {0} objektui"
+msgstr[1] "Keisti savybes ne daugiau {0} objektams"
+msgstr[2] "Keisti savybes ne daugiau {0} objektų"
msgid "Use English language for tag by default"
-msgstr ""
+msgstr "Pagal nutylėjimą naudoti anglišką žymos reikšmę"
msgid "Add value?"
msgstr "Pridėti reikšmę?"
msgid "This will change up to {0} object."
msgid_plural "This will change up to {0} objects."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tai pakeis iki {0} objekto."
+msgstr[1] "Tai pakeis iki {0} objektų."
+msgstr[2] "Tai pakeis iki {0} objektų."
msgid "Please select a key"
msgstr "Pasirinkite raktą"
@@ -7328,236 +7505,279 @@ msgid "Please select a value"
msgstr "Pasirinkite reikšmę"
msgid "Set number of recently added tags"
-msgstr ""
+msgstr "Nustatyti paskiausiai pridėtų žymų skaičių"
msgid "Remember last used tags after a restart"
+msgstr "Atsiminti paskutines naudotas žymas paleidus iš naujo"
+
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr "<code>Ctrl-1</code> pirmam pasiūlymui pritaikyti"
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr "<code>Shift-Enter</code> pridėjimui neužveriant dialogo lango"
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
msgstr ""
+"<code>Shift-Ctrl-1</code> pirmam pasiūlymui pridėti neužveriant dialogo lango"
msgid "Please enter the number of recently added tags to display"
-msgstr ""
+msgstr "Įveskite skaičių, kiek rodyti paskiausiai įvestų žymų"
msgid "Please enter integer number between 0 and {0}"
-msgstr ""
+msgstr "Prašome įvesti sveiką skaičių nuo 0 iki {0}"
msgid "Recently added tags"
-msgstr ""
+msgstr "Paskiausiai pridėtos žymos"
msgid "Choose recent tag {0}"
-msgstr ""
+msgstr "Parinkite paskiausiai naudotą žymą {0}"
msgid "Use this tag again"
-msgstr ""
+msgstr "Vėl naudoti šią žymą"
msgid "Apply recent tag {0}"
-msgstr ""
+msgstr "Pritaikyti neseniai naudotą žymą {0}"
msgid "The key ''{0}'' is already used"
-msgstr ""
+msgstr "Raktas „{0}“ jau naudojamas"
msgid "You changed the value of ''{0}'' from ''{1}'' to ''{2}''."
-msgstr ""
+msgstr "Jūs pakeitėte „{0}“ reikšmę iš „{1}“ į „{2}“."
msgid "Edit the relation the currently selected relation member refers to."
-msgstr ""
+msgstr "Keisti ryšį, su kuriuo susijęs dabar pažymėtas objektas."
msgid "Download all child relations (recursively)"
-msgstr ""
+msgstr "Atsiųsti visus vaikinius ryšius (rekursyviai)"
msgid "Download All Children"
-msgstr ""
+msgstr "Atsiųsti visus vaikus"
msgid "Download selected relations"
-msgstr ""
+msgstr "Atsiųsti pažymėtus ryšius"
msgid "Download Selected Children"
-msgstr ""
+msgstr "Atsiųsti pažymėtus vaikus"
msgid "Conflict in data"
msgid_plural "Conflicts in data"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Konfliktas duomenyse"
+msgstr[1] "Konfliktai duomenyse"
+msgstr[2] "Konfliktai duomenyse"
msgid "Download relation members"
-msgstr ""
+msgstr "Atsiųsti ryšio narius"
msgid ""
"<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
"loaded</html>"
msgstr ""
+"<html>Vaikinis ryšys<br>{0}<br>ištrintas serveryje. Jo negalima "
+"įkelti.</html>"
msgid "Relation is deleted"
-msgstr ""
+msgstr "Ryšys ištrintas"
msgid "Downloading relation {0}"
-msgstr ""
+msgstr "Atiunčiamas ryšys {0}"
msgid "Ignoring exception because task was canceled. Exception: {0}"
-msgstr ""
+msgstr "Klaida ignoruojama, nes užduotis buvo nutraukta. Klaida: {0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Atiunčiamas {0} nepilnas objektas"
+msgstr[1] "Atsiunčiami {0} nepilni objektai"
+msgstr[2] "Atsiunčiama {0} nepilnų objektų"
msgid "Downloading {0} incomplete child of relation ''{1}''"
msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Atsiunčiamas {0} nepilnas ryšio „{1}“ vaikas"
+msgstr[1] "Atsiunčiami {0} nepilnas ryšio „{1}“ vaikai"
+msgstr[2] "Atsiunčiama {0} nepilnas ryšio „{1}“ vaikų"
msgid "Downloading {0} incomplete child of {1} parent relations"
msgid_plural "Downloading {0} incomplete children of {1} parent relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Atsiunčiamas {0} nepilnas {1} tėvinių ryšių vaikas"
+msgstr[1] "Atsiunčiami {0} nepilni {1} tėvinių ryšių vaikai"
+msgstr[2] "Atsiunčiama {0} nepilnų {1} tėvinių ryšių vaikų"
msgid "Download relations"
-msgstr ""
+msgstr "Atsiųsti ryšius"
msgid "({0}/{1}): Downloading relation ''{2}''..."
-msgstr ""
+msgstr "({0}/{1}): Atsiunčiamas ryšys ''{2}''..."
msgid "Tags and Members"
-msgstr ""
+msgstr "Žymos ir nariai"
msgid "Parent Relations"
-msgstr ""
+msgstr "Tėviniai ryšiai"
msgid "Child Relations"
-msgstr ""
+msgstr "Vaikiniai ryšiai"
msgid "Apply Role:"
msgstr "Pritaikyti rolę:"
msgid "Enter a role and apply it to the selected relation members"
-msgstr ""
+msgstr "Įveskite rolę ir pritaikykite ją pažymėtiems ryšio nariams"
msgid "New Relation"
-msgstr ""
+msgstr "Naujas ryšys"
msgid "Focus Relation Editor with relation ''{0}'' in layer ''{1}''"
-msgstr ""
+msgstr "Fokusuoti ryšių redaktorių su ryšiu „{0}“ sluoksnyje „{1}“"
msgid "Relation Editor: {0}"
-msgstr ""
+msgstr "Ryšių redaktorius: {0}"
msgid ""
"<html>There is at least one member in this relation referring<br>to the "
"relation itself.<br>This creates circular dependencies and is "
"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
msgstr ""
+"<html>Šiame ryšyje yra bent vienas narys, rodantis<br>į patį ryšį.<br>Tai "
+"sukuria ciklines priklausomybes, todėl siūloma to nedaryti.<br>Ką norite "
+"daryti su ciklinėmis priklausomybėmis?</html>"
msgid "Remove them, clean up relation"
-msgstr ""
+msgstr "Išimti jas, išvalyti ryšį"
msgid "Ignore them, leave relation as is"
-msgstr ""
+msgstr "Ignoruoti juos, palikti ryšį tokį, koks jis yra"
msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
msgstr ""
+"Atsiprašome, klavišų kombinacija „{0}“ negali būti įjungta ryšių "
+"redaktoriaus dialoge"
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
"member?</html>"
msgstr ""
+"<html>Šiame ryšyje jau yra vienas ar daugiau narių, rodančių į<br>objektą "
+"„{0}“<br><br>Ar tikrai norite pridėti dar vieną ryšio narį?</html>"
msgid "Multiple members referring to same object."
-msgstr ""
+msgstr "Daugiau nei vienas narys rodo į tą patį objektą."
msgid ""
"<html>You are trying to add a relation to itself.<br><br>This creates "
"circular references and is therefore discouraged.<br>Skipping relation "
"''{0}''.</html>"
msgstr ""
+"<html>Jūs bandote pridėti ryšį į save.<br><br>Tai sukuria ciklinę "
+"priklausomybę ir todėl siūloma taip nedaryti.<br>Praleidžiamas ryšys "
+"„{0}“.</html>"
msgid ""
"Add all objects selected in the current dataset before the first member"
msgstr ""
+"Pridėti visus objektus, pažymėtus dabartinėje duomenų aibėje, prieš pirmą "
+"narį"
msgid ""
"Add all objects selected in the current dataset before the first selected "
"member"
msgstr ""
+"Pridėti visus objektus, pažymėtus dabartinėje duomenų aibėje, prieš pirmą "
+"pažymėtą narį"
msgid ""
"Add all objects selected in the current dataset after the last selected "
"member"
msgstr ""
+"Pridėti visus objektus, pažymėtus dabartinėje duomenų aibėje, po paskutinio "
+"pažymėto nario"
msgid "Remove all members referring to one of the selected objects"
-msgstr ""
+msgstr "Išimti visus narius, rodančius į vieną iš pažymėtų objektų"
msgid ""
"Select relation members which refer to objects in the current selection"
-msgstr ""
+msgstr "Pažymėti ryšių narius, rodančius į dabar pažymėtus objektus"
msgid ""
"Select relation members which refer to {0} objects in the current selection"
-msgstr ""
+msgstr "Pažymėti ryšio narius, kurie rodo į {0} dabar pažymėtus objektus"
msgid "Select objects for selected relation members"
-msgstr ""
+msgstr "Parinktio objektus pažymėtiems ryšio nariams"
msgid "Sort the relation members"
-msgstr ""
+msgstr "Rikiuoti ryšio narius"
msgid "Relation Editor: Sort"
-msgstr ""
+msgstr "Ryšių redaktorius: rikiuoti"
msgid "Reverse the order of the relation members"
-msgstr ""
+msgstr "Atvirkščia ryšio narių tvarka"
msgid "Reverse"
-msgstr ""
+msgstr "Atvirkščiai"
msgid "Move the currently selected members up"
-msgstr ""
+msgstr "Perkelti dabar pažymėtus narius aukštyn"
msgid "Relation Editor: Move Up"
-msgstr ""
+msgstr "Ryšių redaktorius: perkelti aukštyn"
msgid "Move the currently selected members down"
-msgstr ""
+msgstr "Perkelti pažymėtus narius žemyn"
msgid "Relation Editor: Move Down"
-msgstr ""
+msgstr "Ryšių redaktorius: perkelti žemyn"
msgid "Remove the currently selected members from this relation"
-msgstr ""
+msgstr "Išimti dabar pažymėtus narius iš šio ryšio"
msgid "Relation Editor: Remove"
-msgstr ""
+msgstr "Ryšių redaktorius: išimti"
msgid "Delete the currently edited relation"
-msgstr ""
+msgstr "Šalinti dabar redaguojamą ryšį"
msgid ""
"One or more members of this new relation have been deleted while the "
"relation editor\n"
"was open. They have been removed from the relation members list."
msgstr ""
+"Vienas ar daugiau šio naujo ryšio narių buvo pašalinti, kol ryšių rengyklė "
+"buvo atverta.\n"
+"Jie buvo pašalinti iš ryšio narių sąrašo."
msgid "Yes, create a conflict and close"
-msgstr ""
+msgstr "Taip, sukurti konfliktą ir uždaryti"
msgid "Click to create a conflict and close this relation editor"
msgstr ""
+"Spauskite, kad sukurtumėte konfliktą ir uždarytumėte šį ryšių redaktorių"
msgid "No, continue editing"
-msgstr ""
+msgstr "Ne, tęsti keitimą"
msgid "Click to return to the relation editor and to resume relation editing"
msgstr ""
+"Spauskite, kad grįžtumėte į ryšių redaktorių ir tęstumėte ryšio redagavimą"
msgid ""
"<html>This relation has been changed outside of the editor.<br>You cannot "
"apply your changes and continue editing.<br><br>Do you want to create a "
"conflict and close the editor?</html>"
msgstr ""
+"<html>Šis ryšys buvo pakeistas už redaktoriaus ribų.<br>Jūs negalite "
+"pritaikyti savo pakeitimų ir tęsti redagavimo.<br><br>Ar norite sukurti "
+"konfliktą ir uždaryti redaktorių?</html>"
msgid ""
"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please "
"resolve this conflict first, then try again.</html>"
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 "Apply the current updates"
msgstr "Pritaikyti dabartinius atnaujinimus"
@@ -7566,19 +7786,21 @@ msgid "Apply the updates and close the dialog"
msgstr "Pritaikyti atnaujinimus ir užverti dialogą"
msgid "Cancel the updates and close the dialog"
-msgstr ""
+msgstr "Nutraukti atnaujinimus ir uždaryti dialogą"
msgid "Yes, save the changes and close"
msgstr "Taip, išsaugoti pakeitimus ir užverti"
msgid "Click to save the changes and close this relation editor"
msgstr ""
+"Spauskite, kad įrašytumėte pakeitimus ir uždarytumėte ryšių redaktorių"
msgid "No, discard the changes and close"
msgstr "Ne, atmesti pakeitimus ir užverti"
msgid "Click to discard the changes and close this relation editor"
msgstr ""
+"Spauskite, kad išmestumėte pakeitimus ir uždarytumėte ryšių redaktorių"
msgid "Cancel, continue editing"
msgstr "Atsisakyti, tęsti redagavimą"
@@ -7587,41 +7809,43 @@ msgid ""
"<html>The relation has been changed.<br><br>Do you want to save your "
"changes?</html>"
msgstr ""
+"<html>Ryšys buvo pakeistas.<br><br>Ar norite įrašyti savo pakeitimus?</html>"
msgid "Unsaved changes"
msgstr "Neišsaugoti pakeitimai"
msgid "Add an empty tag"
-msgstr ""
+msgstr "Pridėti tuščią žymą"
msgid "Download all incomplete members"
-msgstr ""
+msgstr "Atsiųsti visus nepilnus narius"
msgid "Download Members"
-msgstr ""
+msgstr "Atsiųsti narius"
msgid "Relation Editor: Download Members"
-msgstr ""
+msgstr "Ryšių redaktorius: atsiųsti narius"
msgid "Download selected incomplete members"
-msgstr ""
+msgstr "Atsiųsti pažymėtus nepilnus narius"
msgid "Sets a role for the selected members"
-msgstr ""
+msgstr "Nustato pažymėtų narių rolę"
msgid "Apply Role"
msgstr "Pritaikyti rolę"
msgid "You are setting an empty role on {0} object."
msgid_plural "You are setting an empty role on {0} objects."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Jūs nustatote tuščią rolę {0} objektui."
+msgstr[1] "Jūs nustatote tuščią rolę {0} objektams."
+msgstr[2] "Jūs nustatote tuščią rolę {0} objektų."
msgid "This is equal to deleting the roles of these objects."
-msgstr ""
+msgstr "Tai tolygu šių objektų rolės ištrynimui."
msgid "Do you really want to apply the new role?"
-msgstr ""
+msgstr "Ar tikrai norite pritaikyti naują rolę?"
msgid "Yes, apply it"
msgstr "Taip, pritaikyti"
@@ -7630,176 +7854,183 @@ msgid "No, do not apply"
msgstr "Ne, nepritaikyti"
msgid "Confirm empty role"
-msgstr ""
+msgstr "Patvirtinkite tuščią rolę"
msgid "Edit the relation the currently selected relation member refers to"
-msgstr ""
+msgstr "Redaguoti ryšį, kuriam priklauso dabar pažymėtas ryšio narys"
msgid ""
"Members from paste buffer cannot be added because they are not included in "
"current layer"
msgstr ""
+"Negalima įkelti narių iš įkėlimo buferio, nes jų nėra dabartiniame sluoksnyje"
msgid "Select previous Gap"
-msgstr ""
+msgstr "Parinkti ankstesnį tarpą"
msgid "Select the previous relation member which gives rise to a gap"
-msgstr ""
+msgstr "Parinkti ankstesnį ryšio narį, kuris sukuria tarpą"
msgid "Select next Gap"
-msgstr ""
+msgstr "Parinkti kitą tarpą"
msgid "Select the next relation member which gives rise to a gap"
-msgstr ""
+msgstr "Parinkti kitą ryšio narį, kuris sukuria tarpą"
msgid "Zoom to Gap"
-msgstr ""
+msgstr "Padidinti tarpą"
msgid "Zoom to the gap in the way sequence"
-msgstr ""
+msgstr "Padidinti kelių sekos tarpą"
msgid "Refers to"
msgstr "Nurodo į"
msgid "Download referring relations"
-msgstr ""
+msgstr "Atsiųsti susijusius ryšius"
msgid "There were {0} conflicts during import."
-msgstr ""
+msgstr "Importuojant buvo {0} konfliktų."
msgid "including immediate children of parent relations"
-msgstr ""
+msgstr "įskaitant tiesioginių tėvinių ryšių vaikus"
msgid "Load parent relations"
-msgstr ""
+msgstr "Įkelti tėvinius ryšius"
msgid "Reload"
msgstr "Atnaujinti"
msgid "Loading parent relations"
-msgstr ""
+msgstr "Įkeliami tėviniai ryšiai"
msgid "Edit the currently selected relation"
-msgstr ""
+msgstr "Redaguoti dabar pažymėtą ryšį"
msgid "Apply Changes"
msgstr "Pritaikyti pakeitimus"
msgid "Create new relation in layer ''{0}''"
-msgstr ""
+msgstr "Sukurti naują ryšį sluoksnyje „{0}“"
msgid "Edit new relation in layer ''{0}''"
-msgstr ""
+msgstr "Keisti naują ryšį sluoksnyje „{0}“"
msgid "Edit relation #{0} in layer ''{1}''"
-msgstr ""
+msgstr "Keisti ryšį #{0} sluoksnyje ''{1}''"
msgid "Load relation"
-msgstr ""
+msgstr "Įkelti ryšį"
msgid "way is connected"
-msgstr ""
+msgstr "kelias prijungtas"
msgid "way is connected to previous relation member"
-msgstr ""
+msgstr "kelias prijungtas prie ankstesnio ryšio nario"
msgid "way is connected to next relation member"
-msgstr ""
+msgstr "kelias prijungtas prie kito ryšio nario"
msgid "way is not connected to previous or next relation member"
-msgstr ""
+msgstr "kelias neprijungtas prie ankstesnio ar kito ryšio nario"
msgid "{0} - {1} ({2})"
msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
-msgstr ""
+msgstr "Netinkamas žymelės argumentų skaičius"
msgid "Error reading bookmark entry: %s"
-msgstr ""
+msgstr "Klaida skaitant žymelės įrašą: %s"
msgid "Bookmarks"
msgstr "Žymekliai"
msgid "<html>There is currently no download area selected.</html>"
-msgstr ""
+msgstr "<html>Šiuo metu nepažymėta joks atsiuntimo plotas.</html>"
msgid ""
"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
"maxlat): </html>"
msgstr ""
+"<html><strong>Dabartinis atsiuntimo plotas</strong> (minilg, minplat, "
+"maksilg, maksplat): </html>"
msgid "Create bookmark"
-msgstr ""
+msgstr "Sukurti žymelę"
msgid "Add a bookmark for the currently selected download area"
-msgstr ""
+msgstr "Pridėti žymelę dabar pažymėtam atsiuntimo plotui"
msgid ""
"Currently, there is no download area selected. Please select an area first."
msgstr ""
+"Dabar nepažymėtas joks atsiuntimo plotas. Prašome iš pradžių pažymėti plotą."
msgid "Please enter a name for the bookmarked download area."
-msgstr ""
+msgstr "Prašome įvesti įsiminto atsiuntimo ploto pavadinimą."
msgid "Name of location"
-msgstr ""
+msgstr "Vietovės pavadinimas"
msgid "Remove the currently selected bookmarks"
-msgstr ""
+msgstr "Išimti dabar pažymėtas žymeles"
msgid "Rename the currently selected bookmark"
-msgstr ""
+msgstr "Pervadinti dabar pažymėtą žymelę"
msgid "min lat"
-msgstr ""
+msgstr "min plat"
msgid "min lon"
-msgstr ""
+msgstr "min ilg"
msgid "max lat"
-msgstr ""
+msgstr "maks plat"
msgid "max lon"
-msgstr ""
+msgstr "maks ilg"
msgid "Clear textarea"
-msgstr ""
+msgstr "Valyti teksto plotą"
msgid ""
"URL from www.openstreetmap.org (you can paste an URL here to download the "
"area)"
msgstr ""
+"URL iš www.openstreetmap.org (čia galite įkelti URL, kad atsiųstumėte plotą)"
msgid "Bounding Box"
-msgstr ""
+msgstr "Apimties stačiakampis"
msgid "The string ''{0}'' is not a valid double value."
-msgstr ""
+msgstr "Eilutė „{0}“ nėra tinkama trupmeninio skaičiaus reikšmė."
msgid "Value for latitude in range [-90,90] required."
-msgstr ""
+msgstr "Reikia platumos reikšmės intervale [-90,90]"
msgid "Value for longitude in range [-180,180] required."
-msgstr ""
+msgstr "Reikia ilgumos reikšmės intervale [-180,180]"
msgid "Data Sources and Types:"
-msgstr ""
+msgstr "Duomenų šaltiniai ir tipai:"
msgid "OpenStreetMap data"
msgstr "OpenStreetMap duomenys"
msgid "Select to download OSM data in the selected download area."
msgstr ""
+"Pažymėkite, kad atsiųstumėte OSM duomenis parinktame atsiuntimo plote."
msgid "Raw GPS data"
msgstr "Nauji GPS duomenys"
msgid "Select to download GPS traces in the selected download area."
msgstr ""
+"Pažymėkite, kad atsiųstumėte GPS pėdsakus parinktame atsiuntimo plote."
msgid "Select to download notes in the selected download area."
-msgstr ""
+msgstr "Pažymėkite, kad atsiųstumėte pastabas parinktame atsiuntimo plote."
msgid "Download as new layer"
msgstr "Atsiųsti kaip naują sluoksnį"
@@ -7808,49 +8039,61 @@ msgid ""
"<html>Select to download data into a new data layer.<br>Unselect to download "
"into the currently active data layer.</html>"
msgstr ""
+"<html>Parinkite, kad atsiųstumėte duomenis į naują duomenų "
+"sluoksnį.<br>Nužymėkite, kad atsiųstumėte į dabar aktyvų duomenų "
+"sluoksnį.</html>"
msgid "Open this dialog on startup"
-msgstr ""
+msgstr "Atverti šį dialogą paleidus"
msgid ""
"<html>Autostart ''Download from OSM'' dialog every time JOSM is "
"started.<br>You can open it manually from File menu or toolbar.</html>"
msgstr ""
+"<html>Automatiškai paleisti „Atsiųsti iš OSM“ dialogą kiekvieną kartą "
+"paleidus JOSM.<br>Jūs galite jį atverti patys iš Failo meniu arba "
+"įrankinės.</html>"
msgid ""
"Use left click&drag to select area, arrows or right mouse button to scroll "
"map, wheel or +/- to zoom."
msgstr ""
+"Naudokite kairį paspaudimą ir tempimą, kad pažymėtumėte plotą, rodykles ar "
+"dešinį pelės mygtuką, kad pastumtumėte žemėlapį, ratuką ar +/- mastelio "
+"keitimui."
msgid "No area selected yet"
-msgstr ""
+msgstr "Dar nepažymėtas joks plotas"
msgid "Download area too large; will probably be rejected by server"
-msgstr ""
+msgstr "Atsiuntimo plotas per didelis, serveris jo tikriausiai nepriims"
msgid "Download area ok, size probably acceptable to server"
-msgstr ""
+msgstr "Atsiuntimo plotas tinkamas, dydis tikriausiai tinkamas serveriui"
msgid "Click to close the dialog and to abort downloading"
-msgstr ""
+msgstr "Spauskite, kad užvertumėte dialogą ir nutrauktumėte atsiuntimą"
msgid "Click to download the currently selected area"
-msgstr ""
+msgstr "Spauskite, kad atsiųstumėte dabar pažymėtą plotą"
msgid "Please select a download area first."
-msgstr ""
+msgstr "Prašome iš pradžių pažymėti atsiunčiamą plotą."
msgid ""
"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> nor "
"<strong>{2}</strong> is enabled.<br>Please choose to either download OSM "
"data, or GPX data, or Notes, or all.</html>"
msgstr ""
+"<html>Nei <strong>{0}</strong>, nei <strong>{1}</strong>, nei "
+"<strong>{2}</strong> neįjungta.<br>Prašome pasirinkti nors vieną, kad "
+"atsiųstumėte OSM duomenis, GPS duomenis, pastabas arba viską.</html>"
msgid "Download referrers (parent relations)"
-msgstr ""
+msgstr "Atsiųsti turinčius nuorodas (tėvinius ryšius)"
msgid "Download object"
-msgstr "Parsiūsti objektai"
+msgstr "Parsiųsti objektą"
msgid "Start downloading"
msgstr "Pradėti parsiuntimą"
@@ -7859,33 +8102,35 @@ msgid ""
"Select if the referrers of the object should be downloaded as well, "
"i.e.,parent relations and for nodes, additionally, parent ways"
msgstr ""
+"Pažymėkite, jei norite atsiųsti ir objektus naudojančius ryšius, t.y. "
+"tėvinius ryšius, o taškams, papildomai, ir tėvinius kelius"
msgid "Select if the members of a relation should be downloaded as well"
-msgstr ""
+msgstr "Pažymėkite, jei taipogi reikia atsiųsti ir ryšių narius"
msgid "Download referrers (parent relations and ways)"
-msgstr ""
+msgstr "Atsiųsti priklausomus (tėvinius ryšius ir kelius)"
msgid "Class Type"
msgstr "Klasės tipas"
msgid "Bounds"
-msgstr ""
+msgstr "Apimtis"
msgid "Choose the server for searching:"
-msgstr ""
+msgstr "Parinkite paieškos serverį:"
msgid "Enter a place name to search for:"
-msgstr ""
+msgstr "Įveskite vietovės pavadinimą paieškai:"
msgid "Enter a place name to search for"
-msgstr ""
+msgstr "Įveskite vietovės pavadinimą paieškai"
msgid "Areas around places"
-msgstr ""
+msgstr "Plotai apie vietoves"
msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
+msgstr "Tuščios nuorodos reikšmė, tikriausiai trūkstamos žymos."
msgid "Search ..."
msgstr "Ieškoti ..."
@@ -7894,34 +8139,35 @@ msgid "Click to start searching for places"
msgstr "Paspauskite pradėti vietų paiešką"
msgid "Querying name server"
-msgstr ""
+msgstr "Užklausiama pavadinimų serveryje"
msgid "Querying name server ..."
-msgstr ""
+msgstr "Užklausiamas vardų serveris..."
msgid "Error occured with query ''{0}'': ''{1}''"
-msgstr ""
+msgstr "Klaida su užklausa „{0}“: „{1}“"
msgid "Name server returned invalid data. Please try again."
msgstr ""
+"Vardų serveris grąžino netinkamus duomenis. Prašome bandyti dar kartą."
msgid "Bad response"
-msgstr ""
+msgstr "Netinkamas atsakas"
msgid "Type"
msgstr "Tipas"
msgid "Slippy map"
-msgstr ""
+msgstr "Stumdomas žemėlapis"
msgid "Tile Numbers"
-msgstr ""
+msgstr "Kaladėlių numeriai"
msgid "JOSM Help Browser"
-msgstr "JSOM Pagalbos Naršyklė"
+msgstr "JOSM pagalbos naršyklė"
msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
+msgstr "Nepavyko perskaityti CSS failo „help-browser.css“. Klaida: {0}"
msgid ""
"<html><p class=\"warning-header\">Help content for help topic missing</p><p "
@@ -7932,6 +8178,12 @@ msgid ""
"your local language ({1})</a> and the <a href=\"{3}\">help topic in "
"English</a>.</p></html>"
msgstr ""
+"<html><p class=\"warning-header\">Nėra pagalbos turinio pagalbos temai</p><p "
+"class=\"warning-body\">Pagalbos turinys pagalbos temai <strong>{0}</strong> "
+"dar nesukurtas. Jo nėra nei jūsų kalba ({1}), nei angliškai.<br><br>Prašome "
+"padėti tobulinti JOSM pagalbos sistemą ir užpildyti trūkstamą informaciją. "
+"Jūs galite redaguoti <a href=\"{2}\">pagalbos temą jūsų vietine kalba "
+"({1})</a> ir <a href=\"{3}\">anglišką pagalbos temos versiją</a>.</p></html>"
msgid ""
"<html><p class=\"error-header\">Error when retrieving help information</p><p "
@@ -7939,28 +8191,35 @@ msgid ""
"could not be loaded. The error message is "
"(untranslated):<br><tt>{1}</tt></p></html>"
msgstr ""
+"<html><p class=\"error-header\">Klaida gaunant pagalbos informaciją</p><p "
+"class=\"error-body\">Nepavyko įkelti pagalbos temos <strong>{0}</strong> "
+"informacijos. Klaidos pranešimas (neverstas):<br><tt>{1}</tt></p></html>"
msgid ""
"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
"network problem, please check<br>your internet connection</html>"
msgstr ""
+"<html>Nepavyko atverti pagalbos puslapio url {0}.<br>Tikriausiai yra tinklo "
+"problemų, prašome patikrinti<br>jūsų interneto jungtį</html>"
msgid "Failed to open URL"
-msgstr ""
+msgstr "Nepavyko atverti URL"
msgid "Open the current help page in an external browser"
-msgstr ""
+msgstr "Atverti dabartinį pagalbus puslapį išorinėje naršyklėje"
msgid "Edit the current help page"
-msgstr ""
+msgstr "Keisti dabartinį pagalbos puslapį"
msgid ""
"<html>The current URL <tt>{0}</tt><br>is an external URL. Editing is only "
"possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
msgstr ""
+"<html>Dabartinis URL <tt>{0}</tt><br>yra išorinis URL. Keisti galima tik "
+"pagalbos įrašus<br>pagalbos serveryje <tt>{1}</tt>.</html>"
msgid "Reload the current help page"
-msgstr ""
+msgstr "Iš naujo įkelti dabartinį pagalbos puslapį"
msgid "Go to the previous page"
msgstr "Eiti į ankstesnį puslapį"
@@ -7969,13 +8228,13 @@ msgid "Go to the next page"
msgstr "Eiti į kitą puslapį"
msgid "Go to the JOSM help home page"
-msgstr ""
+msgstr "Eiti į JOSM pagalbos namų puslapį"
msgid "Bad location in HTML document. Exception was: {0}"
-msgstr ""
+msgstr "Netinkama vieta HTML dokumente. Klaida: {0}"
msgid "Failed to open help page. The target URL is empty."
-msgstr ""
+msgstr "Nepavyko atverti pagalbos puslapio. Paskirties URL yra tuščias."
msgid "Failed to open help page"
msgstr "Nepavyko atverti pagalbos puslapio"
@@ -7993,35 +8252,41 @@ msgid "Coordinates"
msgstr "Koordinatės"
msgid "History for node {0}"
-msgstr "Istorija taško {0}"
+msgstr "Taško {0} istorija"
msgid "History for way {0}"
-msgstr "Istorijo kelio {0}"
+msgstr "Kelio {0} istorija"
msgid "History for relation {0}"
-msgstr "Istorija ryšio {0}"
+msgstr "Ryšio {0} istorija"
msgid "Reload the history from the server"
-msgstr "Perkrauti istorija iš serverio"
+msgstr "Atsiųsti iš naujo istoriją iš serverio"
msgid "History not initialized yet. Failed to set reference primitive."
msgstr ""
+"Istorija dar neinicializuota. Nepavyko nustatyti atskaitos primityvo."
msgid ""
"Failed to set reference. Reference ID {0} does not match history ID {1}."
msgstr ""
+"Nepavyko nustatyti atskaitos. Atskaitos ID {0} neatitinka istorijos ID {1}."
msgid ""
"Failed to set reference. Reference version {0} not available in history."
msgstr ""
+"Nepavyko nustatyti atskaitos. Atskaitos versijos {0} nėra istorijoje."
msgid "History not initialized yet. Failed to set current primitive."
msgstr ""
+"Istorija dar neinicializuota. Nepavyko nustatyti dabartinio primityvo."
msgid ""
"Failed to set current primitive. Current version {0} not available in "
"history."
msgstr ""
+"Nepavyko nustatyti dabartinio primityvo. Dabartinės versijos {0} nėra "
+"istorijoje."
msgid "Load history"
msgstr "Įkeliama istorija"
@@ -8039,13 +8304,13 @@ msgid "Node {0}"
msgstr "Taškas {0}"
msgid "Zoom to node"
-msgstr ""
+msgstr "Padidinti tašką"
msgid "Zoom to this node in the current data layer"
-msgstr ""
+msgstr "Padidinti tašką dabartiniame duomenų sluoksnyje"
msgid "Open a history browser with the history of this node"
-msgstr ""
+msgstr "Atverti istorijos naršyklę su šio taško istorija"
msgid "Way {0}"
msgstr "Kelias {0}"
@@ -8059,18 +8324,21 @@ msgstr "Objektas"
msgid "not present"
msgstr "nėra"
-msgid "Changeset:"
-msgstr "Pakeitimas:"
-
msgid "Changeset comment"
-msgstr ""
+msgstr "Pakeitimo komentaras"
msgid "Changeset source"
-msgstr ""
+msgstr "Pakeitimo šaltinis"
+
+msgid "Imagery used"
+msgstr "Naudota ortofoto"
msgid "<b>Source</b>:"
msgstr "<b>Šaltinis</b>:"
+msgid "<b>Imagery</b>:"
+msgstr "<b>Ortofoto</b>:"
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8081,20 +8349,23 @@ msgid ""
msgstr ""
"<html>Versija <strong>{0}</strong> sukurta <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr "Pakeitimas"
+
msgid "Changeset info"
-msgstr ""
+msgstr "Pakeitimo informacija"
msgid "Launch browser with information about the changeset"
-msgstr ""
+msgstr "Paleisti naršyklę su pakeitimo informacija"
msgid "Show changeset {0}"
-msgstr ""
+msgstr "Rodyti pakeitimą {0}"
msgid "User info"
msgstr "Informacija apie naudotoją"
msgid "Launch browser with information about the user"
-msgstr ""
+msgstr "Paleisti naršyklę su naudotojo informacija"
msgid "Show user {0}"
msgstr "Rodyti naudotoją {0}"
@@ -8111,23 +8382,27 @@ msgstr "B"
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
+"Nepavyko atnaujinti primityvo su id {0}, nes dabartinis redagavimo sluoksnis "
+"yra tuščias"
msgid ""
"Failed to update primitive with id {0} because current edit layer does not "
"include such a primitive"
msgstr ""
+"Nepavyko atnaujinti primityvo su id {0}, nes dabartiniame redagavimo "
+"sluoksnyje nėra tokio primityvo"
msgid "Synchronize node {0} only"
-msgstr ""
+msgstr "Sinchronizuoti tik tašką {0}"
msgid "Synchronize way {0} only"
-msgstr ""
+msgstr "Sinchronizuoti tik kelią {0}"
msgid "Synchronize relation {0} only"
-msgstr ""
+msgstr "Sinchronizuoti tik ryšį {0}"
msgid "Synchronize entire dataset"
-msgstr ""
+msgstr "Sinchronizuoti visą duomenų rinkinį"
msgid ""
"<html>Uploading <strong>failed</strong> because the server has a newer "
@@ -8139,6 +8414,14 @@ msgid ""
"server.<br>Click <strong>{6}</strong> to abort and continue "
"editing.<br></html>"
msgstr ""
+"<html>Įkėlimas <strong>nepavyko</strong>, nes serveryje yra naujesnė vieno "
+"<br>iš jūsų taškų, kelių ar ryšių versija.<br>Konflikto priežastis yra "
+"<strong>{0}</strong> su id <strong>{1}</strong>,<br>serveryje yra versija "
+"{2}, o pas jus - {3}.<br><br>Spauskite <strong>{4}</strong>, kad "
+"sinchronizuotumėte tik konflikto primityvą.<br>Spauskite "
+"<strong>{5}</strong>, kad sinchronizuotumėte visą vietinį duomenų rinkinį su "
+"serveriu.<br>Spauskite <strong>{6}</strong>, kad nutrauktumėte ir tęstumėte "
+"redagavimą.<br></html>"
msgid ""
"<html>Uploading <strong>failed</strong> because the server has a newer "
@@ -8147,35 +8430,46 @@ msgid ""
"server.<br>Click <strong>{1}</strong> to abort and continue "
"editing.<br></html>"
msgstr ""
+"<html>Įkėlimas <strong>nepavyko</strong>, nes serveryje yra naujesnė vieno "
+"iš jūsų<br>taškių, kelių ar ryšių versija.<br><br>Spauskite "
+"<strong>{0}</strong>, kad sinchronizuotumėte visą vietinį duomenų rinkinį su "
+"serveriu.<br>Spauskite <strong>{1}</strong>, kad nutrauktumėte ir tęstumėte "
+"redagavimą.<br></html>"
msgid ""
"<html>Uploading <strong>failed</strong> because you have been "
"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
"again with a new or an existing open changeset.</html>"
msgstr ""
+"<html>Išsiuntimas <strong>nepavyko</strong>, nes naudojote<br>pakeitimą {0}, "
+"kuris jau buvo užvertas {1}.<br>Išsiųskite iš naujo su nauju arba esamu "
+"atviru pakeitimu.</html>"
msgid "Changeset closed"
msgstr "Pakeitimas užvertas"
msgid "Prepare conflict resolution"
-msgstr ""
+msgstr "Paruošti konflikto sprendimą"
msgid "Click to download all referring objects for {0}"
-msgstr ""
+msgstr "Spauskite, kad atiųstumėte visus susijusius su {0} objektus"
msgid "Click to cancel and to resume editing the map"
-msgstr ""
+msgstr "Spauskite, kad nutrauktumėte ir tęstumėte žemėlapio redagavimą"
msgid ""
"Click <strong>{0}</strong> to load them now.<br>If necessary JOSM will "
"create conflicts which you can resolve in the Conflict Resolution Dialog."
msgstr ""
+"Spauskite <strong>{0}</strong>, kad įkeltumėte juos dabar.<br>Jei reikia, "
+"JOSM sukurs konfliktus, kuriuos jūs tada galėsite išspręsti Konfliktų "
+"sprendimo dialoge."
msgid "Object still in use"
msgstr "Objektas vis dar naudojamas"
msgid "Error header \"{0}\" did not match with an expected pattern"
-msgstr ""
+msgstr "Klaidos antraštė„{0}“ neatitiko klaidos šablono"
msgid "Upload"
msgstr "Išsiuntimas"
@@ -8186,18 +8480,22 @@ msgid ""
"server.<br/>Check \"Save\" to save the layer to the file specified on the "
"left.</html>"
msgstr ""
+"<html>Parinkite veiksmus, kuriuos reikia atlikti šiam sluoksniui, jei "
+"paspausite kairiausiąjį mygtuką.<br/>Įjunkite „įkelti“, kad nusiųstumėte "
+"pakeitimus į OSM serverį.<br/>Įjunkite „Įrašyti“, kad įrašytumėte sluoksnį į "
+"failą, nurodytą kairėję.</html>"
msgid "Provide a brief comment for the changes you are uploading:"
msgstr "Trumpas aprašymas jūsų išsiunčiamiems pakeitimams:"
msgid "Enter an upload comment"
-msgstr ""
+msgstr "Įveskite įkėlimo komentarą"
msgid "Specify the data source for the changes"
-msgstr ""
+msgstr "Nurodykite pakeitimų duomenų šaltinį"
msgid "obtain from current layers"
-msgstr ""
+msgstr "gauti iš dabartinių sluoksnių"
msgid "Enter a source"
msgstr "Įveskite šaltinį"
@@ -8209,76 +8507,80 @@ msgid "Created at:"
msgstr "Sukurta:"
msgid "Changeset comment:"
-msgstr ""
+msgstr "Pakeitimo komentaras:"
msgid "No open changeset"
-msgstr ""
+msgstr "Nėra atvirų pakeitimų"
msgid ""
"Please decide what changeset the data is uploaded to and whether to close "
"the changeset after the next upload."
msgstr ""
+"Nuspręskite, į kurį pakeitimą išsiunčiami duomenys, ir ar užverti pakeitimą "
+"po kito išsiuntimo."
msgid "Upload to a new changeset"
-msgstr ""
+msgstr "Išsiųsti į naują pakeitimą"
msgid "Open a new changeset and use it in the next upload"
-msgstr ""
+msgstr "Atverti naują pakeitimą ir jį naudoti kito išsiuntimo metu"
msgid "Upload to an existing changeset"
-msgstr ""
+msgstr "Išsiųsti į esamą pakeitimą"
msgid "Upload data to an already existing and open changeset"
-msgstr ""
+msgstr "Išsiųsti duomenis į jau esamą ir atvertą pakeitimą"
msgid "Select an open changeset"
-msgstr ""
+msgstr "Pažymėkite atvirą pakeitimą"
msgid "Close changeset after upload"
-msgstr ""
+msgstr "Užverti pakeitimą po išsiuntimo"
msgid "Select to close the changeset after the next upload"
-msgstr ""
+msgstr "Pažymėkite pakeitimo užvėrimui po kito išsiuntimo"
msgid "Load the list of your open changesets from the server"
-msgstr ""
+msgstr "Įkelti jūsų atvirų pakeitimų sąrašą iš serverio"
msgid "Close the currently selected open changeset"
-msgstr ""
+msgstr "Užverti dabar pažymėtą atvirą pakeitimą"
msgid "<html>Please select the changesets you want to close</html>"
-msgstr ""
+msgstr "<html>Prašome pažymėti pakeitimus, kuriuos norite užverti</html>"
msgid "Open changesets"
-msgstr "Atverti pakeitimus"
+msgstr "Atviri pakeitimai"
msgid "Close changesets"
msgstr "Užverti pakeitimus"
msgid "Close the selected open changesets"
-msgstr ""
+msgstr "Užverti pažymėtus atvirus pakeitimus"
msgid "Cancel closing of changesets"
-msgstr ""
+msgstr "Nutraukti pakeitimų užvėrimą"
msgid "Closing changeset"
-msgstr ""
+msgstr "Užveriamas pakeitimas"
msgid "Closing changeset {0}"
-msgstr ""
+msgstr "Užveriamas pakeitimas {0}"
msgid ""
"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
+"Nepavyko prisijungimo duomenų dialogo laikyti visada viršuje. Įvyko saugumo "
+"klaida."
msgid "Enter credentials for OSM API"
-msgstr ""
+msgstr "Įveskite prisijungimo prie OSM API duomenis"
msgid "Enter credentials for host"
-msgstr ""
+msgstr "Įveskite prisijungimo prie stoties duomenis"
msgid "Enter credentials for HTTP proxy"
-msgstr ""
+msgstr "Įveskite HTTP šliuzo prisijungimo duomenis"
msgid "Password"
msgstr "Slaptažodis"
@@ -8287,15 +8589,17 @@ msgid "Warning: The password is transferred unencrypted."
msgstr "Įspėjimas: Slaptažodis siunčiamas nešifruotas."
msgid "Please enter the user name of your OSM account"
-msgstr ""
+msgstr "Prašome įvesti jūsų OSM paskyros naudotojo vardą"
msgid "Please enter the password of your OSM account"
-msgstr ""
+msgstr "Prašome įvesti jūsų OSM paskyros slaptažodį"
msgid ""
"Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
"and a valid password."
msgstr ""
+"OSM API „{0}“ autentikacija nepavyko. Prašome įvesti tinkamą naudotojo vardą "
+"ir slaptažodį."
msgid "Please enter the user name of your account"
msgstr "Įveskite savo paskyros vardą"
@@ -8307,31 +8611,37 @@ msgid ""
"Authenticating at the host ''{0}'' failed. Please enter a valid username and "
"a valid password."
msgstr ""
+"Stoties „{0}“ autentikacija nepavyko. Prašome įvesti tinkamą naudotojo vardą "
+"ir slaptažodį."
msgid "Please enter the user name for authenticating at your proxy server"
-msgstr ""
+msgstr "Prašome įvesti naudotojo vardą autentikacijai su jūsų šliuzo stotimi"
msgid "Please enter the password for authenticating at your proxy server"
-msgstr ""
+msgstr "Prašome įvesti slaptažodį autentikacijai su jūsų šliuzo stotimi"
msgid ""
"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
"username and a valid password."
msgstr ""
+"HTTP šliuzo „{0}“ autentikacija nepavyko. Prašome įvesti tinkamą naudotojo "
+"vardą ir slaptažodį."
msgid ""
"Warning: depending on the authentication method the proxy server uses the "
"password may be transferred unencrypted."
msgstr ""
+"Įspėjimas: priklausomai nuo autentikacijos metodo, šliuzo stoties naudojamas "
+"slaptažodis gali būti perduodamas atviru tekstu."
msgid "Authenticate"
msgstr "Patvirtinti tapatybę"
msgid "Authenticate with the supplied username and password"
-msgstr ""
+msgstr "Autentikuotis su nurodytu vardu ir slaptažodžiu"
msgid "Cancel authentication"
-msgstr ""
+msgstr "Nutraukti autentikacija"
msgid "Downloading file"
msgstr "Atsiunčiamas failas"
@@ -8349,6 +8659,8 @@ msgid ""
"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
"Skipping download."
msgstr ""
+"Nepavyko atsiųsti failo „{0}“. Jo atsiuntimo nuoroda „{1}“ yra netinkamas "
+"URL. Atsiuntimas praleidžiamas."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8356,65 +8668,76 @@ msgid ""
"not entitled<br>to know the identity of the user on whose behalf you are "
"working."
msgstr ""
+"Nepavyko gauti jūsų atvirų pakeitimų sąrašo, nes<br>JOSM nežino jūsų "
+"identiteto.<br>Arba pasirinkote dirbti anonimiškai, arba jums "
+"neleidžiama<br>sužinoti naudotojo, kurio vardu jūs dirbate, vardo."
msgid "Missing user identity"
-msgstr ""
+msgstr "Trūksta naudotojo identiteto"
msgid ""
"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
-msgstr ""
+msgstr "Nepavyko gauti dabartinio JOSM naudotojo informacijos. Klaida: {0}"
msgid "Download objects"
msgstr "Atsiųsti objektus"
msgid "Initializing nodes to download ..."
-msgstr ""
+msgstr "Inicializuojami taškai atsiuntimui..."
msgid "Object could not be downloaded"
msgid_plural "Some objects could not be downloaded"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Nepavyko atsiųsti objekto"
+msgstr[1] "Nepavyko atsiųsti objektų"
+msgstr[2] "Nepavyko atsiųsti objektų"
msgid "One object could not be downloaded.<br>"
msgid_plural "{0} objects could not be downloaded.<br>"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Nepavyko atsiųsti vieno objekto.<br>"
+msgstr[1] "Nepavyko atsiųsti {0} objektų.<br>"
+msgstr[2] "Nepavyko atsiųsti {0} objektų.<br>"
msgid ""
"The server replied with response code 404.<br>This usually means, the server "
"does not know an object with the requested id."
msgstr ""
+"Stotis atsakė kodu 404.<br>Paprastai tai reiškia, kad stotis nežino objekto "
+"su nurodytu id."
msgid "missing objects:"
-msgstr "trūkstami objktai:"
+msgstr "trūkstami objektai:"
msgid "One downloaded object is deleted."
msgid_plural "{0} downloaded objects are deleted."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vienas atsiųstas objektas yra pašalintas."
+msgstr[1] "{0} atsiųsti objektai yra pašalinti."
+msgstr[2] "{0} atsiųstų objektų yra pašalinti."
msgid ""
"Either edit the path manually in the text field or click the \"...\" button "
"to open a file chooser."
msgstr ""
+"Arba keiskite kelią rankomis tekstiniame lauke, arba spauskite „...“ "
+"mygtuką, kad atvertumėte failo pasirinkimo dialogą."
msgid "The bold text is the name of the layer."
-msgstr ""
+msgstr "Riebus tekstas yra sluoksnio pavadinimas."
msgid "Click here to choose save path"
-msgstr ""
+msgstr "Spauskite čia saugojimo keliui parinkti"
msgid "Layer ''{0}'' is not backed by a file"
-msgstr ""
+msgstr "Sluoksnis „{0}“ nėra susijęs su failu"
msgid "File ''{0}'' is not writable. Please enter another file name."
msgstr ""
+"Negalima rašyti į failą „{0}“. Prašome įrašyti kitą failo pavadinimą."
msgid "Click cell to change the file path."
-msgstr ""
+msgstr "Spauskite langelį, kad pakeistumėte kelią iki failo."
msgid "Launch a file chooser to select a file"
-msgstr ""
+msgstr "Paleisti failų parinkimo dialogą failo parinkimui"
msgid "Select filename"
msgstr "Pasirinkite failą"
@@ -8423,7 +8746,7 @@ msgid "Open Recent"
msgstr "Atverti neseniai naudotą"
msgid "List of recently opened files"
-msgstr ""
+msgstr "Paskiausiai atvertų failų sąrašas"
msgid "Clear"
msgstr "Valyti"
@@ -8435,13 +8758,13 @@ msgid "Saving layer to ''{0}'' ..."
msgstr "Saugomas sluoksnis į „{0}“ ..."
msgid "Unsaved changes - Save/Upload before exiting?"
-msgstr ""
+msgstr "Neįrašyti pakeitimai - Įrašyti/Įkelti prieš išeinant?"
msgid "Unsaved changes - Save/Upload before deleting?"
-msgstr ""
+msgstr "Neįrašyti pakeitimai - Įrašyti/Įkelti prieš ištrinant?"
msgid "Uploading and saving modified layers ..."
-msgstr ""
+msgstr "Įkeliami ir įrašomi pakeisti sluoksniai..."
msgid ""
"<html>{0} layer has unresolved conflicts.<br>Either resolve them first or "
@@ -8450,10 +8773,17 @@ msgid_plural ""
"<html>{0} layers have unresolved conflicts.<br>Either resolve them first or "
"discard the modifications.<br>Layers with conflicts:</html>"
msgstr[0] ""
+"<html>{0} sluoksnis turi neišspręstų konfliktų.<br>Arba išspręskite juos "
+"arba atmeskite pakeitimus.<br>Sluoksnis su konfliktais:</html>"
msgstr[1] ""
+"<html>{0} sluoksniai turi neišspręstų konfliktų.<br>Arba išspręskite juos "
+"arba atmeskite pakeitimus.<br>Sluoksniai su konfliktais:</html>"
+msgstr[2] ""
+"<html>{0} sluoksnių turi neišspręstų konfliktų.<br>Arba išspręskite juos "
+"arba atmeskite pakeitimus.<br>Sluoksniai su konfliktais:</html>"
msgid "Unsaved data and conflicts"
-msgstr ""
+msgstr "Neįrašyti duomenys ir konfliktai"
msgid ""
"<html>{0} layer needs saving but has no associated file.<br>Either select a "
@@ -8463,10 +8793,20 @@ msgid_plural ""
"file for each of them or discard the changes.<br>Layers without a "
"file:</html>"
msgstr[0] ""
+"<html>Reikia įrašyti {0} sluoksnį, bet nėra susijusio failo.<br>Arba "
+"parinkite failą šiam sluoksniui, arba atšaukite pakeitimus.<br>Sluoksnis be "
+"failo:</html>"
msgstr[1] ""
+"<html>Reikia įrašyti {0} sluoksnius, bet nėra susijusių failų.<br>Arba "
+"parinkite failus šiems sluoksniams, arba atšaukite pakeitimus.<br>Sluoksniai "
+"be failų:</html>"
+msgstr[2] ""
+"<html>Reikia įrašyti {0} sluoksnių, bet nėra susijusių failų.<br>Arba "
+"parinkite failus šiems sluoksniams, arba atšaukite pakeitimus.<br>Sluoksniai "
+"be failų:</html>"
msgid "Unsaved data and missing associated file"
-msgstr ""
+msgstr "Neįrašyti duomenys ir trūkstami susiję failai"
msgid ""
"<html>{0} layer needs saving but has an associated file<br>which cannot be "
@@ -8477,37 +8817,51 @@ msgid_plural ""
"written.<br>Either select another file for each of them or discard the "
"changes.<br>Layers with non-writable files:</html>"
msgstr[0] ""
+"<html>{0} sluoksnį reikia įrašyti, bet su juo susijęs failas,<br>į kurį "
+"negalima rašyti.<br>Arba parinkite kitą failą šiam sluoksniui, arba "
+"išmeskite pakeitimus.<br>Sluoksnis su neįrašomu failu:</html>"
msgstr[1] ""
+"<html>{0} sluoksnius reikia įrašyti, bet su jais susiję failai,<br>į kurių "
+"negalima rašyti.<br>Arba parinkite kitus failus šiems sluoksniams, arba "
+"išmeskite pakeitimus.<br>Sluoksniai su neįrašomais failais:</html>"
+msgstr[2] ""
+"<html>{0} sluoksnių reikia įrašyti, bet su jais susiję failai,<br>į kurių "
+"negalima rašyti.<br>Arba parinkite kitus failus šiems sluoksniams, arba "
+"išmeskite pakeitimus.<br>Sluoksniai su neįrašomais failais:</html>"
msgid "Unsaved data non-writable files"
-msgstr ""
+msgstr "Neįrašyti duomenys neįrašomi failai"
msgid "Close this dialog and resume editing in JOSM"
-msgstr ""
+msgstr "Uždaryti šį dialogą ir tęsti redagavimą JOSM"
msgid "Exit now!"
msgstr "Išeiti dabar!"
msgid "Exit JOSM without saving. Unsaved changes are lost."
msgstr ""
+"Išeiti iš JOSM neįrašius pakeitimų. Neįrašyti pakeitimai bus prarasti."
msgid "Delete now!"
msgstr "Šalinti dabar!"
msgid "Delete layers without saving. Unsaved changes are lost."
-msgstr ""
+msgstr "Pašalinti sluoksnius neįrašant. Neįrašyti pakeitimai bus prarasti."
msgid "Perform actions before exiting"
msgstr "Atlikti veiksmų prieš išeinant"
msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
msgstr ""
+"Išeiti iš JOSM įrašant. Neįrašyti pakeitimai įkeliami ir/arba įrašomi."
msgid "Perform actions before deleting"
msgstr "Atlikti veiksmų prieš šalinant"
msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
msgstr ""
+"Įrašyti/įkelti sluoksnius prieš ištrinant. Neįrašyti pakeitimai nebus "
+"prarasti."
msgid "Preparing layer ''{0}'' for upload ..."
msgstr "Ruošiamas sluoksnis „{0}“ išsiuntimui ..."
@@ -8519,85 +8873,94 @@ msgid_plural ""
"<html>Upload and/or save operations of {0} layers with modifications<br>were "
"canceled or have failed.</html>"
msgstr[0] ""
+"<html>Vieno sluoksnio su pakeitimais įkėlimo ir/arba įrašymo "
+"operacija<br>buvo nutraukta arba nepavyko.</html>"
msgstr[1] ""
+"<html>{0} sluoksnių su pakeitimais įkėlimo ir/arba įrašymo operacija<br>buvo "
+"nutraukta arba nepavyko.</html>"
+msgstr[2] ""
+"<html>{0} sluoksnių su pakeitimais įkėlimo ir/arba įrašymo operacija<br>buvo "
+"nutraukta arba nepavyko.</html>"
msgid "Incomplete upload and/or save"
-msgstr ""
+msgstr "Nepilnas įkėlimas ir/arba įrašymas"
msgid "should be uploaded"
-msgstr ""
+msgstr "reikia įkelti"
msgid "should be saved"
-msgstr ""
+msgstr "reikia įrašyti"
msgid ""
"Layer ''{0}'' has modifications which should be uploaded to the server."
-msgstr ""
+msgstr "Sluoksnyje „{0}“ yra pakeitimų, kuriuos reikia įkelti į serverį."
msgid "Layer ''{0}'' has modifications which are discouraged to be uploaded."
-msgstr ""
+msgstr "Sluoksnyje „{0}“ yra pakeitimų, kurių siūlome nekelti."
msgid "Layer ''{0}'' has no modifications to be uploaded."
-msgstr ""
+msgstr "Sluoksnyje „{0}“ nėra pakeitimų, kuriuos reikėtų įkelti."
msgid ""
"Layer ''{0}'' has modifications which should be saved to its associated file "
"''{1}''."
msgstr ""
+"Sluoksnyje „{0}“ yra pakeitimų, kuriuos reikia įrašyti į susijusį failą "
+"„{1}“."
msgid "Layer ''{0}'' has no modifications to be saved."
-msgstr ""
+msgstr "Sluoksnyje „{0}“ nėra pakeitimų, kuriuos reikėtų įrašyti."
msgid "Layer Name and File Path"
-msgstr ""
+msgstr "Sluoksnio pavadinimas ir kelias iki failo"
msgid "Recommended Actions"
msgstr "Rekomenduojami veiksmai"
msgid "Actions To Take"
-msgstr ""
+msgstr "Vykdyti veiksmus"
msgid "Update objects"
msgstr "Atnaujinti objektus"
msgid "Initializing nodes to update ..."
-msgstr ""
+msgstr "Inicializuojami taškai atnaujinimui..."
msgid "Initializing ways to update ..."
-msgstr ""
+msgstr "Inicializuojami keliai atnaujinimui..."
msgid "Initializing relations to update ..."
-msgstr ""
+msgstr "Inicializuojami ryšiai atnaujinimui..."
msgid "Settings"
msgstr "Nustatymai"
msgid "Decide how to upload the data and which changeset to use"
-msgstr ""
+msgstr "Nuspręskite, kaip išsiųsti duomenis ir kuriuos pakeitimus naudoti"
msgid "Tags of new changeset"
-msgstr ""
+msgstr "Naujo pakeitimo žymos"
msgid "Apply tags to the changeset data is uploaded to"
-msgstr ""
+msgstr "Pritaikyti žymas pakeitimui, į kurį išsiunčiami duomenys"
msgid "Manage open changesets and select a changeset to upload to"
-msgstr ""
+msgstr "Valdyti atvirus pakeitimus ir parinkti pakeitimą išsiuntimui"
msgid "Configure advanced settings"
-msgstr ""
+msgstr "Keisti sudėtingesnes parinktis"
msgid "Upload to ''{0}''"
msgstr "Išsiųsti į „{0}“"
msgid "Upload Changes"
-msgstr "Išsiūsti pakeitimus"
+msgstr "Išsiųsti pakeitimus"
msgid "Upload the changed primitives"
-msgstr ""
+msgstr "Įkelti pokyčio primityvus"
msgid "Please revise upload comment"
-msgstr ""
+msgstr "Prašome peržiūrėti įkėlimo komentarą"
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
@@ -8606,9 +8969,15 @@ msgid ""
"/>to understand what is going on!<br /><br />If you spend a minute now to "
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+"Jūsų išsiuntimo komentaras <i>tuščias</i> arba <i>labai trumpas</i>.<br "
+"/><br />Tai techniškai priimtina, bet nepamirškite,<br>kad daugeliui "
+"naudotojų, kurie stebi pokyčius juos dominančiuose regionuose,<br />reikia "
+"prasmingų pakeitimų komentarų,<br />kad būtų galima suprasti, kas vyksta!<br "
+"/><br />Jei dabar sugaišite minutę paaiškindami savo pakeitimą,<br "
+"/>palengvinsite gyvenimą daugeliui kitų žymėtojų."
msgid "Please specify a changeset source"
-msgstr ""
+msgstr "Prašome nurodyti pakeitimo šaltinį"
msgid ""
"You did not specify a source for your changes.<br />It is technically "
@@ -8616,24 +8985,28 @@ msgid ""
"origins of the data.<br /><br />If you spend a minute now to explain your "
"change, you will make life<br />easier for many other mappers."
msgstr ""
+"Jūs nenurodėte jūsų pakeitimų šaltinio.<br />Tai techniškai leidžiama, bet "
+"ši informacija padeda kitiems<br />naudotojams suprasti, kokiu pagrindu "
+"keitėte duomenis.<br /><br />Jei dabar sugaišite minutę pakeitimų "
+"paaiškinimui,<br />palengvinsite gyvenimą daugeliui kitų žymėtojų."
msgid "Revise"
-msgstr ""
+msgstr "Peržiūrėti"
msgid "Continue as is"
msgstr "Tęsti kaip yra"
msgid "Return to the previous dialog to enter a more descriptive comment"
-msgstr ""
+msgstr "Grįžti į ankstesnį dialogą ir įvesti išsamesnį komentarą"
msgid "Cancel and return to the previous dialog"
-msgstr ""
+msgstr "Nutraukti ir grįžti į ankstesnį dialogą"
msgid "Please enter a valid chunk size first"
-msgstr ""
+msgstr "Prašome pradžioje įvesti tinkamą gabalo dydį"
msgid "Illegal chunk size"
-msgstr ""
+msgstr "Netinkamas gabalo dydis"
msgid "{0}={1}"
msgstr "{0}={1}"
@@ -8645,48 +9018,63 @@ msgid_plural ""
"<html>The following changeset tags contain an empty "
"key/value:<br>{0}<br>Continue?</html>"
msgstr[0] ""
+"<html>Šioje pakeitimo žymoje yra tuščias "
+"raktas/reikšmė:<br>{0}<br>Tęsti?</html>"
msgstr[1] ""
+"<html>Šiose pakeitimo žymose yra tušti "
+"raktai/reikšmės:<br>{0}<br>Tęsti?</html>"
+msgstr[2] ""
+"<html>Šiose pakeitimo žymose yra tušti "
+"raktai/reikšmės:<br>{0}<br>Tęsti?</html>"
msgid "Empty metadata"
msgstr "Tušti metaduomenys"
msgid "Cancel the upload and resume editing"
-msgstr ""
+msgstr "Nutraukti įkėlimą ir tęsti redagavimą"
msgid "Tags of changeset {0}"
-msgstr ""
+msgstr "Pakeitimo {0} žymos"
msgid ""
"Object ''{0}'' is already deleted on the server. Skipping this object and "
"retrying to upload."
msgstr ""
+"Objektas „{0}“ jau ištrintas serveryje. Objektas praleidžiamas ir įkėlimas "
+"bandomas dar kartą."
msgid "Preparing objects to upload ..."
msgstr "Ruošiami objektai išsiuntimui ..."
msgid "Objects are uploaded to a <strong>new changeset</strong>."
-msgstr ""
+msgstr "Objektai išsiunčiami į <strong>naują pakeitimą</strong>."
msgid ""
"Objects are uploaded to the <strong>open changeset</strong> {0} with upload "
"comment ''{1}''."
msgstr ""
+"Objektai išsiunčiami į <strong>atvirą pakeitimą</strong> {0} su išsiuntimo "
+"komentaru „{1}“."
msgid ""
"The changeset is going to be <strong>closed</strong> after this upload"
-msgstr ""
+msgstr "Pakeitimas po išsiuntimo bus <strong>užvertas</strong>"
msgid "The changeset is <strong>left open</strong> after this upload"
-msgstr ""
+msgstr "Pakeitimas po išsiuntimo bus <strong>paliktas atviras</strong>"
msgid "configure changeset"
-msgstr ""
+msgstr "konfigūruoti pakeitimas"
msgid "Uploading <strong>{0} object</strong> to <strong>1 changeset</strong>"
msgid_plural ""
"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
msgstr[0] ""
+"Išsiunčiamas <strong>{0} objektas</strong> kaip <strong>1 pakeitimas</strong>"
msgstr[1] ""
+"Išsiunčiami <strong>{0} objektai</strong> kaip <strong>1 pakeitimas</strong>"
+msgstr[2] ""
+"Išsiunčiama <strong>{0} objektų</strong> kaip <strong>1 pakeitimas</strong>"
msgid ""
"Uploading <strong>{0} object</strong> to <strong>1 changeset</strong> using "
@@ -8695,41 +9083,56 @@ msgid_plural ""
"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using "
"<strong>1 request</strong>"
msgstr[0] ""
+"Išsiunčiamas <strong>{0} objektas</strong> kaip <strong>1 "
+"pakeitimas</strong> naudojant <strong>1 užklausą</strong>"
msgstr[1] ""
+"Išsiunčiami <strong>{0} objektai</strong> kaip <strong>1 pakeitimas</strong> "
+"naudojant <strong>1 užklausą</strong>"
+msgstr[2] ""
+"Išsiunčiama <strong>{0} objektų</strong> kaip <strong>1 pakeitimas</strong> "
+"naudojant <strong>1 užklausą</strong>"
msgid ""
"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using "
"<strong>{1} requests</strong>"
msgstr ""
+"Įkeliami <strong>{0} objektai</strong> į <strong>1 pokytį</strong> naudojant "
+"<strong>{1} užklausų</strong>"
msgid "advanced configuration"
-msgstr ""
+msgstr "sudėtingesnė konfigūracija"
msgid ""
"{0} objects exceed the max. allowed {1} objects in a changeset on the server "
"''{2}''. Please <a href=\"urn:advanced-configuration\">configure</a> how to "
"proceed with <strong>multiple changesets</strong>"
msgstr ""
+"{0} objektai viršijo maksimalų leistiną {1} objektų pakeitime skaičių "
+"serveryje „{2}“. Prašome <a href=\"urn:advanced-"
+"configuration\">sukonfigūruoti</a>, kaip tęsti su <strong>keliais "
+"pakeitimais</strong>"
msgid ""
"Uploading <strong>{0} objects</strong> to <strong>multiple "
"changesets</strong> using <strong>{1} requests</strong>"
msgstr ""
+"Įkeliami <strong>{0} objektai</strong> į <strong>kelis pakeitimus</strong> "
+"naudojant <strong>{1} užklausų</strong>"
msgid "Uploading data for layer ''{0}''"
-msgstr ""
+msgstr "Išsiunčiami sluoksnio „{0}“ duomenys"
msgid "Continue uploading"
msgstr "Tęsti išsiuntimą"
msgid "Click to continue uploading to additional new changesets"
-msgstr ""
+msgstr "Spauskite išsiuntimui į papildomus naujus pakeitimus tęsti"
msgid "Go back to Upload Dialog"
-msgstr ""
+msgstr "Grįžti į įkėlimo dialogą"
msgid "Click to return to the Upload Dialog"
-msgstr ""
+msgstr "Spauskite, kad grįžtumėte į įkėlimo dialogą"
msgid "Abort"
msgstr "Nutraukti"
@@ -8742,11 +9145,15 @@ msgid ""
"likely because the changesets size exceeded the max. size<br>of {0} objects "
"on the server ''{1}''."
msgstr ""
+"Serveris pranešė, kad dabartinis pakeitimas buvo užvertas.<br>Tikriausiai "
+"taip atsitiko todėl, kad pakeitimo dydis viršijo maksimalų<br>{0} objektų "
+"apribojimą serveryje „{1}“."
msgid "There is {0} object left to upload."
msgid_plural "There are {0} objects left to upload."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Liko įkelti {0} objektą."
+msgstr[1] "Liko įkelti {0} objektus."
+msgstr[2] "Liko įkelti {0} objektų."
msgid ""
"Click ''<strong>{0}</strong>'' to continue uploading to additional new "
@@ -8754,31 +9161,35 @@ msgid ""
"dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return to "
"map editing.<br>"
msgstr ""
+"Spauskite „<strong>{0}</strong>“ išsiuntimui į papildomus naujus pakeitimus "
+"tęsti.<br>Spauskite „<strong>{1}</strong>“ grįžimui į išsiuntimo dialogo "
+"langą.<br>Spauskite „<strong>{2}</strong>“ išsiuntimo nutraukimui ir "
+"grįžimui į žemėlapio redagavimą.<br>"
msgid "Changeset is full"
-msgstr ""
+msgstr "Pakeitimas yra pilnas"
msgid "Node ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
+msgstr "Taškas „{0}“ jau ištrintas. Objektas išmetamas iš įkėlimo."
msgid "Way ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
+msgstr "Kelias „{0}“ jau ištrintas. Objektas išmetamas iš įkėlimo."
msgid "Relation ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
+msgstr "Ryšys „{0}“ jau ištrintas. Objektas išmetamas iš įkėlimo."
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
+msgstr "Objektas „{0}“ jau ištrintas. Objektas išmetamas iš įkėlimo."
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Išsiunčiamas {0} objektas..."
msgstr[1] "Išsiunčiami {0} objektai..."
-msgstr[2] "Išsiunčiami {0} objektų..."
+msgstr[2] "Išsiunčiama {0} objektų..."
msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
-msgstr ""
+msgstr "Ignoruojama klaida, nes įkėlimas nutrauktas. Klaida: {0}"
msgid "Upload successful!"
msgstr "Išsiuntimas sėkmingas!"
@@ -8787,11 +9198,15 @@ msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
msgstr ""
+"<html>Pažymėti pakeistus objektus <strong>iš dabartinio pažymėjimo</strong> "
+"įkėlimui į serverį.</html>"
msgid ""
"<html>Mark <strong>locally deleted objects</strong> to be deleted on the "
"server.</html>"
msgstr ""
+"<html>Pažymėti <strong>vietoje ištrintus objektus</strong> ištrynimui "
+"serveryje.</html>"
msgid "Select objects to upload"
msgstr "Pasirinkite objektus išsiuntimui"
@@ -8800,16 +9215,16 @@ msgid "Cancel uploading"
msgstr "Atsisakyti išsiuntimo"
msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
-msgstr ""
+msgstr "Netikėta rakto „{0}“ reikšmė nustatymuose, gauta „{1}“"
msgid "Please select the upload strategy:"
-msgstr ""
+msgstr "Prašome parinkti įkėlimo strategiją:"
msgid "Upload data in one request"
msgstr "Išsiųsti duomenis viena užklausa"
msgid "Upload data in chunks of objects. Chunk size: "
-msgstr ""
+msgstr "Duomenis įkelti objektų grupėmis. Grupės dydis: "
msgid "Upload each object individually"
msgstr "Išsiųsti kiekvieną objektą atskirai"
@@ -8818,26 +9233,30 @@ msgid ""
"<html>There are <strong>multiple changesets</strong> necessary in order to "
"upload {0} objects. Which strategy do you want to use?</html>"
msgstr ""
+"<html>Reikia <strong>kelių pakeitimų</strong>, kad būtų išsiųsti {0} "
+"objektai. Kurią strategiją norite naudoti?</html>"
msgid "Fill up one changeset and return to the Upload Dialog"
-msgstr ""
+msgstr "Užpildyti vieną pakeitimą ir grįžti į išsiuntimo dialogo langą"
msgid "Open and use as many new changesets as necessary"
-msgstr ""
+msgstr "Atverti ir naudoti tiek naujų pakeitimų, kiek reikia"
msgid "Upload in one request not possible (too many objects to upload)"
-msgstr ""
+msgstr "Įkelti viena užklausa neįmanoma (per daug įkeliamų objektų)"
msgid ""
"<html>Cannot upload {0} objects in one request because the<br>max. changeset "
"size {1} on server ''{2}'' is exceeded.</html>"
msgstr ""
+"<html>Negalima išsiųsti {0} objektų viena užklausa, nes viršytas "
+"maksimalus<br>pakeitimo dydis {1} serveryje „{2}“.</html>"
msgid "(1 request)"
msgstr "(1 užklausa)"
msgid "(# requests unknown)"
-msgstr ""
+msgstr "(# užklausų nežinoma)"
msgid "({0} request)"
msgid_plural "({0} requests)"
@@ -8846,16 +9265,17 @@ msgstr[1] "({0} užklausos)"
msgstr[2] "({0} užklausų)"
msgid "Illegal chunk size <= 0. Please enter an integer > 1"
-msgstr ""
+msgstr "Netinkamas gabalo dydis <= 0. Prašome įvesti sveiką skaičių > 1"
msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''"
msgstr ""
+"Gabalo dydis {0} viršija didžiausią galimą pakeitimo dydį {1} serveryje „{2}“"
msgid "Please enter an integer > 1"
-msgstr ""
+msgstr "Prašome įvesti sveiką skaičių > 1"
msgid "Value ''{0}'' is not a number. Please enter an integer > 1"
-msgstr ""
+msgstr "Reikšmė „{0}“ nėra skaičius. Prašome įvesti sveiką skaičių > 1"
msgid "Objects to add:"
msgstr "Pridėti objektai:"
@@ -8885,13 +9305,13 @@ msgstr[1] "{0} objektai šalinimui:"
msgstr[2] "{0} objektų šalinimui:"
msgid "Customize Color"
-msgstr ""
+msgstr "Keisti spalvą"
msgid "Default"
msgstr "Numatyta"
msgid "Choose a color"
-msgstr ""
+msgstr "Parinkite spalvą"
msgid "Name: {0}"
msgstr "Pavadinimas: {0}"
@@ -8901,8 +9321,9 @@ msgstr "Aprašas: {0}"
msgid "{0} track"
msgid_plural "{0} tracks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} pėdsakas"
+msgstr[1] "{0} pėdsakai"
+msgstr[2] "{0} pėdsakų"
msgid "Description"
msgstr "Aprašas"
@@ -8918,48 +9339,54 @@ msgstr "Ilgis: {0}"
msgid "{0} route, "
msgid_plural "{0} routes, "
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} maršrutas "
+msgstr[1] "{0} maršrutai "
+msgstr[2] "{0} maršrutų "
msgid "{0} waypoint"
msgid_plural "{0} waypoints"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} kelio taškas"
+msgstr[1] "{0} kelio taškai"
+msgstr[2] "{0} kelio taškų"
msgid "{0} track, "
msgid_plural "{0} tracks, "
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} pėdsakas, "
+msgstr[1] "{0} pėdsakai, "
+msgstr[2] "{0} pėdsakų, "
msgid "Save GPX file"
msgstr "Išsaugoti GPX failą"
msgid "Imagery fade"
-msgstr ""
+msgstr "Vaizdų stelbimas"
msgid "ERROR"
msgstr "KLAIDA"
msgid "Next marker"
-msgstr ""
+msgstr "Kitas žymeklis"
msgid "Jump to next marker"
-msgstr ""
+msgstr "Peršokti prie kito žymeklio"
msgid "Previous marker"
-msgstr ""
+msgstr "Ankstesnis žymeklis"
msgid "Jump to previous marker"
-msgstr ""
+msgstr "Peršokti prie ankstesnio žymeklio"
msgid "All projections are supported"
-msgstr ""
+msgstr "Palaikomos visos projekcijos"
msgid ""
"The layer {0} does not support the new projection {1}.\n"
"{2}\n"
"Change the projection again or remove the layer."
msgstr ""
+"Sluoksnis {0} nepalaiko naujos projekcijos {1}.\n"
+"{2}\n"
+"Dar kartą pakeiskite projekciją arba išimkite sluoksnį."
msgid "Save Layer"
msgstr "Išsaugoti sluoksnį"
@@ -8968,22 +9395,22 @@ msgid "Note"
msgstr ""
msgid "Notes layer"
-msgstr ""
+msgstr "Pastabų sluoksnis"
msgid "Total notes:"
-msgstr ""
+msgstr "Iš viso pastabų:"
msgid "Changes need uploading?"
-msgstr ""
+msgstr "Pakeitimus reikia įkelti?"
msgid "Data Layer {0}"
msgstr "Duomenų sluoksnis {0}"
msgid "outside downloaded area"
-msgstr ""
+msgstr "už atsiųsto ploto ribų"
msgid "Merging layers"
-msgstr ""
+msgstr "Suliejami sluoksniai"
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -8995,13 +9422,13 @@ msgid "{0} consists of:"
msgstr "{0} susideda iš:"
msgid "unset"
-msgstr ""
+msgstr "nužymėti"
msgid "API version: {0}"
msgstr "API versija: {0}"
msgid "Upload is discouraged"
-msgstr ""
+msgstr "Siūloma neįkelti"
msgid "Convert to GPX layer"
msgstr "Konvertuoti į GPX sluoksnį"
@@ -9010,7 +9437,7 @@ msgid "Converted from: {0}"
msgstr "Konvertuota iš: {0}"
msgid "Dataset consistency test"
-msgstr ""
+msgstr "Duomenų aibės nuoseklumo tikrinimas"
msgid "No problems found"
msgstr "Problemų nerasta"
@@ -9022,7 +9449,7 @@ msgid "Empty document"
msgstr "Tuščias dokumentas"
msgid "Save anyway"
-msgstr "Vistiek išsaugoti"
+msgstr "Vis tiek įrašyti"
msgid "The document contains no data."
msgstr "Dokumente nėra duomenų."
@@ -9047,142 +9474,152 @@ msgid ""
"{0} is not a valid TMS argument. Please check this server URL:\n"
"{1}"
msgstr ""
+"{0} yra netinkamas TMS argumentas. Prašome patikrinti šį serverio URL:\n"
+"{1}"
msgid ""
"TMS layers do not support the projection {0}.\n"
"{1}\n"
"Change the projection or remove the layer."
msgstr ""
+"TMS sluoksnis nepalaiko projekcijos {0}.\n"
+"{1}\n"
+"Pakeiskite projekciją arba išimkite sluoksnį."
msgid "Auto Zoom"
-msgstr ""
+msgstr "Automatinis mastelis"
msgid "Auto load tiles"
-msgstr ""
+msgstr "Automatiškai įkelti kaladėles"
msgid "Show Errors"
msgstr "Rodyti klaidas"
msgid "Load Tile"
-msgstr ""
+msgstr "Įkelti kaladėlę"
msgid "Show Tile Info"
-msgstr ""
+msgstr "Rodyti kaladėlės info"
msgid "Load All Tiles"
-msgstr ""
+msgstr "Įkelti visas kaladėles"
msgid "Load All Error Tiles"
-msgstr ""
+msgstr "Įkelti visas klaidingas kaladėles"
msgid "Increase zoom"
-msgstr ""
+msgstr "Didinti"
msgid "Decrease zoom"
-msgstr ""
+msgstr "Mažinti"
msgid "Snap to tile size"
-msgstr ""
+msgstr "Pritraukti prie kaladėlės dydžio"
msgid "Flush Tile Cache"
-msgstr ""
+msgstr "Valyti kaladėlių podėlį"
msgid "zoom in to load any tiles"
-msgstr ""
+msgstr "padidinkite, kad įkeltumėte kaladėles"
msgid "zoom in to load more tiles"
-msgstr ""
+msgstr "padidinkite, kad įkeltumėte daugiau kaladėlių"
msgid "increase zoom level to see more detail"
-msgstr ""
+msgstr "padidinkite, kad matytumėte daugiau detalių"
msgid "No tiles at this zoom level"
-msgstr ""
+msgstr "Šiame mastelyje nėra kaladėlių"
msgid "Current zoom: {0}"
-msgstr ""
+msgstr "Dabartinis mastelis: {0}"
msgid "Display zoom: {0}"
-msgstr ""
+msgstr "Rodyti mastelį: {0}"
msgid "Pixel scale: {0}"
-msgstr ""
+msgstr "Taško mastelis: {0}"
msgid "Best zoom: {0}"
-msgstr ""
+msgstr "Geriausias mastelis: {0}"
+
+msgid "Cache stats: {0}"
+msgstr "Podėlio būsena: {0}"
msgid "TMS layer ({0}), downloading in zoom {1}"
-msgstr ""
+msgstr "TMS sluoksnis ({0}), atsiunčiamas mastelyje {1}"
msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
+msgstr "Palaikomos EPSG:4326 ir Merkatoriaus projekcijos"
msgid "Validation errors"
-msgstr ""
+msgstr "Tikrinimo klaidos"
msgid "No validation errors"
-msgstr ""
+msgstr "Nėra tikrinimo klaidų"
msgid "Blank Layer"
-msgstr ""
+msgstr "Tuščias sluoksnis"
msgid "Downloaded {0}/{1} tiles"
-msgstr ""
+msgstr "Atsiųsta {0}/{1} kaladėlių"
msgid "WMS layer ({0}), automatically downloading in zoom {1}"
-msgstr ""
+msgstr "WMS sluoksnis ({0}), automatiškai atsiunčiamas mastelyje {1}"
msgid "WMS layer ({0}), downloading in zoom {1}"
-msgstr ""
+msgstr "WMS sluoksnis ({0}), atsiunčiamas mastelyje {1}"
msgid "Download visible tiles"
-msgstr ""
+msgstr "Atsiųsti matomas kaladėles"
msgid ""
"The requested area is too big. Please zoom in a little, or change resolution"
msgstr ""
+"Užklaustas plotas per didelis. Truputi padidinkite arba pakeiskite "
+"skiriamąją gebą"
msgid "Change resolution"
-msgstr ""
+msgstr "Keisti skiriamąją gebą"
msgid "Reload erroneous tiles"
-msgstr ""
+msgstr "Iš nauo atsiųsti klaidingas kaladėles"
msgid "Alpha channel"
-msgstr ""
+msgstr "Alfa kanalas"
msgid "Automatically change resolution"
-msgstr ""
+msgstr "Automatiškai keisti skiriamąją gebą"
msgid "Set WMS Bookmark"
-msgstr ""
+msgstr "Nustatyti WMS žymelę"
msgid "Automatic downloading"
msgstr "Automatinis atsiuntimas"
msgid "Zoom to native resolution"
-msgstr ""
+msgstr "Keisti mastelį iki savosios skiriamosios gebos"
msgid "Supported projections are: {0}"
-msgstr ""
+msgstr "Palaikomos projekcijos: {0}"
msgid "Unsupported WMS file version; found {0}, expected {1}"
-msgstr ""
+msgstr "Nepalaikoma WMS failo versija; rasta {0}, tikėtasi {1}"
msgid "Save WMS file"
msgstr "Išsaugoti WMS failą"
msgid "Correlate to GPX"
-msgstr ""
+msgstr "Koreliuoti su GPX"
msgid "GPX Files (*.gpx *.gpx.gz)"
msgstr "GPX failai (*.gpx *.gpx.gz)"
msgid "File {0} is loaded yet under the name \"{1}\""
-msgstr ""
+msgstr "Failas {0} vis dar įkeltas pavadinimu „{1}“"
msgid "Error while parsing {0}"
-msgstr ""
+msgstr "Klaida nagrinėjant {0}"
msgid "Could not read \"{0}\""
msgstr "Neperskaitoma \"{0}\""
@@ -9192,15 +9629,18 @@ msgid ""
"time.<br>Display that photo here.<br>And then, simply capture the time you "
"read on the photo and select a timezone<hr></html>"
msgstr ""
+"<html>Nufotografuokite savo GPS imtuvą kai jis rodo laiką.<br>Parodykite "
+"nuotrauką čia.<br>Tada tiesiog įveskite laiką, kurį matote nuotraukoje ir "
+"parinkite laiko zoną<hr></html>"
msgid "Photo time (from exif):"
msgstr "Nuotraukos laikas (iš exif):"
msgid "Gps time (read from the above photo): "
-msgstr ""
+msgstr "Gps laikas (perskaitytas iš nuotraukos aukščiau): "
msgid "I am in the timezone of: "
-msgstr ""
+msgstr "Aš esu laiko juostoje: "
msgid "No date"
msgstr "Be datos"
@@ -9209,34 +9649,38 @@ msgid "Open another photo"
msgstr "Atverti kitą nuotrauką"
msgid "Synchronize time from a photo of the GPS receiver"
-msgstr ""
+msgstr "Sinchronizuoti nuotraukos laiką su GPS imtuvo"
msgid ""
"Error while parsing the date.\n"
"Please use the requested format"
msgstr ""
+"Klaida nagrinėjant datą.\n"
+"Naudokite prašomą formatą"
msgid "Invalid date"
msgstr "Netinkama data"
msgid "<No GPX track loaded yet>"
-msgstr ""
+msgstr "<Neįkeltas joks GPS pėdsakas>"
msgid "GPX track: "
msgstr "GPX pėdsakas: "
msgid "Open another GPX trace"
-msgstr ""
+msgstr "Įkelti kitą GPX pėdsaką"
msgid ""
"<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
msgstr ""
+"<html>Naudokite tikslaus laikrodžio nuotrauką,<br>pvz. GPS imtuvo "
+"monitoriaus</html>"
msgid "Auto-Guess"
-msgstr ""
+msgstr "Auto-spėti"
msgid "Matches first photo with first gpx point"
-msgstr ""
+msgstr "Sutapatina pirmą nuotrauką su pirmu gpx tašku"
msgid "Manual adjust"
msgstr ""
@@ -9263,7 +9707,7 @@ msgid "Correlate images with GPX track"
msgstr ""
msgid "Correlate"
-msgstr ""
+msgstr "Koreliuoti"
msgid "Invalid timezone"
msgstr "Netinkama laiko juosta"
@@ -9284,7 +9728,11 @@ msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
msgid_plural ""
"<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
msgstr[0] ""
+"<html><b>{0}</b> iš <b>{1}</b> nuotraukų atitiko GPX pėdsaką.</html>"
msgstr[1] ""
+"<html><b>{0}</b> iš <b>{1}</b> nuotraukų atitiko GPX pėdsaką.</html>"
+msgstr[2] ""
+"<html><b>{0}</b> iš <b>{1}</b> nuotraukų atitiko GPX pėdsaką.</html>"
msgid "Timezone: {0}"
msgstr "Laiko juosta: {0}"
@@ -9297,91 +9745,101 @@ msgstr "Sekundės: {0}"
msgid "(Time difference of {0} day)"
msgid_plural "Time difference of {0} days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(Laiko skirtumas - {0} diena)"
+msgstr[1] "(Laiko skirtumas - {0} dienos)"
+msgstr[2] "(Laiko skirtumas - {0} dienų)"
msgid ""
"An error occurred while trying to match the photos to the GPX track. You can "
"adjust the sliders to manually match the photos."
msgstr ""
+"Bandant atitaikyti nuotraukas su GPX pėdsaku įvyko klaida. Galite pataisyti "
+"slankiklius rankomis, kad sutapatintumėte nuotraukas."
msgid "Matching photos to track failed"
-msgstr ""
+msgstr "Nepavyko sutapatinti nuotraukų su pėdsaku"
msgid "Adjust timezone and offset"
-msgstr ""
+msgstr "Keisti laiko juostą ir poslinkį"
msgid "The selected photos do not contain time information."
-msgstr ""
+msgstr "Parinktose nuotraukose nėra laiko informacijos"
msgid "Photos do not contain time information"
-msgstr ""
+msgstr "Nuotraukose nėra laiko informacijos"
msgid ""
"The selected GPX track does not contain timestamps. Please select another "
"one."
-msgstr ""
+msgstr "Parinktame GPX pėdsake nėra laiko žymų. Prašome parinkti kitą."
msgid "GPX Track has no time information"
-msgstr ""
+msgstr "GPX pėdsake nėra laiko informacijos"
msgid "You should select a GPX track"
-msgstr ""
+msgstr "Jūs turite parinkti GPX pėdsaką"
msgid "No selected GPX track"
-msgstr ""
+msgstr "Nėra parinkto GPX pėdsako"
msgid ""
"Error while parsing timezone.\n"
"Expected format: {0}"
msgstr ""
+"Klaida nagrinėjant laiko juostą.\n"
+"Tikėtasi formato: {0}"
msgid ""
"Error while parsing offset.\n"
"Expected format: {0}"
msgstr ""
+"Klaida nagrinėjant poslinkį:\n"
+"Tikėtasi formato: {0}"
msgid "Extracting GPS locations from EXIF"
-msgstr ""
+msgstr "Iš EXIF ištraukiamos GPS vietos"
msgid "Starting directory scan"
-msgstr ""
+msgstr "Pradedamas aplanko skenavimas"
msgid "Read photos..."
-msgstr ""
+msgstr "Skaitomos nuotraukos..."
msgid "Reading {0}..."
msgstr "Skaitoma {0}..."
msgid "Unable to get canonical path for directory {0}\n"
-msgstr ""
+msgstr "Nepavyksta gauti kanoninio kelio aplankui {0}\n"
msgid "Scanning directory {0}"
-msgstr ""
+msgstr "Skenuojamas aplankas {0}"
msgid "Error while getting files from directory {0}\n"
-msgstr ""
+msgstr "Klaida gaunant failus iš aplanko {0}\n"
msgid "One of the selected files was null"
-msgstr ""
+msgstr "Vienas iš parinktų failų buvo tuščias"
msgid "Geotagged Images"
-msgstr ""
+msgstr "Geopažymėti vaizdai"
msgid "{0} image loaded."
msgid_plural "{0} images loaded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} paveikslas įkeltas."
+msgstr[1] "{0} paveikslai įkelti."
+msgstr[2] "{0} paveikslų įkelti."
msgid "{0} was found to be GPS tagged."
msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} rastas su GPS žymomis"
+msgstr[1] "{0} rasti su GPS žymomis"
+msgstr[2] "{0} rastų su GPS žymomis"
msgid "{0} has updated GPS data."
msgid_plural "{0} have updated GPS data."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} turi atnaujintus GPS duomenis."
+msgstr[1] "{0} turi atnaujintus GPS duomenis."
+msgstr[2] "{0} turi atnaujintus GPS duomenis."
msgid "Delete image file from disk"
msgstr "Pašalinti atvaizdžio failą iš disko"
@@ -9390,9 +9848,11 @@ msgid ""
"<html><h3>Delete the file {0} from disk?<p>The image file will be "
"permanently lost!</h3></html>"
msgstr ""
+"<html><h3>Ištrinti failą {0} iš disko?<p>Vaizdo failas bus neatstatomai "
+"prarastas!</h3></html>"
msgid "Image file could not be deleted."
-msgstr ""
+msgstr "Nepavyko pašalinti paveikslo failo."
msgid "No image"
msgstr "Nėra atvaizdžio"
@@ -9401,10 +9861,10 @@ msgid "Loading {0}"
msgstr "Įkeliama {0}"
msgid "Error on file {0}"
-msgstr ""
+msgstr "Klaida faile {0}"
msgid "Display geotagged images"
-msgstr ""
+msgstr "Rodyti vaizdus su geografinėmis žymomis"
msgid "Previous"
msgstr "Ankstesnis"
@@ -9413,7 +9873,7 @@ msgid "Show previous Image"
msgstr "Rodyti ankstesnį atvaizdį"
msgid "Geoimage: {0}"
-msgstr ""
+msgstr "Geovaizdas: {0}"
msgid "Remove photo from layer"
msgstr "Pašalinti nuotrauką iš sluoksnio"
@@ -9422,7 +9882,7 @@ msgid "Delete File from disk"
msgstr "Pašalinti failą iš disko"
msgid "Copy image path"
-msgstr ""
+msgstr "Kopijuoti paveikslo kelią"
msgid "Next"
msgstr "Kitas"
@@ -9437,13 +9897,13 @@ msgid "Show last Image"
msgstr "Rodyti paskutinį atvaizdį"
msgid "Center view"
-msgstr ""
+msgstr "Centruoti vaizdą"
msgid "Zoom best fit and 1:1"
-msgstr ""
+msgstr "Geriausias mastelis ir 1:1"
msgid "Move dialog to the side pane"
-msgstr ""
+msgstr "Perkelti dialogą į šoninį skydelį"
msgid ""
"\n"
@@ -9456,6 +9916,8 @@ msgid ""
"\n"
"Speed: {0} km/h"
msgstr ""
+"\n"
+"Greitis: {0} km/h"
msgid ""
"\n"
@@ -9482,25 +9944,29 @@ msgid "JPEG images (*.jpg)"
msgstr "JPEG atvaizdžiai (*.jpg)"
msgid "Show thumbnails"
-msgstr ""
+msgstr "Rodyti miniatiūras"
msgid "Show image thumbnails instead of icons."
-msgstr ""
+msgstr "Rodyti paveikslų miniatiūras vietoje piktogramų."
msgid "Choose visible tracks"
-msgstr ""
+msgstr "Parinkti matomus pėdsakus"
msgid "Select by date"
-msgstr ""
+msgstr "Parinkti pagal datą"
msgid ""
"<html>Select all tracks that you want to be displayed. You can drag select a "
"range of tracks or use CTRL+Click to select specific ones. The map is "
"updated live in the background. Open the URLs by double clicking them.</html>"
msgstr ""
+"<html>Parinkite visus pėdsakus, kuriuos norite rodyti. Galite tempti, kad "
+"pažymėtumėte kelis pėdsakus arba naudokite Ctrl+Papspaudimą, kad "
+"pažymėtumėte konkrečius. Žemėlapis atnaujinamas fone gyvai. URL atverkite du "
+"kartus ant jų paspaudę.</html>"
msgid "Set track visibility for {0}"
-msgstr ""
+msgstr "Nustatyti pėdsako matomumą skirtą {0}"
msgid "Show all"
msgstr "Rodyti visus"
@@ -9509,15 +9975,17 @@ msgid "Show selected only"
msgstr "Rodyti tik pasirinktus"
msgid "Convert to data layer"
-msgstr ""
+msgstr "Konvertuoti į duomenų sluoksnį"
msgid ""
"<html>Upload of unprocessed GPS data as map data is considered "
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
+"<html>Neapdorotų GPS pėdsakų įkėlimas kaip žemėlapio duomenų laikomas "
+"žalingu.<br>Jei norite įkelti pėdsakus, žiūrėkite čia:</html>"
msgid "Customize track drawing"
-msgstr ""
+msgstr "Keisti pėdsako paišymą"
msgid "From"
msgstr "Nuo"
@@ -9526,73 +9994,73 @@ msgid "To"
msgstr "Iki"
msgid "No timestamp"
-msgstr ""
+msgstr "Nėra laiko žymos"
msgid "Select to download OSM data."
-msgstr ""
+msgstr "Parinkite, kad atsiųstumėte OSM duomenis"
msgid "Select to download GPS traces."
-msgstr ""
+msgstr "Parinkite, kad atsiųstumėte GPS pėdsakus"
msgid "Download everything within:"
-msgstr ""
+msgstr "Atsiųsti viską plote:"
msgid "meters"
-msgstr ""
+msgstr "metrai"
msgid "Maximum area per request:"
-msgstr ""
+msgstr "Maksimalus plotas per užklausą:"
msgid "sq km"
-msgstr ""
+msgstr "kv km"
msgid "Download near:"
-msgstr ""
+msgstr "Atsiųsti greta:"
msgid "track only"
-msgstr ""
+msgstr "tik pėdsakas"
msgid "waypoints only"
-msgstr ""
+msgstr "tik kelio žymos"
msgid "track and waypoints"
-msgstr ""
+msgstr "pėdsakas ir kelio žymos"
msgid "Click to download"
-msgstr ""
+msgstr "Spauskite atsiuntimui"
msgid "Click to cancel"
-msgstr ""
+msgstr "Spauskite nutraukimui"
msgid "Download from OSM along this track"
-msgstr ""
+msgstr "Atsiųsti iš OSM palei šį pėdsaką"
msgid "Calculating Download Area"
msgstr "Apskaičiuojama atsiuntimo sritis"
msgid "Precache imagery tiles along this track"
-msgstr ""
+msgstr "Iš anksto padėti į podėlį vaizdų kaladėles palei šį pėdsaką"
msgid "Precaching WMS"
-msgstr ""
+msgstr "WMS dedamas į podėlį iš anksto"
msgid "Please select the imagery layer."
-msgstr ""
+msgstr "Pasirinkite vaizdų sluoksnį."
msgid "Select imagery layer"
-msgstr ""
+msgstr "Pasirinkite vaizdų sluoksnį"
msgid "There are no imagery layers."
-msgstr ""
+msgstr "Nėra vaizdų sluoksnių."
msgid "No imagery layers"
-msgstr ""
+msgstr "Nėra vaizdų sluoksnių"
msgid "Velocity, km/h"
-msgstr ""
+msgstr "Greitis, km/h"
msgid "HDOP, m"
-msgstr ""
+msgstr "HDOP, m"
msgid "Time"
msgstr "Laikas"
@@ -9830,7 +10298,7 @@ msgid ""
msgstr ""
msgid "Username: "
-msgstr "Vartotojo vardas: "
+msgstr "Naudotojo vardas : "
msgid "Password: "
msgstr "Slaptažodis: "
@@ -10031,7 +10499,7 @@ msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
msgid "Allow modifications of notes"
-msgstr ""
+msgstr "Leisti modifikuoti pastabas"
msgid "Select to grant JOSM the right to modify notes on your behalf"
msgstr ""
@@ -10172,7 +10640,7 @@ msgid "Save the preferences and close the dialog"
msgstr ""
msgid "Download plugins"
-msgstr ""
+msgstr "Atsiųsti papildinius"
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
@@ -10214,13 +10682,13 @@ msgid "active"
msgstr ""
msgid "Map paint style file (*.xml, *.mapcss, *.zip)"
-msgstr ""
+msgstr "Žemėlapio paišymo stilius (*.xml, *.mapcss, *.zip)"
msgid "Preset definition file (*.xml, *.zip)"
msgstr ""
msgid "Tag checker rule (*.validator.mapcss, *.zip)"
-msgstr ""
+msgstr "Žymų tikrinimo taisyklė (*.validator.mapcss, *.zip)"
msgid "Edit source entry:"
msgstr ""
@@ -10370,7 +10838,7 @@ msgid "toolbar"
msgstr ""
msgid "imagery"
-msgstr ""
+msgstr "vaizdai"
msgid "Reset preferences"
msgstr ""
@@ -10380,6 +10848,9 @@ msgid ""
"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
+"Ruošiatės atstatyti visų nustatymų numatytąsias reikšmes<br />Visi jūsų "
+"nustatymai bus pašalinti: papildiniai, vaizdai, filtrai, įrankių juostos "
+"mygtukai, spartieji klavišai ir t. t.<br />Ar tikrai norite tęsti?"
msgid "Load profile"
msgstr "Įkelti profilį"
@@ -10723,7 +11194,7 @@ msgid "Dilution of Position (red = high, green = low, if available)"
msgstr ""
msgid "Track date"
-msgstr ""
+msgstr "Pėdsako data"
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10735,13 +11206,13 @@ msgid "Bicycle"
msgstr "Dviratis"
msgid "Foot"
-msgstr "Piestieji"
+msgstr "Pėstieji"
msgid "Create markers when reading GPX"
msgstr ""
msgid "Fast drawing (looks uglier)"
-msgstr ""
+msgstr "Greitas braižymas (atrodo prasčiau)"
msgid "Dynamic color range based on data limits"
msgstr ""
@@ -10904,7 +11375,7 @@ msgid "Default (Auto determined)"
msgstr ""
msgid "Add Imagery URL"
-msgstr ""
+msgstr "Pridėti vaizdų URL"
msgid "1. Enter URL"
msgstr ""
@@ -10973,7 +11444,7 @@ msgid "No bounding box was found for this layer."
msgstr ""
msgid "imagery fade"
-msgstr ""
+msgstr "vaizdų stelbimas"
msgid "Fade Color: "
msgstr ""
@@ -10991,10 +11462,10 @@ msgid "Sharpen (requires layer re-add): "
msgstr ""
msgid "Imagery Preferences"
-msgstr ""
+msgstr "Vaizdų nuostatos"
msgid "Modify list of imagery layers displayed in the Imagery menu"
-msgstr ""
+msgstr "Modifikuoti vaizdų sluoksnių sąrašą rodomą vaizdų meniu"
msgid "Common Settings"
msgstr "Bendri nustatymai"
@@ -11006,13 +11477,13 @@ msgid "TMS Settings"
msgstr "TMS nustatymai"
msgid "Imagery providers"
-msgstr ""
+msgstr "Vaizdų tiekėjai"
msgid "Offset bookmarks"
msgstr ""
msgid "Imagery Background: Default"
-msgstr ""
+msgstr "Vaizdų fonas: numatytasis"
msgid "Available default entries:"
msgstr ""
@@ -11039,13 +11510,13 @@ msgid "Menu Name"
msgstr "Meniu pavadinimas"
msgid "Imagery URL"
-msgstr ""
+msgstr "Vaizdų URL"
msgid "Menu Name (Default)"
msgstr "Meniu pavadinimas (numatytasis)"
msgid "Imagery URL (Default)"
-msgstr ""
+msgstr "Vaizdų URL (numatytasis)"
msgid "EULA license URL not available: {0}"
msgstr ""
@@ -11083,6 +11554,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11205,96 +11682,113 @@ msgid "Settings for the map projection and data interpretation."
msgstr ""
msgid "Could not read tagging preset source: {0}"
-msgstr ""
+msgstr "Nepavyko perskaityti žymėjimo ruošinių šaltinio: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
"Do you want to keep it?"
msgstr ""
+"Nepavyko perskaityti žymėjimo ruošinių šaltinio: {0}\n"
+"Ar norite jį palikti?"
msgid "Could not read tagging preset source {0}"
-msgstr ""
+msgstr "Nepavyko perskaityti žymėjimo ruošinių šaltinio {0}"
msgid ""
"<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
"really want to use it?<br><br><table width=600>Error is: [{1}:{2}] "
"{3}</table></html>"
msgstr ""
+"<html>Žymėjimo ruošinių šaltinis {0} gali būti įkeltas, bet su klaidomis. Ar "
+"tikrai norite jį naudoti?<br><br><table width=600>Klaida: [{1}:{2}] "
+"{3}</table></html>"
msgid ""
"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
"it?<br><br><table width=400>Error is: [{1}:{2}] {3}</table></html>"
msgstr ""
+"<html>Nepavyko išnagrinėti žymėjimo ruošinių šaltinio: {0}. Ar tikrai norite "
+"jį naudoti?<br><br><table width=400>Klaida: [{1}:{2}] {3}</table></html>"
msgid ""
"<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
"really want to use it?<br><br><table width=600>Error is: {1}</table></html>"
msgstr ""
+"<html>Žymėjimo ruošinių šaltinis {0} gali būti įkeltas, bet su klaidomis. Ar "
+"tikrai norite jį naudoti?<br><br><table width=600>Klaida: {1}</table></html>"
msgid ""
"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
"it?<br><br><table width=600>Error is: {1}</table></html>"
msgstr ""
+"<html>Nepavyko išnagrinėti žymėjimo ruošinių šaltinio: {0}. Ar tikrai norite "
+"jį naudoti?<br><br><table width=600>Klaida: {1}</table></html>"
msgid "Sort presets menu"
-msgstr ""
+msgstr "Rikiuoti ruošinių meniu"
msgid "Tagging Presets"
-msgstr ""
+msgstr "Žymėjimo ruošiniai"
msgid "Available presets:"
-msgstr ""
+msgstr "Prieinami ruošiniai:"
msgid "Active presets:"
-msgstr ""
+msgstr "Aktyvūs ruošiniai:"
msgid "Add a new preset by entering filename or URL"
-msgstr ""
+msgstr "Pridėti naują ruošinį įvedant failo vardą ar URL"
msgid "New preset entry:"
-msgstr ""
+msgstr "Naujo ruošinio įrašas:"
msgid "Remove the selected presets from the list of active presets"
-msgstr ""
+msgstr "Naikinti pažymėtus ruošinius iš aktyvių ruošinių sąrašo"
msgid "Edit the filename or URL for the selected active preset"
-msgstr ""
+msgstr "Redaguoti failo vardą ar URL pažymėtam aktyviam ruošiniui"
msgid "Add the selected available presets to the list of active presets"
-msgstr ""
+msgstr "Pridėti pažymėtus prieinamus ruošinius į aktyvių ruošinių sąrašą"
msgid "Reloads the list of available presets from ''{0}''"
-msgstr ""
+msgstr "Iš naujo įkelia prieinamų ruošinių sąrašą iš „{0}“"
msgid "Loading preset sources from ''{0}''"
-msgstr ""
+msgstr "Įkeliami ruošinių šaltiniai iš „{0}“"
msgid ""
"<html>Failed to load the list of preset sources "
"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
msgstr ""
+"<html>Nepavyko įkelti ruošinių šaltinių sąrašo iš<br>„{0}“.<br><br>Išsami "
+"informacija (neišversta):<br>{1}</html>"
msgid "Warning: illegal format of entry in preset list ''{0}''. Got ''{1}''"
msgstr ""
+"Įspėjimas: neleistinas įrašo formatas ruošinių sąraše „{0}“. Gauta „{1}“"
msgid "Internal Preset"
-msgstr ""
+msgstr "Vidiniai ruošiniai"
msgid "The default preset for JOSM"
-msgstr ""
+msgstr "Numatytieji JOSM ruošiniai"
msgid "Plugin bundled with JOSM"
-msgstr ""
+msgstr "Papildinys pridėtas kartu su JOSM"
msgid ""
"Please click on <strong>Download list</strong> to download and display a "
"list of available plugins."
msgstr ""
+"Spauskite <strong>Atsiųsti sąrašą</strong> prieinamų papildinių sąrašui "
+"atsiųsti ir parodyti."
msgid "Plugin {0} is still required by this plugin:"
msgid_plural "Plugin {0} is still required by these {1} plugins:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Papildinys {0} dar reikalingas šiam papildiniui:"
+msgstr[1] "Papildinys {0} dar reikalingas šiems {1} papildiniams:"
+msgstr[2] "Papildinys {0} dar reikalingas šiems {1} papildinių:"
msgid "{0}: Version {1} (local: {2})"
msgstr "{0}: versija {1} (vietinė: {2})"
@@ -11303,23 +11797,25 @@ msgid " (requires: {0})"
msgstr " (reikalinga: {0})"
msgid "Configure available plugins."
-msgstr ""
+msgstr "Konfigūruoti prieinamus papildinius."
msgid ""
"The following plugin has been downloaded <strong>successfully</strong>:"
msgid_plural ""
"The following {0} plugins have been downloaded <strong>successfully</strong>:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Šis papildinys atsiųstas <strong>sėkmingai</strong>:"
+msgstr[1] "Šie {0} papildiniai atsiųsti <strong>sėkmingai</strong>:"
+msgstr[2] "Šie {0} papildinių atsiųsti <strong>sėkmingai</strong>:"
msgid "Downloading the following plugin has <strong>failed</strong>:"
msgid_plural ""
"Downloading the following {0} plugins has <strong>failed</strong>:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Šio papildinio atsiuntimas <strong>nesėkmingas</strong>:"
+msgstr[1] "Šių {0} papildinių atsiuntimas <strong>nesėkmingas</strong>:"
+msgstr[2] "Šių {0} papildinių atsiuntimas <strong>nesėkmingas</strong>:"
msgid "Please restart JOSM to activate the downloaded plugins."
-msgstr ""
+msgstr "Paleiskite JOSM iš naujo atsiųstiems papildiniams aktyvuoti."
msgid "Update plugins"
msgstr "Atnaujinti papildinius"
@@ -11334,10 +11830,10 @@ msgid "Plugin update policy"
msgstr "Papildinių atnaujinimo politika"
msgid "Accept the new plugin sites and close the dialog"
-msgstr ""
+msgstr "Priimti naujas papildinių svetaines ir užverti dialogo langą"
msgid "Configure Plugin Sites"
-msgstr ""
+msgstr "Konfigūruoti papildinių svetaines"
msgid "Download list"
msgstr "Atsiųsti sąrašą"
@@ -11352,18 +11848,20 @@ msgid ""
"All installed plugins are up to date. JOSM does not have to download newer "
"versions."
msgstr ""
+"Visi įdiegti papildiniai yra naujausių versijų. JOSM nereikia atsiųsti "
+"naujesnių versijų."
msgid "Plugins up to date"
-msgstr ""
+msgstr "Papildiniai naujausių versijų"
msgid "Configure sites..."
msgstr ""
msgid "Configure the list of sites where plugins are downloaded from"
-msgstr ""
+msgstr "Konfigūruokite svetainių sąrašą iš kurių atsiunčiami papildiniai"
msgid "Add JOSM Plugin description URL."
-msgstr ""
+msgstr "Pridėkite JOSM papildinių aprašo URL."
msgid "Enter URL"
msgstr "Įveskite URL"
@@ -11372,10 +11870,10 @@ msgid "Please select an entry."
msgstr ""
msgid "Edit JOSM Plugin description URL."
-msgstr ""
+msgstr "Taisykite JOSM papildinių aprašo URL."
msgid "JOSM Plugin description URL"
-msgstr ""
+msgstr "JOSM papildinių aprašo URL"
msgid "Ask before updating"
msgstr "Klausti prieš atnaujinant"
@@ -11390,6 +11888,8 @@ msgid ""
"Please decide whether JOSM shall automatically update active plugins at "
"startup after an update of JOSM itself."
msgstr ""
+"Nuspręskite, ar JOSM automatiškai atnaujins aktyvius papildinius paleidimo "
+"metu po JOSM atnaujinimo."
msgid "Update interval (in days):"
msgstr "Atnaujinimo intervalas (dienomis):"
@@ -11398,6 +11898,8 @@ msgid ""
"Please decide whether JOSM shall automatically update active plugins after a "
"certain period of time."
msgstr ""
+"Nuspręskite, ar JOSM automatiškai atnaujins aktyvius papildinius po tam "
+"tikro laiko."
msgid "By Code (EPSG)"
msgstr ""
@@ -11571,7 +12073,7 @@ msgid "North"
msgstr "Šiaurė"
msgid "South"
-msgstr "Peitūs"
+msgstr "Pietūs"
msgid "Hemisphere"
msgstr ""
@@ -11668,6 +12170,9 @@ msgid ""
"at<br>''{1}''. The server responded with the return code {0} instead of "
"200.<br>Please check the spelling of ''{1}'' and validate again.</html>"
msgstr ""
+"<html>Nepavyko nuskaityti pakeitimų sąrašo iš OSM API serverio<br>„{1}“. "
+"Serveris grąžino kodą {0} vietoje 200.<br>Patikrinkite „{1}“ rašybą ir "
+"bandykite vėl.</html>"
msgid ""
"<html>The OSM API server at ''{0}'' did not return a valid response.<br>It "
@@ -11700,7 +12205,7 @@ msgid ""
msgstr ""
msgid "OSM username:"
-msgstr "OSM vartotojo vardas:"
+msgstr "OSM naudotojas:"
msgid "OSM password:"
msgstr "OSM slaptažodis"
@@ -11720,6 +12225,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr "Tikrinimo intervalas (minutėmis):"
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -11762,7 +12275,7 @@ msgid "The API URL is valid."
msgstr "API URL teisingas."
msgid "Validation failed. The API URL seems to be invalid."
-msgstr ""
+msgstr "Tikrinimas nepavyko. Panašu, kad API URL neteisingas."
msgid "OSM API URL must not be empty. Please enter the OSM API URL."
msgstr ""
@@ -11949,7 +12462,7 @@ msgid "Checks for unnecessary tags"
msgstr ""
msgid "Wikipedia"
-msgstr "Wikipedia"
+msgstr "Vikipedija"
msgid "Checks for wrong wikipedia tags"
msgstr ""
@@ -12014,10 +12527,10 @@ msgid "Paste tags from buffer"
msgstr ""
msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
+msgstr "Naudoti ruošinį „{0}“ grupėje „{1}“"
msgid "Use preset ''{0}''"
-msgstr ""
+msgstr "Naudoti ruošinį „{0}“"
msgid "Elements of type {0} are supported."
msgstr ""
@@ -12026,7 +12539,7 @@ msgid "Edit also …"
msgstr "Taip pat redaguoti …"
msgid "Apply Preset"
-msgstr ""
+msgstr "Taikyti ruošinį"
msgid "New relation"
msgstr ""
@@ -12085,26 +12598,36 @@ msgid ""
"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
"elements are given."
msgstr ""
+"Įspėjimas žymėjimo ruošinyje „{0}-{1}“: Ignoruojamas „{2}“ atributas, nes "
+"duoti „{3}“ elementai."
msgid ""
"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
"not \"{2}\""
msgstr ""
+"Klaidingas žymėjimo ruošinys „{0}-{1}“ – Java metodas nurodytas "
+"„values_from“ nėra „{2}“"
msgid ""
"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
"threw {2} ({3})"
msgstr ""
+"Klaidingas žymėjimo ruošinys „{0}-{1}“ – Java metodas nurodytas "
+"„values_from“ sukėlė išimtinę situaciją {2} ({3})"
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
"must be the same as in ''values''"
msgstr ""
+"Klaidingas žymėjimo ruošinys „{0}-{1}“ – „display_values“ elementų skaičius "
+"privalo būti toks pat kaip „values“"
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
msgstr ""
+"Klaidingas žymėjimo ruošinys „{0}-{1}“ – „short_descriptions“ elementų "
+"skaičius privalo būti toks pat kaip „values“"
msgid "Unknown type: {0}"
msgstr ""
@@ -12131,16 +12654,16 @@ msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
-msgstr ""
+msgstr "Paieškos ruošinys"
msgid "Show preset search dialog"
-msgstr ""
+msgstr "Rodyti ruošinių paieškos dialogo langą"
msgid "Search presets"
-msgstr ""
+msgstr "Paieškos ruošiniai"
msgid "Search for objects by preset"
-msgstr ""
+msgstr "Ieškoti objektų pagal ruošinį"
msgid "Show only applicable to selection"
msgstr ""
@@ -12192,6 +12715,7 @@ msgid ""
"The current value is not a valid changeset ID. Please enter an integer value "
"> 0"
msgstr ""
+"Dabartinė reikšmė nėra teisingas pakeitimo ID. Įveskite sveikąjį skaičių > 0"
msgid "Add a new source to the list."
msgstr "Pridėti naują šaltinį į sąrašą."
@@ -12231,23 +12755,30 @@ msgstr ""
msgid ""
"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
msgstr ""
+"Neleistina ilgojo sveikojo skaičiaus privalomo atributo „{0}“ reikšmė. Gauta "
+"„{1}“."
msgid ""
"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
"''{1}''."
msgstr ""
+"Neleistina ilgojo sveikojo skaičiaus (>=0) privalomo atributo „{0}“ reikšmė. "
+"Gauta „{1}“."
msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
msgstr ""
+"Neleistina dvigubo slankiojo kablelio skaičiaus atributo „{0}“ reikšmė. "
+"Gauta „{1}“."
msgid ""
"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
+msgstr "Neleistina loginio atributo „{0}“ reikšmė. Gauta „{1}“."
msgid ""
"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
"''{1}''."
msgstr ""
+"Neleistina OsmPrimitiveType privalomo atributo „{0}“ reikšmė. Gauta „{1}“."
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
@@ -12310,6 +12841,8 @@ msgid ""
"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
+"Neleistina elemento „{1}“ atributo „{0}“ reikšmė serverio charakteristikose. "
+"Gauta „{2}“."
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -12318,6 +12851,8 @@ msgid ""
"Unexpected format of error header for conflict in changeset update. Got "
"''{0}''"
msgstr ""
+"Netikėtas pakeitimo atnaujinimo konflikto klaidos antraštės formatas. Gauta "
+"„{0}“"
msgid "Illegal longitude value for parameter ''{0}'', got {1}"
msgstr ""
@@ -12326,15 +12861,17 @@ msgid "Illegal latitude value for parameter ''{0}'', got {1}"
msgstr ""
msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
-msgstr ""
+msgstr "Netikėta „{0}“ reikšmė pakeitimų užklausos URL, gauta {1}"
msgid ""
"Cannot create a changeset query including both the query parameters ''uid'' "
"and ''display_name''"
msgstr ""
+"Negalima sukurti pakeitimų užklausos iš karto su abiem užklausos parametrais "
+"„uid“ ir „display_name“"
msgid "Unsupported parameter ''{0}'' in changeset query string"
-msgstr ""
+msgstr "Nepalaikomas parametras „{0}“ pakeitimų užklausoje"
msgid "Unexpected format for port number in preference ''{0}''. Got ''{1}''."
msgstr ""
@@ -12399,7 +12936,8 @@ msgid ""
"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
"tracks."
msgstr ""
-"Pastaba: GPL nesuderinama su OSM licenzija. Neįkelkite GLP licencijuotų kelių"
+"Pastaba: GPL nesuderinama su OSM licenzija. Neišsiųskite GPL licencijuotų "
+"kelių."
msgid "GPS track description"
msgstr ""
@@ -12481,11 +13019,12 @@ msgstr ""
msgid "You have {0} unread message."
msgid_plural "You have {0} unread messages."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Turite {0} neperskaitytą pranešimą."
+msgstr[1] "Turite {0} neperskaitytus pranešimus."
+msgstr[2] "Turite {0} neperskaitytų pranešimų."
msgid "Click here to see your inbox."
-msgstr ""
+msgstr "Spauskite čia gautiems pranešimams peržiūrėti"
msgid "Message notifier"
msgstr ""
@@ -12591,25 +13130,25 @@ msgid ""
msgstr ""
msgid "Creating changeset..."
-msgstr ""
+msgstr "Kuriamas pakeitimas..."
msgid "Successfully opened changeset {0}"
-msgstr ""
+msgstr "Sėkmingai atvertas pakeitimas {0}"
msgid "Changeset ID > 0 expected. Got {0}."
-msgstr ""
+msgstr "Tikėtasi pakeitimo ID > 0. Gauta {0}."
msgid "Updating changeset..."
-msgstr ""
+msgstr "Atnaujinamas pakeitimas..."
msgid "Updating changeset {0}..."
-msgstr ""
+msgstr "Atnaujinamas {0} pakeitimas..."
msgid "Closing changeset..."
-msgstr ""
+msgstr "Užveriamas pakeitimas..."
msgid "No changeset present for diff upload."
-msgstr ""
+msgstr "Nėra pakeitimo skirtumų išsiuntimui."
msgid "Preparing upload request..."
msgstr ""
@@ -12627,13 +13166,13 @@ msgid "Starting retry {0} of {1}."
msgstr ""
msgid "Current changeset is null. Cannot upload data."
-msgstr ""
+msgstr "Dabartinis pakeitimas yra nulis. Negalima išsiųsti duomenų."
msgid "ID of current changeset > 0 required. Current ID is {0}."
-msgstr ""
+msgstr "Reikalingas dabartinio pakeitimo ID > 0. Dabartinis ID yra {0}."
msgid "Open changeset expected. Got closed changeset with id {0}."
-msgstr ""
+msgstr "Tikėtasi atviro pakeitimo. Gautas užvertas pakeitimas su id {0}."
msgid "Note upload failed"
msgstr ""
@@ -12645,7 +13184,7 @@ msgid "Error encoding string: {0}"
msgstr ""
msgid "(Code={0})"
-msgstr "(Code={0})"
+msgstr "(Kodas={0})"
msgid "The server replied an error with code {0}."
msgstr ""
@@ -12678,6 +13217,8 @@ msgid ""
"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
+"Nepalaikomas pradžios elementas „{0}“ pakeitimo turinio pozicijoje "
+"({1},{2}). Praleidžiama."
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -12688,15 +13229,17 @@ msgid ""
"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
"Skipping."
msgstr ""
+"Nepalaikomas pabaigos elementas „{0}“ pakeitimo turinio pozicijoje "
+"({1},{2}). Praleidžiama."
msgid "Parsing changeset content ..."
-msgstr ""
+msgstr "Nagrinėjamas pakeitimo turinys..."
msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
msgstr ""
msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "Neleistina atributo „{0}“ reikšmė. Gauta „{1}“."
msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
msgstr ""
@@ -12708,7 +13251,7 @@ msgid "Undefined element ''{0}'' found in input stream. Aborting."
msgstr ""
msgid "Parsing list of changesets..."
-msgstr ""
+msgstr "Nagrinėjamas pakeitimų sąrašas..."
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
@@ -12760,7 +13303,7 @@ msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
msgstr ""
msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
-msgstr ""
+msgstr "Neleistina elemento <nd> atributo „ref“ reikšmė. Gauta „{0}“."
msgid "Deleted relation {0} contains members"
msgstr ""
@@ -12770,7 +13313,7 @@ msgstr ""
msgid ""
"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
-msgstr ""
+msgstr "Neleistina nario ryšyje {0} atributo „ref“ reikšmė. Gauta „{1}“."
msgid "Missing attribute ''type'' on member {0} in relation {1}."
msgstr ""
@@ -12778,6 +13321,7 @@ msgstr ""
msgid ""
"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
msgstr ""
+"Neleistina nario {0} ryšyje {1} atributo „type“ reikšmė. Gauta „{2}“."
msgid "Incomplete <member> specification with ref=0"
msgstr ""
@@ -12795,6 +13339,7 @@ msgid ""
"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
"{1}."
msgstr ""
+"Neleistina OSM primityvo su ID {0} atributo „version“ reikšmė. Gauta „{1}“."
msgid ""
"Normalizing value of attribute ''version'' of element {0} to {2}, API "
@@ -12811,9 +13356,11 @@ msgid ""
"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. "
"Resetting to 0."
msgstr ""
+"Neleistina atributo „changeset“ reikšmė naujam objektui {1}. Gauta {0}. "
+"Atstatoma į 0."
msgid "Illegal value for attribute ''changeset''. Got {0}."
-msgstr ""
+msgstr "Neleistina atributo „changeset“ reikšmė. Gauta {0}."
msgid "Missing required attribute ''{0}''."
msgstr ""
@@ -12831,7 +13378,7 @@ msgid "Parsing OSM data..."
msgstr "Nagrinėjami OSM duomenys..."
msgid "Preparing data set..."
-msgstr ""
+msgstr "Ruošiama duomenų aibė..."
msgid "Line {0} column {1}: "
msgstr "Eilutė {0} stulpelis {1}: "
@@ -12843,27 +13390,28 @@ msgid "Downloading referring relations ..."
msgstr ""
msgid "Reading changesets..."
-msgstr ""
+msgstr "Skaitomi pakeitimai..."
msgid "Downloading changesets ..."
-msgstr ""
+msgstr "Atsiunčiami pakeitimai..."
msgid "Reading changeset {0} ..."
-msgstr ""
+msgstr "Skaitomas {0} pakeitimas..."
msgid "Downloading changeset {0} ..."
-msgstr ""
+msgstr "Atsiunčiamas {0} pakeitimas..."
msgid "Downloading {0} changeset ..."
msgid_plural "Downloading {0} changesets ..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Atsiunčiamas {0} pakeitimas..."
+msgstr[1] "Atsiunčiami {0} pakeitimai..."
+msgstr[2] "Atsiunčiama {0} pakeitimų..."
msgid "({0}/{1}) Downloading changeset {2} ..."
-msgstr ""
+msgstr "({0}/{1}) Atsiunčiamas {2} pakeitimas..."
msgid "Downloading content for changeset {0} ..."
-msgstr ""
+msgstr "Atsiunčiamas pakeitimo {0} turinys..."
msgid "Downloading history..."
msgstr "Atsiunčiama istorija..."
@@ -12891,7 +13439,7 @@ msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
msgstr ""
msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
-msgstr ""
+msgstr "Neleistina XML žymos „{1}“ atributo „{0}“ reikšmė. Gauta „{2}“."
msgid "Reading user info ..."
msgstr "Skaitoma naudotojo informacija ..."
@@ -12900,13 +13448,13 @@ msgid "Starting to upload with one request per primitive ..."
msgstr ""
msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0} % ({1}/{2}), {3} liko. Išsiunčiamas taškas „{4}“ (id: {5})"
msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0} % ({1}/{2}), {3} liko. Išsiunčiamas kelias „{4}“ (id: {5})"
msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0} % ({1}/{2}), {3} liko. Išsiunčiamas ryšys „{4}“ (id: {5})"
msgid "Starting to upload in one request ..."
msgstr ""
@@ -12919,8 +13467,9 @@ msgstr ""
msgid "({0}/{1}) Uploading {2} object..."
msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "({0}/{1}) Išsiunčiamas {2} objektas..."
+msgstr[1] "({0}/{1}) Išsiunčiami {2} objektai..."
+msgstr[2] "({0}/{1}) Išsiunčiama {2} objektų..."
msgid "Uploading data ..."
msgstr "Išsiunčiami duomenys ..."
@@ -12951,19 +13500,19 @@ msgid "Old values of"
msgstr ""
msgid "Add tags to selected objects"
-msgstr ""
+msgstr "Pridėti žymas pažymėtiems objektams"
msgid "Add selected tags"
-msgstr ""
+msgstr "Pridėti pažymėtas žymas"
msgid "Add all tags"
-msgstr ""
+msgstr "Pridėti visas žymas"
msgid "Add checked tags to selected objects"
msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
-msgstr ""
+msgstr "Shift+Enter: Pridėti visas žymas pažymėtiems objektams"
msgid "Assume"
msgstr ""
@@ -12975,7 +13524,7 @@ msgid "Enable the checkbox to accept the value"
msgstr ""
msgid "Accept all tags from {0} for this session"
-msgstr ""
+msgstr "Priimti visas žymas iš {0} šiame seanse"
msgid "Load data from API"
msgstr "Įkelti duomenis iš API"
@@ -12987,13 +13536,13 @@ msgid "Open local files"
msgstr "Atverti vietinius failus"
msgid "Load imagery layers"
-msgstr ""
+msgstr "Įkelti vaizdų sluoksnius"
msgid "Change the selection"
msgstr ""
msgid "Change the viewport"
-msgstr ""
+msgstr "Keisti matomą plotą"
msgid "Create new objects"
msgstr "Sukurti naujus objektus"
@@ -13048,10 +13597,10 @@ msgstr ""
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
-msgstr ""
+msgstr "Per nuotolinį valdymą prašoma įkelti vaizdų sluoksnį iš šio URL:"
msgid "Remote imagery"
-msgstr ""
+msgstr "Nuotoliniai vaizdai"
msgid "Remote Control has been asked to import data from the following URL:"
msgstr ""
@@ -13105,19 +13654,19 @@ msgid "local file"
msgstr "vietinis failas"
msgid "Link to a GPX file on your local disk."
-msgstr ""
+msgstr "Nuoroda į GPX failą vietiniame diske."
msgid "include"
msgstr ""
msgid "Include GPX data in the .joz session file."
-msgstr ""
+msgstr "Įtraukti GPX duomenis į .joz seanso failą."
msgid "No file association"
msgstr ""
msgid "GPX data will be included in the session file."
-msgstr ""
+msgstr "GPX duomenys bus įtraukti į seanso failą."
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
@@ -13131,6 +13680,7 @@ msgid ""
"Version ''{0}'' of meta data for imagery layer is not supported. Expected: "
"0.1"
msgstr ""
+"Vaizdų sluoksnio meta duomenų versija „{0}“ nepalaikoma. Tikėtasi: 0.1"
msgid ""
"Version ''{0}'' of meta data for marker layer is not supported. Expected: 0.1"
@@ -13143,13 +13693,13 @@ msgid "Layer does not contain unsaved data."
msgstr ""
msgid "Link to a OSM data file on your local disk."
-msgstr ""
+msgstr "Nuoroda į GPX failą vietiniame diske."
msgid "Include OSM data in the .joz session file."
-msgstr ""
+msgstr "Įtraukti OSM duomenis į .joz seanso failą."
msgid "OSM data will be included in the session file."
-msgstr ""
+msgstr "OSM duomenys bus įtraukti į seanso failą."
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
@@ -13157,7 +13707,7 @@ msgid ""
msgstr ""
msgid "Session file (*.jos, *.joz)"
-msgstr "Sesijos failas (*.jos, *.joz)"
+msgstr "Seanso failas (*.jos, *.joz)"
msgid "Unable to locate file ''{0}''."
msgstr "Nepavyko rasti failo „{0}“."
@@ -13166,10 +13716,10 @@ msgid "Unsupported scheme ''{0}'' in URI ''{1}''."
msgstr ""
msgid "Unexpected root element ''{0}'' in session file"
-msgstr ""
+msgstr "Netikėtas pagrindinis elementas „{0}“ seanso faile"
msgid "Version ''{0}'' of session file is not supported. Expected: 0.1"
-msgstr ""
+msgstr "Seanso failo versija „{0}“ nepalaikoma. Tikėtasi: 0.1"
msgid "missing mandatory attribute ''index'' for element ''layer''"
msgstr ""
@@ -13222,7 +13772,7 @@ msgid "Skip Download"
msgstr "Praleisti atsiuntimą"
msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
+msgstr "Papildiniui {1} reikalinga JOSM versija {0}."
msgid "Download skipped"
msgstr "Atsiuntimas praleistas"
@@ -13231,26 +13781,30 @@ msgid ""
"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
"download."
msgstr ""
+"Nepavyko atsiųsti papildinio „{0}“. Jo atsiuntimo nuoroda nežinoma. "
+"Atsiuntimas praleidžiamas."
msgid ""
"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
"URL. Skipping download."
msgstr ""
+"Nepavyko atsiųsti papildinio „{0}“. Jo atsiuntimo nuoroda „{1}“ neteisingas "
+"URL. Atsiuntimas praleidžiamas."
msgid "Failed to create plugin directory ''{0}''"
-msgstr ""
+msgstr "Nepavyko sukurti papildinių aplanko „{0}“"
msgid "Downloading Plugin {0}..."
msgstr "Atsiunčiamas papildinys {0}..."
msgid "An error occurred in plugin {0}"
-msgstr ""
+msgstr "Papildinyje „{0}“ įvyko klaida"
msgid "integrated into main program"
msgstr ""
msgid "replaced by new {0} plugin"
-msgstr ""
+msgstr "pakeista nauju {0} papildiniu"
msgid "no longer required"
msgstr "nebereikalingas"
@@ -13258,54 +13812,68 @@ msgstr "nebereikalingas"
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Šis papildinys daugiau nebereikalingas ir buvo deaktyvintas:"
+msgstr[1] "Šie papildiniai daugiau nebereikalingi ir buvo deaktyvinti:"
+msgstr[2] "Šie papildiniai daugiau nebereikalingi ir buvo deaktyvinti:"
msgid ""
"<html>Loading of the plugin \"{0}\" was requested.<br>This plugin is no "
"longer developed and very likely will produce errors.<br>It should be "
"disabled.<br>Delete from preferences?</html>"
msgstr ""
+"<html>Užklausta įkelti papildinį „{0}“.<br>Šis papildinys daugiau "
+"neplėtojamas ir greičiausiai sukels klaidų.<br>Jis turėtų būti "
+"išjungtas.<br>Pašalinti iš nuostatų?</html>"
msgid "Plugin update"
-msgstr ""
+msgstr "Papildinio atnaujinimas"
msgid ""
"You updated your JOSM software.<br>To prevent problems the plugins should be "
"updated as well.<br><br>Update plugins now?"
msgstr ""
+"Atnaujinote JOSM programinę įrangą.<br>Problemoms išvengti papildiniai taip "
+"pat turėtų būti atnaujinti.<br><br>Atnaujinti papildinius dabar?"
msgid "Last plugin update more than {0} days ago."
-msgstr ""
+msgstr "Paskutinis papildinių atnaujinimas daugiau kaip prieš {0} d."
msgid "Click to update the activated plugins"
-msgstr ""
+msgstr "Spauskite aktyviems papildiniams atnaujinti"
msgid "Skip update"
msgstr "Praleisti atnaujinimą"
msgid "Click to skip updating the activated plugins"
-msgstr ""
+msgstr "Spauskite aktyvių papildinių atnaujinimui praleisti"
msgid ""
"Skipping plugin update after JOSM upgrade. Automatic update at startup is "
"disabled."
msgstr ""
+"Praleidžiamas papildinių atnaujinimas po JOSM atnaujinimo. Automatinis "
+"atnaujinimas paleidimo metu išjungtas."
msgid ""
"Skipping plugin update after elapsed update interval. Automatic update at "
"startup is disabled."
msgstr ""
+"Praleidžiamas papildinių atnaujinimas po suėjusio termino. Automatinis "
+"atnaujinimas paleidimo metu išjungtas."
msgid ""
"Running plugin update after JOSM upgrade. Automatic update at startup is "
"enabled."
msgstr ""
+"Vykdomas papildinių atnaujinimas po JOSM atnaujinimo. Automatinis "
+"atnaujinimas paleidimo metu įjungtas."
msgid ""
"Running plugin update after elapsed update interval. Automatic update at "
"startup is disabled."
msgstr ""
+"Vykdomas papildinių atnaujinimas po suėjusio termino. Automatinis "
+"atnaujinimas paleidimo metu įjungtas."
msgid ""
"Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''."
@@ -13317,56 +13885,67 @@ msgid_plural ""
"Plugin {0} requires {1} plugins which were not found. The missing plugins "
"are:"
msgstr[0] ""
+"Papildiniui {0} reikalingas nerastas papildinys. Trūkstamas papildinys:"
msgstr[1] ""
+"Papildiniui {0} reikalingi {1} nerasti papildiniai. Trūkstami papildiniai:"
+msgstr[2] ""
+"Papildiniui {0} reikalingi {1} nerastų papildinių. Trūkstami papildiniai:"
msgid ""
"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
msgstr ""
+"<html>Papildiniui {0} reikalinga JOSM {1} versija. Dabartinė JOSM versija "
+"yra {2}.<br>Turite atnaujinti JOSM, jei norite naudoti šį papildinį.</html>"
msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr ""
+msgstr "Nepavyko įkelti papildinio {0}. Pašalinti iš nuostatų?"
msgid "loading plugin ''{0}'' (version {1})"
-msgstr ""
+msgstr "įkeliamas papildinys „{0}“ (versija {1})"
msgid ""
"<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was "
"not found.<br>Delete from preferences?</html>"
msgstr ""
+"<html>Nepavyko įkelti papildinio {0}m nes papildinio<br>pagrindinė klasė "
+"„{1}“ nerasta.<br>Pašalinti iš nuostatų?</html>"
msgid "Loading plugins ..."
-msgstr "Įkeliami papildiniai ..."
+msgstr "Įkeliami papildiniai..."
msgid "Checking plugin preconditions..."
-msgstr ""
+msgstr "Tikrinami papildinių priešsąlygiai..."
msgid "Loading plugin ''{0}''..."
msgstr "Įkeliamas papildinys „{0}“..."
msgid "JOSM could not find information about the following plugin:"
msgid_plural "JOSM could not find information about the following plugins:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "JOSM nepavyko rasti informacijos apie šį papildinį:"
+msgstr[1] "JOSM nepavyko rasti informacijos apie šiuos papildinius:"
+msgstr[2] "JOSM nepavyko rasti informacijos apie šiuos papildinius:"
msgid "The plugin is not going to be loaded."
msgid_plural "The plugins are not going to be loaded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Papildinys nebus įkeltas."
+msgstr[1] "Papildiniai nebus įkelti."
+msgstr[2] "Papildiniai nebus įkelti."
msgid "Determine plugins to load..."
-msgstr ""
+msgstr "Nustatyti papildinius įkėlimui..."
msgid "Removing deprecated plugins..."
-msgstr ""
+msgstr "Šalinami nebenaudojami papildiniai..."
msgid "Removing unmaintained plugins..."
-msgstr ""
+msgstr "Šalinami neprižiūrimi papildiniai..."
msgid "Updating the following plugin has failed:"
msgid_plural "Updating the following plugins has failed:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Šio papildinio atnaujinimas nepavyko:"
+msgstr[1] "Šių papildinių atnaujinimas nepavyko:"
+msgstr[2] "Šių papildinių atnaujinimas nepavyko:"
msgid ""
"Please open the Preference Dialog after JOSM has started and try to update "
@@ -13378,67 +13957,75 @@ msgstr[0] ""
msgstr[1] ""
msgid "Plugin update failed"
-msgstr ""
+msgstr "Papildinio atnaujinimas nepavyko"
msgid "Failed to find plugin {0}"
-msgstr ""
+msgstr "Nepavyko rasti papildinio {0}"
msgid "Failed to download plugin information list"
-msgstr ""
+msgstr "Nepavyko atsiųsti papildinių informacijos sąrašo"
msgid "Disable plugin"
msgstr "Išjungti papildinį"
msgid "Click to delete the plugin ''{0}''"
-msgstr ""
+msgstr "Spauskite papildiniui „{0}“ pašalinti"
msgid "Keep plugin"
msgstr "Palikti papildinį"
msgid "Click to keep the plugin ''{0}''"
-msgstr ""
+msgstr "Spauskite papildiniui „{0}“ palikti"
msgid "Failed to delete outdated plugin ''{0}''."
-msgstr ""
+msgstr "Nepavyko pašalinti pasenusio papildinio „{0}“."
msgid ""
"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
"JOSM is still going to load the old plugin version."
msgstr ""
+"Nepavyko įdiegti jau parsiųsto papildinio „{0}“. Įdiegimas praleidžiamas. "
+"JOSM įkels seną papildinio versiją."
msgid ""
"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
+"Nepavyko įdiegti papildinio „{0}“ iš laikino atsiuntimo failo „{1}“. {2}"
msgid ""
"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
"Renaming failed."
msgstr ""
+"Nepavyko įdiegti papildinio „{0}“ iš laikino atsiuntimo failo „{1}“. "
+"Nepavyko pervadinti."
msgid "Update plugin"
msgstr "Atnaujinti papildinį"
msgid "Click to update the plugin ''{0}''"
-msgstr ""
+msgstr "Spauskite papildiniui „{0}“ atnaujinti"
msgid "Click to disable the plugin ''{0}''"
-msgstr ""
+msgstr "Spauskite papildiniui „{0}“ išjungti"
msgid ""
"An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr ""
+msgstr "Įvyko išimtinė situacija, kurią galėjo sukelti papildinys „{0}“."
msgid "According to the information within the plugin, the author is {0}."
-msgstr ""
+msgstr "Pagal papildinio informaciją jo autorius yra {0}."
msgid ""
"Try updating to the newest version of this plugin before reporting a bug."
msgstr ""
+"Pamėginkite atnaujinti į naujausią versiją prieš pranešdami apie klaidą."
msgid ""
"The plugin has been removed from the configuration. Please restart JOSM to "
"unload the plugin."
msgstr ""
+"Papildinys buvo pašalintas iš konfigūracijos. Paleiskite JOSM iš naujo "
+"papildiniui iškelti."
msgid "Plugin information"
msgstr "Papildinio informacija"
@@ -13450,24 +14037,26 @@ msgid ""
"Do not ask again and remember my decision (go to Preferences->Plugins to "
"change it later)"
msgstr ""
+"Daugiau neklausti ir prisiminti sprendimą (jei norėsite pakeisti, eikite į "
+"Nuostatos->Papildiniai)"
msgid "Invalid jar file ''{0}''"
msgstr "Netinkamas jar failas „{0}“"
msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr ""
+msgstr "Papildinio failas „{0}“ neturi manifesto."
msgid "Invalid URL ''{0}'' in plugin {1}"
-msgstr ""
+msgstr "Neteisingas URL „{0}“ papildinyje {1}"
msgid "Invalid plugin description ''{0}'' in plugin {1}"
-msgstr ""
+msgstr "Neteisingas papildinio aprašas „{0}“ papildinyje {1}"
msgid "Invalid plugin main version ''{0}'' in plugin {1}"
-msgstr ""
+msgstr "Neteisinga papildinio pagrindinė versija „{0}“ papildinyje {1}"
msgid "Missing plugin main version in plugin {0}"
-msgstr ""
+msgstr "Trūksta papildinio pagrindinės versijos papildinyje {0}"
msgid "More info..."
msgstr "Daugiau informacijos..."
@@ -13477,21 +14066,23 @@ msgstr "<b>Papildinys pateiktas išorinio šaltinio:</b> {0}"
msgid "Failed to create plugin information from manifest for plugin ''{0}''"
msgstr ""
+"Nepavyko sukurti papildinio informacijos iš papildinio „{0}“ manifesto"
msgid "Illegal entry in plugin list."
-msgstr ""
+msgstr "Neleistinas įrašas papildinių sąraše."
msgid "Reading local plugin information.."
-msgstr ""
+msgstr "Skaitoma vietinė papildinių informacija..."
msgid "Processing plugin site cache files..."
-msgstr ""
+msgstr "Apdorojami papildinių svetainių podėlio failai..."
msgid "Processing file ''{0}''"
msgstr "Apdorojamas failas „{0}“"
msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
+"Nepavyko peržiūrėti failo „{0}“ papildinio informacijai. Praleidžiama."
msgid "Processing plugin files..."
msgstr "Apdorojami papildinių failai..."
@@ -13503,10 +14094,10 @@ msgid "Downloading plugin list from ''{0}''"
msgstr "Atsiunčiamas papildinių sąrašas iš „{0}“"
msgid "Plugin list download error"
-msgstr ""
+msgstr "Papildinių sąrašo atsiuntimo klaida"
msgid "JOSM failed to download plugin list:"
-msgstr ""
+msgstr "JOSM nepavyko atsiųsti papildinių sąrašo:"
msgid "Details:"
msgstr "Išsamiau:"
@@ -13515,20 +14106,24 @@ msgid ""
"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
"plugin site ''{1}''."
msgstr ""
+"Nepavyko sukurti papildinių aplanko „{0}“. Nepavyko įtraukti papildinių "
+"sąrašo iš papildinių svetainės „{1}“ į podėlį."
msgid "Writing plugin list to local cache ''{0}''"
-msgstr ""
+msgstr "Rašomas papildinių sąrašas į vietinį podėlį „{0}“"
msgid "Parsing plugin list from site ''{0}''"
-msgstr ""
+msgstr "Nagrinėjamas papildinių sąrašas iš svetainės „{0}“"
msgid ""
"Failed to parse plugin list document from site ''{0}''. Skipping site. "
"Exception was: {1}"
msgstr ""
+"Nepavyko išnagrinėti papildinių sąrašo dokumento iš svetainės „{0}“. "
+"Svetainė praleidžiama. Išimtinė situacija buvo: {1}"
msgid "Processing plugin list from site ''{0}''"
-msgstr ""
+msgstr "Apdorojamas papildinių sąrašas iš svetainės „{0}“"
msgid "This is after the end of the recording"
msgstr ""
@@ -13543,13 +14138,15 @@ msgid "Do nothing"
msgstr "Nieko nedaryti"
msgid "Report Bug"
-msgstr "Praneti apie Klaidą"
+msgstr "Pranešti apie klaidą"
msgid ""
"An unexpected exception occurred.<br>This is always a coding error. If you "
"are running the latest<br>version of JOSM, please consider being kind and "
"file a bug report."
msgstr ""
+"Įvyko išimtinė situacija.<br>Tai visuomet programavimo klaida. Jei naudojate "
+"naujausią<br>JOSM versiją, praneškite apie klaidą."
msgid "Update JOSM"
msgstr ""
@@ -13561,12 +14158,16 @@ msgid ""
"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
"bug report."
msgstr ""
+"Įvyko išimtinė situacija.<br>Tai visuomet programavimo klaida.<br><br>Tačiau "
+"jūs naudojate seną JOSM versiją ({0}),<br>vietoje dabartinės ištestuotos "
+"versijos (<b>{1}</b>).<br><br><b>Atnaujinkite JOSM</b> prieš pranešdami apie "
+"klaidą."
msgid "Unexpected Exception"
msgstr ""
msgid "Suppress further error dialogs for this session."
-msgstr ""
+msgstr "Nerodyti kitų klaidos dialogų langų šiame seanse."
msgid ""
"You have encountered an error in JOSM. Before you file a bug report make "
@@ -13577,6 +14178,8 @@ msgid ""
"You should also update your plugins. If neither of those help please file a "
"bug report in our bugtracker using this link:"
msgstr ""
+"Taip pat turėtumėte atnaujinti papildinius. Jei niekas nepadeda, praneškite "
+"apie klaidą mūsų klaidų sekimo sistemoje:"
msgid ""
"There the error information provided below should already be filled in for "
@@ -13758,11 +14361,15 @@ msgid ""
"<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
"already been closed."
msgstr ""
+"<html>Nepavyko užverti <strong>{0}</strong> pakeitimo,<br>nes jis jau "
+"užvertas."
msgid ""
"<html>Closing of changeset <strong>{0}</strong> failed<br> because it has "
"already been closed on {1}."
msgstr ""
+"<html>Nepavyko užverti <strong>{0}</strong> pakeitimo,<br>nes jis jau "
+"užvertas {1}."
msgid ""
"<html>The server reported that it has detected a conflict.<br>Error message "
@@ -13776,6 +14383,8 @@ msgid ""
"<html>Failed to upload to changeset <strong>{0}</strong><br>because it has "
"already been closed on {1}."
msgstr ""
+"<html>Nepavyko išsiųsti į <strong>{0}</strong> pakeitimą,<br>nes jis jau "
+"užvertas {1}."
msgid ""
"<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
@@ -13814,6 +14423,9 @@ msgid ""
"large.<br>Either request a smaller area or use an export file provided by "
"the OSM community."
msgstr ""
+"Plotas, kurį bandėte atsiųsti, yra per didelis arba jūsų užklausa per "
+"didelė.<br>Užklauskite mažesnio ploto arba naudokite eksporto failą, "
+"pateiktą OSM bendruomenės."
msgid "<br>Error message(untranslated): {0}"
msgstr ""
@@ -13963,7 +14575,7 @@ msgid "Value is too long (max {0} characters):"
msgstr ""
msgid "Do you want to paste these tags?"
-msgstr ""
+msgstr "Ar norite įdėti šias žymas?"
msgid "Clear buffer"
msgstr "Išvalyti buferį"
@@ -14092,7 +14704,7 @@ msgstr "miškas"
msgctxt "landuse"
msgid "meadow"
-msgstr ""
+msgstr "pieva"
msgctxt "landuse"
msgid "farmland"
@@ -14100,11 +14712,11 @@ msgstr "dirbama žemė"
msgctxt "landuse"
msgid "residential"
-msgstr "givenamasis rajonas"
+msgstr "gyvenamasis"
msgctxt "natural"
msgid "scrub"
-msgstr "krumynai"
+msgstr "krūmynai"
msgctxt "Relation type"
msgid "associatedStreet"
@@ -14140,7 +14752,7 @@ msgstr "viešasis_transportas"
msgctxt "Relation type"
msgid "restriction"
-msgstr "apribojinai"
+msgstr "apribojimas"
msgctxt "Relation type"
msgid "route"
@@ -14204,7 +14816,7 @@ msgstr "gyvenvietė"
msgctxt "Place type"
msgid "suburb"
-msgstr "priemestis"
+msgstr "priemiestis"
msgid "All Files"
msgstr "Visus Failus"
@@ -14234,13 +14846,13 @@ msgid "Error "
msgstr "Klaida "
msgid "Error renaming file \"{0}\" to \"{1}\""
-msgstr "Klaida pervadinant faila \"{0}\" į \"{1}\""
+msgstr "Klaida pervadinant failą „{0}“ į „{1}“"
msgid "File name:"
-msgstr "Failo vardas:"
+msgstr "Failo pavadinimas:"
msgid "File Name:"
-msgstr "Failo Vardas:"
+msgstr "Failo pavadinimas:"
msgid "FileChooser help."
msgstr ""
@@ -14452,6 +15064,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14555,6 +15170,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14682,6 +15300,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14917,7 +15538,7 @@ msgid "Slovakia Historic Maps"
msgstr ""
msgid "RABA-KGZ: Slovenia farmland use"
-msgstr ""
+msgstr "RABA-KGZ: Slovėnijos dirbamos žemės naudojimas"
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
@@ -15304,11 +15925,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15325,7 +15941,7 @@ msgid ""
msgstr ""
msgid "Tools for drawing buildings."
-msgstr ""
+msgstr "Įrankiai pastatų braižymui."
msgid "A special handler for the French land registry WMS server."
msgstr ""
@@ -15376,7 +15992,7 @@ msgid ""
msgstr ""
msgid "Downloads OSM data along a way"
-msgstr ""
+msgstr "Atsiunčia OSM duomenis palei kelią"
msgid ""
"Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -15416,7 +16032,7 @@ msgid ""
msgstr ""
msgid "Allows to filter out unnecessary GPS tracks"
-msgstr ""
+msgstr "Leidžia išfiltruoti nereikalingus GPS pėdsakus"
msgid "Visualizes routing information as a routing graph."
msgstr ""
@@ -15431,6 +16047,8 @@ msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
msgstr ""
+"Vaizdų poslinkių duomenų bazė: dalinkitės ir gaukite vaizdų poslinkius vienu "
+"mygtuku."
msgid "WMSPlugin-style imagery adjustment mapmode"
msgstr ""
@@ -15439,6 +16057,8 @@ msgid ""
"This experimental plugin allows JOSM to store tile cache in database files, "
"not in huge cache directories"
msgstr ""
+"Šis eksperimentinis papildinys leidžia JOSM saugoti podėlį duomenų bazės "
+"failuose, o ne dideliuose podėlio aplankuose"
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -15591,7 +16211,7 @@ msgid "Relation and multipolygon creating and editing panel."
msgstr ""
msgid "Plugin for reverting changesets"
-msgstr ""
+msgstr "Papildinys pakeitimų grąžinimui"
msgid ""
"Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -15625,6 +16245,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15840,7 +16465,7 @@ msgid "Lanes"
msgstr "Linijos"
msgid "Max. speed (km/h)"
-msgstr "Ribots greitis (km/h)"
+msgstr "Greičio riba (km/h)"
msgid "Bridge"
msgstr "Tiltas"
@@ -16013,7 +16638,7 @@ msgid ""
msgstr "Pr-Sk 08:00-18:00; Bal 10-15 ne; Bir 08:00-14:00; Rgp ne; Grd 25 ne"
msgid "sunrise-sunset"
-msgstr "saulėtėkis-saulėlydis"
+msgstr "saulėtekis-saulėlydis"
msgid "Su 10:00+"
msgstr "Sk 10:00+"
@@ -16197,7 +16822,7 @@ msgstr ""
msgctxt "sport"
msgid "shooting"
-msgstr ""
+msgstr "šaudymas"
msgctxt "sport"
msgid "skateboard"
@@ -16205,7 +16830,7 @@ msgstr ""
msgctxt "sport"
msgid "skating"
-msgstr ""
+msgstr "čiuožimas"
msgctxt "sport"
msgid "soccer"
@@ -16213,7 +16838,7 @@ msgstr ""
msgctxt "sport"
msgid "swimming"
-msgstr ""
+msgstr "plaukimas"
msgctxt "sport"
msgid "table_tennis"
@@ -16329,15 +16954,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -16360,7 +17004,7 @@ msgid "muslim"
msgstr ""
msgid "shinto"
-msgstr ""
+msgstr "sintoizmas"
msgid "sikh"
msgstr ""
@@ -16521,7 +17165,7 @@ msgid "compressed air"
msgstr "suslėgtas oras"
msgid "steam"
-msgstr "grai"
+msgstr "garai"
msgid "vacuum"
msgstr "vakuumas"
@@ -16796,7 +17440,7 @@ msgid "Agricultural"
msgstr "Žemdirbystės"
msgid "Emergency vehicles"
-msgstr "Specialejam transportui"
+msgstr "Specialiajam transportui"
msgid "High-occupancy vehicles (hov)"
msgstr ""
@@ -17442,7 +18086,7 @@ msgid "Culvert"
msgstr "Pralaida"
msgid "Basin"
-msgstr "Telkinys"
+msgstr "Prūdas"
msgid "Reservoir"
msgstr "Tvenkinys"
@@ -17530,7 +18174,7 @@ msgid "A flat area of sand, gravel or pebble next to water."
msgstr ""
msgid "swimming"
-msgstr ""
+msgstr "plaukimas"
msgid "surfing"
msgstr ""
@@ -17585,6 +18229,12 @@ msgstr "Kelto maršrutas"
msgid "Marina"
msgstr "Valčių prieplauka"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr "Molas"
@@ -17619,7 +18269,7 @@ msgid "branch"
msgstr "atšaka"
msgid "industrial"
-msgstr "industinis"
+msgstr "industrinis"
msgid "military"
msgstr "karinis"
@@ -17909,10 +18559,10 @@ msgid "Fuel types:"
msgstr "Kuro tipas:"
msgid "Diesel"
-msgstr "Diselinas"
+msgstr "Dyzelis"
msgid "Bio Diesel"
-msgstr "Biodiselinas"
+msgstr "Biodyzelis"
msgid "Diesel (Gas To Liquid - ultimate diesel)"
msgstr ""
@@ -17969,7 +18619,7 @@ msgid "UTA"
msgstr ""
msgid "Charging Station"
-msgstr ""
+msgstr "Įkrovos stotelė"
msgid "Voltage"
msgstr "Įtampa"
@@ -17978,11 +18628,17 @@ msgid "Amperage"
msgstr "Srovė"
msgid "Wash"
-msgstr "Plovyla"
+msgstr "Plovykla"
msgid "Car Dealer"
msgstr "Automobilių prekiautojas"
+msgid "Second hand"
+msgstr "Panaudoti"
+
+msgid "only"
+msgstr "tik"
+
msgid "Repair"
msgstr "Remontas"
@@ -17995,12 +18651,6 @@ msgstr ""
msgid "Rental"
msgstr "Nuoma"
-msgid "Second hand"
-msgstr "Panaudoti"
-
-msgid "only"
-msgstr "tik"
-
msgid "Sharing"
msgstr ""
@@ -18210,6 +18860,9 @@ msgstr "Sustojimo vieta"
msgid "Platform"
msgstr "Platforma"
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -18263,10 +18916,7 @@ msgid "Station"
msgstr "Stotis"
msgid "Building"
-msgstr "Pasatatas"
-
-msgid "Subway Entrance"
-msgstr ""
+msgstr "Pastatas"
msgid "Ticket Machine"
msgstr ""
@@ -18326,7 +18976,7 @@ msgid "Bus Platform"
msgstr "Autobusų platforma"
msgid "Taxi"
-msgstr "Taxi"
+msgstr "Taksi"
msgid "Airport"
msgstr "Aerouostas"
@@ -18341,7 +18991,7 @@ msgid "ICAO"
msgstr "ICAO"
msgid "Runway"
-msgstr "Pakilmo/Nusileidimo takas"
+msgstr "Kilimo/leidimosi takas"
msgid "Taxiway"
msgstr ""
@@ -18356,11 +19006,11 @@ msgid "Plane Parking Position"
msgstr ""
msgid "Hangar"
-msgstr ""
+msgstr "Angaras"
msgctxt "building"
msgid "hangar"
-msgstr ""
+msgstr "angaras"
msgctxt "building"
msgid "yes"
@@ -18386,7 +19036,7 @@ msgid "Accommodation"
msgstr "Apgyvendinimas"
msgid "Hotel"
-msgstr "Viešbūtis"
+msgstr "Viešbutis"
msgid "Stars"
msgstr "Žvaigždės"
@@ -18394,7 +19044,7 @@ msgstr "Žvaigždės"
msgid "Motel"
msgstr "Motelis"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18413,7 +19063,7 @@ msgid "Number of places"
msgstr "Vietų skaičius"
msgid "Power supply"
-msgstr ""
+msgstr "Elektros tiekimas"
msgid "Tents allowed"
msgstr ""
@@ -18422,7 +19072,7 @@ msgid "Camping Site"
msgstr ""
msgid "Food+Drinks"
-msgstr ""
+msgstr "Maistas+Gėrimai"
msgid "Restaurant"
msgstr "Restoranas"
@@ -18473,7 +19123,7 @@ msgid "japanese"
msgstr "japonų"
msgid "french"
-msgstr "prancuzų"
+msgstr "prancūzų"
msgid "sandwich"
msgstr "sumuštiniai"
@@ -18515,25 +19165,25 @@ msgid "Bar"
msgstr "Baras"
msgid "Night Club"
-msgstr ""
+msgstr "Naktinis klubas"
msgid "Strip Club"
-msgstr ""
+msgstr "Striptizo klubas"
msgid "Tourism"
-msgstr ""
+msgstr "Turizmas"
msgid "Attraction"
-msgstr ""
+msgstr "Lankoma vieta"
msgid "Viewpoint"
-msgstr ""
+msgstr "Apžvalgos taškas"
msgid "Look-Out Tower"
msgstr ""
msgid "Information Office"
-msgstr ""
+msgstr "Informacijos biuras"
msgid "An office where you can get information about a town or region."
msgstr ""
@@ -18587,7 +19237,7 @@ msgid "Mountainbiking"
msgstr ""
msgid "Skiing"
-msgstr ""
+msgstr "Slidinėjimas"
msgid "Riding"
msgstr ""
@@ -18596,7 +19246,7 @@ msgid "... other transportation modes possible"
msgstr ""
msgid "Information Board"
-msgstr ""
+msgstr "Informacijos lenta"
msgid "A board with information."
msgstr ""
@@ -18608,7 +19258,7 @@ msgid "notice"
msgstr ""
msgid "history"
-msgstr ""
+msgstr "istorija"
msgid "nature"
msgstr ""
@@ -18623,26 +19273,26 @@ msgid "geology"
msgstr ""
msgid "Guidepost"
-msgstr ""
+msgstr "Rodyklės stulpelis"
msgid ""
"A Signpost/Guidepost to indicate the directions to different destinations."
-msgstr ""
+msgstr "Kelrodis/rodyklės stulpelis krypčiai į įvairias vietas parodyti"
msgid "Information Terminal"
-msgstr ""
+msgstr "Informacijos terminalas"
msgid "Information access via electronic methods."
-msgstr ""
+msgstr "Prieiga prie informacijos elektroniniais metodais."
msgid "Closer description"
msgstr ""
msgid "Audio Guide"
-msgstr ""
+msgstr "Audio gidas"
msgid "Information using headphones or a mobile phone."
-msgstr ""
+msgstr "Informacija naudojant ausines ar mobilų telefoną."
msgid "Audioguide via mobile phone?"
msgstr ""
@@ -18651,13 +19301,13 @@ msgid "Phone number"
msgstr ""
msgid "Other Information Point"
-msgstr ""
+msgstr "Kitas informacijos taškas"
msgid "Leisure"
-msgstr ""
+msgstr "Laisvalaikis"
msgid "Movie Theater/Cinema"
-msgstr ""
+msgstr "Kino teatras"
msgid "Drive-in theater"
msgstr ""
@@ -18672,10 +19322,10 @@ msgid "Minimum age"
msgstr ""
msgid "Zoo"
-msgstr "Zoologijis sodas"
+msgstr "Zoologijos sodas"
msgid "Dog Park"
-msgstr ""
+msgstr "Šunų parkas"
msgid "fence"
msgstr "tvora"
@@ -18684,7 +19334,7 @@ msgid "wall"
msgstr "siena"
msgid "Amusement/Theme Park"
-msgstr ""
+msgstr "Pramogos/Pramogų parkas"
msgid "Water Park"
msgstr "Vandens parkas"
@@ -18693,25 +19343,25 @@ msgid "Sauna"
msgstr "Sauna"
msgid "Horse Riding"
-msgstr ""
+msgstr "Jodinėjimas"
msgid "Brothel"
-msgstr ""
+msgstr "Viešnamis"
msgid "Playground"
msgstr "Žaidimų aikštelė"
msgid "Picnic Site"
-msgstr ""
+msgstr "Pikniko vieta"
msgid "Fireplace"
msgstr "Ugniavietė"
msgid "Picnic Table"
-msgstr ""
+msgstr "Pikniko stalas"
msgid "Public Grill"
-msgstr ""
+msgstr "Viešasis grilis"
msgctxt "grill"
msgid "Fuel"
@@ -18724,13 +19374,13 @@ msgid "Firepit"
msgstr ""
msgid "Fishing"
-msgstr ""
+msgstr "Žvejyba"
msgid "Private Swimming Pool"
-msgstr ""
+msgstr "Privatus plaukimo baseinas"
msgid "Culture"
-msgstr ""
+msgstr "Kultūra"
msgid "Museum"
msgstr "Muziejus"
@@ -18769,28 +19419,28 @@ msgid "video"
msgstr "vaizdas"
msgid "Place of Worship"
-msgstr ""
+msgstr "Šventykla"
msgid "Church"
-msgstr ""
+msgstr "Bažnyčia"
msgid "Building type"
-msgstr ""
+msgstr "Pastato tipas"
msgid "basilica"
-msgstr ""
+msgstr "bazilika"
msgid "cathedral"
-msgstr ""
+msgstr "katedra"
msgid "chapel"
-msgstr ""
+msgstr "koplyčia"
msgid "church"
msgstr "bažnyčia"
msgid "temple"
-msgstr ""
+msgstr "šventykla"
msgctxt "christian"
msgid "anglican"
@@ -18869,19 +19519,19 @@ msgid "seventh_day_adventist"
msgstr ""
msgid "Mosque"
-msgstr ""
+msgstr "Mečetė"
msgid "mosque"
-msgstr ""
+msgstr "mečetė"
msgid "ibadi"
msgstr ""
msgid "Synagogue"
-msgstr ""
+msgstr "Sinagoga"
msgid "synagogue"
-msgstr ""
+msgstr "sinagoga"
msgctxt "jewish"
msgid "orthodox"
@@ -18896,7 +19546,7 @@ msgid "reform"
msgstr ""
msgid "Buddhist Temple"
-msgstr ""
+msgstr "Budistų šventykla"
msgid "theravada"
msgstr ""
@@ -18908,7 +19558,7 @@ msgid "vajrayana"
msgstr ""
msgid "Hindu Temple"
-msgstr ""
+msgstr "Induizmo šventykla"
msgid "vaishnavism"
msgstr ""
@@ -18923,25 +19573,25 @@ msgid "smartism"
msgstr ""
msgid "Shinto Shrine"
-msgstr ""
+msgstr "Sintoizmo šventykla"
msgid "Other Place of Worship"
-msgstr ""
+msgstr "Kita šventykla"
msgid "Public Building"
-msgstr "Viešas Pastatas"
+msgstr "Viešasis pastatas"
msgid "Town Hall"
-msgstr ""
+msgstr "Rotušė"
msgid "Community Centre"
-msgstr ""
+msgstr "Bendruomenės centras"
msgid "Embassy"
msgstr "Ambasada"
msgid "Courthouse"
-msgstr ""
+msgstr "Teismo rūmai"
msgid "Prison"
msgstr "Kalėjimas"
@@ -18959,7 +19609,7 @@ msgid "Post Office"
msgstr "Paštas"
msgid "Education"
-msgstr ""
+msgstr "Švietimas"
msgid "Kindergarten"
msgstr ""
@@ -18974,7 +19624,7 @@ msgid "College"
msgstr "Kolegija"
msgid "Driving School"
-msgstr ""
+msgstr "Vairavimo mokykla"
msgid "License Classes"
msgstr ""
@@ -18986,34 +19636,34 @@ msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
msgstr ""
msgid "Health"
-msgstr ""
+msgstr "Sveikata"
msgid "Hospital"
msgstr "Ligoninė"
msgid "Clinic"
-msgstr ""
+msgstr "Klinika"
msgid "Doctor''s Office"
-msgstr ""
+msgstr "Gydytojo kabinetas"
msgid "Dentist"
msgstr "Dantistas"
msgid "Nursing Home"
-msgstr ""
+msgstr "Slaugos namai"
msgid "Retirement Home"
-msgstr ""
+msgstr "Senelių namai"
msgid "Pharmacy"
-msgstr ""
+msgstr "Vaistinė"
msgid "Dispensing"
msgstr ""
msgid "Baby Hatch/Safe Haven"
-msgstr ""
+msgstr "Gyvybės langelis/Saugus prieglobstis"
msgid "Emergency Access Point"
msgstr ""
@@ -19031,7 +19681,7 @@ msgid "(Use international code, like +12-345-67890)"
msgstr ""
msgid "Veterinary"
-msgstr ""
+msgstr "Veterinarija"
msgid "Toilets/Restrooms"
msgstr ""
@@ -19039,9 +19689,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -19198,7 +19845,7 @@ msgid "Glass"
msgstr "Stiklas"
msgid "Paper"
-msgstr "Pierius"
+msgstr "Popierius"
msgid "Scrap Metal"
msgstr "Metalo Laužas"
@@ -19215,8 +19862,20 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
-msgstr "Atluošas"
+msgstr "Atlošas"
msgid "Amount of Seats"
msgstr ""
@@ -19249,7 +19908,7 @@ msgid "wildlife_hide"
msgstr ""
msgid "Hunting Stand"
-msgstr ""
+msgstr "Medžiotojo namelis"
msgid "Height"
msgstr ""
@@ -19276,7 +19935,7 @@ msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
-msgstr ""
+msgstr "Priešgaisrinis hidrantas"
msgctxt "pipeline"
msgid "underground"
@@ -19332,7 +19991,7 @@ msgid "Billboard"
msgstr ""
msgid "Sports"
-msgstr ""
+msgstr "Sportas"
msgid "Sport Facilities"
msgstr ""
@@ -19341,7 +20000,7 @@ msgid "Stadium"
msgstr "Stadionas"
msgid "Sports Centre"
-msgstr "Sporto Centras"
+msgstr "Sporto centras"
msgid "Pitch"
msgstr "Aikštelė"
@@ -19365,7 +20024,7 @@ msgid "Miniature Golf"
msgstr ""
msgid "Multi"
-msgstr "Daugiafunkcis"
+msgstr "Daugiafunkcinis"
msgctxt "running"
msgid "pitch"
@@ -19418,19 +20077,19 @@ msgid "track"
msgstr ""
msgid "Dog Racing"
-msgstr ""
+msgstr "Šunų lenktynės"
msgid "Equestrian"
msgstr ""
msgid "Horse Racing"
-msgstr ""
+msgstr "Žirgų lenktynės"
msgid "Gymnastics"
msgstr ""
msgid "Skating"
-msgstr ""
+msgstr "Čiuožimas"
msgid "ice_rink"
msgstr ""
@@ -19439,10 +20098,10 @@ msgid "Skateboard"
msgstr ""
msgid "Swimming"
-msgstr ""
+msgstr "Plaukimas"
msgid "swimming_pool"
-msgstr ""
+msgstr "plaukimo_baseinas"
msgid "water_park"
msgstr ""
@@ -19526,13 +20185,13 @@ msgid "backcountry"
msgstr ""
msgid "Shooting"
-msgstr ""
+msgstr "Šaudymas"
msgid "Sport (Ball)"
msgstr "Sportas (Kamuolio)"
msgid "Soccer"
-msgstr "Fotbolas"
+msgstr "Futbolas"
msgid "Australian Football"
msgstr ""
@@ -19650,15 +20309,15 @@ msgstr ""
msgctxt "building"
msgid "roof"
-msgstr ""
+msgstr "stogas"
msgctxt "building"
msgid "garage"
-msgstr ""
+msgstr "garažas"
msgctxt "building"
msgid "garages"
-msgstr ""
+msgstr "garažai"
msgctxt "building"
msgid "industrial"
@@ -19666,7 +20325,7 @@ msgstr ""
msgctxt "building"
msgid "school"
-msgstr ""
+msgstr "mokykla"
msgctxt "building"
msgid "commercial"
@@ -19674,7 +20333,7 @@ msgstr ""
msgctxt "building"
msgid "barn"
-msgstr ""
+msgstr "daržinė"
msgctxt "building"
msgid "farm_auxiliary"
@@ -19686,23 +20345,23 @@ msgstr ""
msgctxt "building"
msgid "greenhouse"
-msgstr ""
+msgstr "šiltnamis"
msgctxt "building"
msgid "office"
-msgstr ""
+msgstr "biuras"
msgctxt "building"
msgid "university"
-msgstr ""
+msgstr "universitetas"
msgctxt "building"
msgid "hospital"
-msgstr ""
+msgstr "ligoninė"
msgctxt "building"
msgid "warehouse"
-msgstr ""
+msgstr "sandėlis"
msgctxt "building"
msgid "retail"
@@ -19710,11 +20369,11 @@ msgstr ""
msgctxt "building"
msgid "shed"
-msgstr ""
+msgstr "pašiūrė"
msgctxt "building"
msgid "cowshed"
-msgstr ""
+msgstr "tvartas"
msgctxt "building"
msgid "construction"
@@ -19725,7 +20384,7 @@ msgid "Levels"
msgstr ""
msgid "Residential Building"
-msgstr "Gyvenamasisi Pastatas"
+msgstr "Gyvenamasis pastatas"
msgctxt "building"
msgid "residential"
@@ -19733,15 +20392,15 @@ msgstr ""
msgctxt "building"
msgid "apartments"
-msgstr ""
+msgstr "apartamentai"
msgctxt "building"
msgid "house"
-msgstr ""
+msgstr "namas"
msgctxt "building"
msgid "hut"
-msgstr ""
+msgstr "trobelė"
msgctxt "building"
msgid "dormitory"
@@ -19757,10 +20416,10 @@ msgstr ""
msgctxt "building"
msgid "farm"
-msgstr ""
+msgstr "ferma"
msgid "Building part"
-msgstr ""
+msgstr "Pastato dalis"
msgctxt "building"
msgid "Skipped Levels"
@@ -19844,7 +20503,7 @@ msgid "oil"
msgstr "nafta"
msgid "sewage"
-msgstr "nuotekos"
+msgstr "nuotėkos"
msgctxt "pipeline"
msgid "underwater"
@@ -19957,14 +20616,11 @@ msgid "Water Well"
msgstr ""
msgid "Lighthouse"
-msgstr ""
+msgstr "Švyturys"
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -20056,7 +20712,7 @@ msgid "shop"
msgstr "parduotuvė"
msgid "bank"
-msgstr ""
+msgstr "bankas"
msgid "Camera"
msgstr ""
@@ -20095,7 +20751,7 @@ msgid "Inclination in degrees"
msgstr ""
msgid "Bridges"
-msgstr ""
+msgstr "Tiltai"
msgid "aqueduct"
msgstr "akvedukas"
@@ -20146,7 +20802,7 @@ msgid "humpback"
msgstr ""
msgid "Movable Bridge"
-msgstr ""
+msgstr "Pakeliamasis tiltas"
msgid "bascule"
msgstr ""
@@ -20185,13 +20841,13 @@ msgid "Bridge outline"
msgstr ""
msgid "Power Plant"
-msgstr ""
+msgstr "Elektrinė"
msgid "Output forms of energy (optional):"
msgstr ""
msgid "Power Generator"
-msgstr ""
+msgstr "Elektros generatorius"
msgid "Biofuel Power Generator"
msgstr ""
@@ -20435,7 +21091,7 @@ msgid "Wind Turbine"
msgstr ""
msgid "Power Substation"
-msgstr ""
+msgstr "Elektros pastotė"
msgid "Type of substation"
msgstr ""
@@ -20593,7 +21249,7 @@ msgstr ""
msgctxt "power"
msgid "filter"
-msgstr ""
+msgstr "filtras"
msgctxt "power"
msgid "series_reactor"
@@ -20808,7 +21464,7 @@ msgid "Transformer Attributes:"
msgstr ""
msgid "Power Line"
-msgstr ""
+msgstr "Elektros linija"
msgid "Line type"
msgstr ""
@@ -20854,7 +21510,7 @@ msgid "Used for data communications"
msgstr ""
msgid "Power Cable"
-msgstr ""
+msgstr "Elektros kabelis"
msgctxt "power cable"
msgid "underground"
@@ -20869,7 +21525,7 @@ msgid "overground"
msgstr ""
msgid "Historic Places"
-msgstr ""
+msgstr "Istorinės vietovės"
msgid "Castle"
msgstr "Pilis"
@@ -20926,7 +21582,7 @@ msgid "Wayside Shrine"
msgstr ""
msgid "Place of worship"
-msgstr ""
+msgstr "Šventykla"
msgctxt "building"
msgid "wayside_shrine"
@@ -21347,10 +22003,10 @@ msgid "Litecoin"
msgstr ""
msgid "Geography"
-msgstr ""
+msgstr "Geografija"
msgid "Boundaries"
-msgstr ""
+msgstr "Ribos"
msgid "Administrative"
msgstr ""
@@ -21407,7 +22063,7 @@ msgid "eez"
msgstr ""
msgid "Places"
-msgstr ""
+msgstr "Vietovės"
msgid "Continent"
msgstr ""
@@ -21447,10 +22103,10 @@ msgid "Neighbourhood"
msgstr ""
msgid "Farm"
-msgstr ""
+msgstr "Ferma"
msgid "A farm within a bigger settlement"
-msgstr ""
+msgstr "Ferma didesnėje gyvenvietėje"
msgid "(please use isolated_dwelling for an isolated farm)"
msgstr ""
@@ -21527,7 +22183,7 @@ msgid "Islet"
msgstr ""
msgid "Nature"
-msgstr ""
+msgstr "Gamta"
msgid "Tree"
msgstr ""
@@ -21545,13 +22201,13 @@ msgid "A line of trees."
msgstr ""
msgid "Wood"
-msgstr ""
+msgstr "Medžiai"
msgid "Woodland where timber production does not dominate use."
msgstr ""
msgid "Forest"
-msgstr ""
+msgstr "Miškas"
msgid "Cutline"
msgstr ""
@@ -21611,7 +22267,7 @@ msgid "veld"
msgstr ""
msgid "Nature Reserve"
-msgstr ""
+msgstr "Gamtos draustinis"
msgid "Scree"
msgstr ""
@@ -21666,7 +22322,7 @@ msgid ""
msgstr ""
msgid "Tourism attraction"
-msgstr ""
+msgstr "Turistų lankoma vieta"
msgid "Stone"
msgstr ""
@@ -21677,25 +22333,25 @@ msgid ""
msgstr ""
msgid "Land use"
-msgstr ""
+msgstr "Žemėnauda"
msgid "Farmyard"
-msgstr ""
+msgstr "Ūkio kiemas (ferma)"
msgid "Farmland"
-msgstr ""
+msgstr "Dirbamoji žemė"
msgid "Meadow"
-msgstr ""
+msgstr "Pieva"
msgid "Orchard"
-msgstr ""
+msgstr "Sodas"
msgid "Vineyard"
-msgstr ""
+msgstr "Vynuogynas"
msgid "Greenhouse Horticulture"
-msgstr ""
+msgstr "Sodininkystės šiltnamis"
msgid "Plant Nursery"
msgstr ""
@@ -21704,10 +22360,10 @@ msgid "Allotments"
msgstr ""
msgid "Garden"
-msgstr ""
+msgstr "Sodelis"
msgid "Grass"
-msgstr ""
+msgstr "Žolė"
msgid "Village Green"
msgstr ""
@@ -21722,7 +22378,7 @@ msgid "Recreation Ground"
msgstr ""
msgid "Residential Area"
-msgstr ""
+msgstr "Gyvenamasis plotas"
msgid "Graveyard"
msgstr "Kapinės"
@@ -21761,7 +22417,7 @@ msgid "Greenfield"
msgstr ""
msgid "Landfill"
-msgstr "Savartynas"
+msgstr "Sąvartynas"
msgid "Quarry"
msgstr ""
@@ -21788,13 +22444,13 @@ msgid "International name"
msgstr ""
msgid "Official name"
-msgstr ""
+msgstr "Oficialus pavadinimas"
msgid "Common name abbreviation"
msgstr ""
msgid "House number"
-msgstr ""
+msgstr "Namo numeris"
msgid "Street name"
msgstr ""
@@ -21809,7 +22465,7 @@ msgid "Country code"
msgstr ""
msgid "House name"
-msgstr ""
+msgstr "Namo pavadinimas"
msgid "Subdistrict"
msgstr ""
@@ -22300,7 +22956,7 @@ msgid "addresses belonging to the street"
msgstr ""
msgid "houses belonging to the street"
-msgstr ""
+msgstr "gatvei priklausantys namai"
msgid "anything related to the street"
msgstr ""
@@ -22423,7 +23079,7 @@ msgid "Test"
msgstr ""
msgid "Decreasing house numbers in addresses interpolation"
-msgstr ""
+msgstr "Mažėjantys namų numeriai adresų interpoliacijoje"
msgid "{0} without {1}"
msgstr ""
@@ -22520,6 +23176,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22539,7 +23205,7 @@ msgid "{0} on a node"
msgstr ""
msgid "Building inside building"
-msgstr ""
+msgstr "Pastatas pastate"
msgid "Overlapping Water Areas"
msgstr ""
@@ -22554,7 +23220,7 @@ msgid "Overlapping Identical Natural Areas"
msgstr ""
msgid "Overlapping Identical Landuses"
-msgstr ""
+msgstr "Persidengiančios vienodos žemėnaudos"
msgid "{0} must be connected to a way"
msgstr ""
@@ -22686,36 +23352,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -22794,7 +23430,7 @@ msgid "Missing mandatory attribute ''{0}'' on <member> of relation {1}."
msgstr ""
msgid "Illegal value for attribute ''uid''. Got ''{0}''."
-msgstr ""
+msgstr "Neleistina atributo „uid“ reikšmė. Gauta „{0}“."
msgid "nodes"
msgstr "taškai"
@@ -22908,7 +23544,7 @@ msgid "Upload canceled"
msgstr ""
msgid "Error while uploading"
-msgstr ""
+msgstr "Klaida išsiunčiant"
msgid "GPX upload was successful"
msgstr ""
@@ -22917,13 +23553,13 @@ msgid "Upload failed. Server returned the following message: "
msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
-msgstr ""
+msgstr "Išsiunčiamas GPX pėdsakas: {0} % ({1} iš {2})"
msgid "No description provided. Please provide some description."
msgstr ""
msgid "Uploading GPX Track"
-msgstr ""
+msgstr "Išsiunčiamas GPX pėdsakas"
msgid "Uploads traces to openstreetmap.org"
msgstr ""
@@ -22992,7 +23628,7 @@ msgid "Enter key mode"
msgstr ""
msgid "Auto add tags"
-msgstr ""
+msgstr "Automatiškai pridėti žymas"
msgid "Autosimplify"
msgstr "Automatiškai supaprastinti"
@@ -23093,7 +23729,7 @@ msgid "Address Edit"
msgstr "Keisti Adresus"
msgid "Searching"
-msgstr "Iškoma"
+msgstr "Ieškoma"
msgid "Guess values for "
msgstr ""
@@ -23111,7 +23747,7 @@ msgid "Address has no city"
msgstr "Adresas be mieto"
msgid "Address has no country"
-msgstr "Adresas ve šalies"
+msgstr "Adresas be šalies"
msgid "Assign to"
msgstr "Priskirti prie"
@@ -23230,7 +23866,7 @@ msgid "Use tag ''addr:street'' or ''addr:place''"
msgstr ""
msgid "House Number Editor"
-msgstr ""
+msgstr "Namo numerių tvarkytuvė"
msgid "House number increment:"
msgstr ""
@@ -23544,7 +24180,7 @@ msgid "Angle preserved"
msgstr ""
msgid "Align with:"
-msgstr ""
+msgstr "Lygiuoti su:"
msgid ""
"<html>Aligns the way segment to the reference so that its length is "
@@ -23558,7 +24194,7 @@ msgid ""
msgstr ""
msgid "I''m ready!"
-msgstr "Pasiruošes!"
+msgstr "Pasiruošęs!"
msgid "AlignWays Tips"
msgstr ""
@@ -23570,7 +24206,7 @@ msgid "Align Ways mode"
msgstr ""
msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgstr "Parametras „{0}“ privalo būti ne nulis"
msgid ""
"Segment to be aligned cannot be the same with the reference segment.\n"
@@ -23708,13 +24344,13 @@ msgid "Added <b>angle preserving</b> aligning mode"
msgstr ""
msgid "Various improvements and bugfixes"
-msgstr ""
+msgstr "Įvairūs patobulinimai ir klaidų taisymas"
msgid "Errr..."
msgstr "Errr..."
msgid "Browser not supported."
-msgstr ""
+msgstr "Naršyklė nepalaikoma."
msgid "Building address"
msgstr "Pastato adresas"
@@ -23723,28 +24359,28 @@ msgid "empty"
msgstr ""
msgid "skip"
-msgstr ""
+msgstr "praleisti"
msgid "House number:"
msgstr "Namo numeris:"
msgid "Street:"
-msgstr ""
+msgstr "Gatvė:"
msgid "Post code:"
-msgstr ""
+msgstr "Pašto kodas:"
msgid "Building:"
-msgstr ""
+msgstr "Pastatas:"
msgid "Tags:"
-msgstr ""
+msgstr "Žymos:"
msgid "Name:"
-msgstr ""
+msgstr "Vardas:"
msgid "updated building info"
-msgstr ""
+msgstr "atnaujinta pastatų informacija"
msgid "Tag Element"
msgstr ""
@@ -23756,7 +24392,7 @@ msgid "Tag Building"
msgstr ""
msgid "Tools: {0}"
-msgstr ""
+msgstr "Įrankiai: {0}"
msgid "Area Selection"
msgstr ""
@@ -23774,10 +24410,10 @@ msgid "Unable to detect a polygon where you clicked."
msgstr ""
msgid "Error Report"
-msgstr ""
+msgstr "Pranešimas apie klaidą"
msgid "Something went wrong!"
-msgstr ""
+msgstr "Įvyko kažkas ne taip!"
msgid "Please file a bug report on the github project page under"
msgstr ""
@@ -23791,7 +24427,7 @@ msgid "Area detection algorithm settings."
msgstr ""
msgid "Algorithm Settings"
-msgstr ""
+msgstr "Algoritmo nustatymai"
msgid ""
"The color threshold defines how far the color can be of the original color "
@@ -23813,10 +24449,10 @@ msgid "Tolerance for fitting angles, in radians (Default {0})."
msgstr ""
msgid "Tolerance Angle"
-msgstr ""
+msgstr "Tolerancijos kampas"
msgid "Plugin Settings"
-msgstr ""
+msgstr "Papildinių nustatymai"
msgid "Show Address Dialog after mapping an area"
msgstr ""
@@ -23828,7 +24464,7 @@ msgid "Merge nodes with neighbors"
msgstr ""
msgid "merge nodes"
-msgstr ""
+msgstr "sulieti taškus"
msgid "How often thinning operation should be applied (Default {0})."
msgstr ""
@@ -23836,11 +24472,17 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Gatvės Pavadinimas:"
msgid "Big buildings mode"
-msgstr "Didelių pastatų režimas"
+msgstr "Didelių pastatų veiksena"
msgid "Rotate crosshair"
msgstr "Pasukti kryželį"
@@ -23849,10 +24491,10 @@ msgid "Advanced settings"
msgstr "Sudėtingesni nustatymai"
msgid "Buildings tags:"
-msgstr "Pastatų raktai:"
+msgstr "Pastatų žymos:"
msgid "Cannot place building outside of the world."
-msgstr "Negalima sukurti pastato už pasaulio ribų"
+msgstr "Negalima sukurti pastato už pasaulio ribų."
msgid "Create building"
msgstr "Sukurti pastatą"
@@ -23861,16 +24503,16 @@ msgid "Set buildings size"
msgstr "Nustatyti pastatų dydžius"
msgid "Use Address dialog"
-msgstr ""
+msgstr "Naudoti adresų dialogo langą"
msgid "Auto-select building"
-msgstr ""
+msgstr "Automatiškai pažymėti pastatus"
msgid "Use address nodes under buildings"
msgstr ""
msgid "Buildings width:"
-msgstr ""
+msgstr "Pastatų plotis:"
msgid "Length step:"
msgstr ""
@@ -23879,15 +24521,43 @@ msgid "Advanced..."
msgstr "S"
msgid "Draw buildings"
-msgstr "Kurti pastatus"
+msgstr "Braižyti pastatus"
msgid "Point on the corner of the building to start drawing"
-msgstr ""
+msgstr "Spauskite ant pastato kampo braižymui pradėti"
msgid "Point on opposite end of the building"
-msgstr ""
+msgstr "Spauskite kitame pastato gale"
msgid "Set width of the building"
+msgstr "Nustatykite pastato plotį"
+
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
msgstr ""
msgid "on polygon"
@@ -23900,13 +24570,13 @@ msgid "Helping tool for tag address"
msgstr ""
msgid "CadastreFR - Buildings"
-msgstr ""
+msgstr "CadastreFR - Pastatai"
msgid "Next no"
msgstr ""
msgid "Enter addresses"
-msgstr ""
+msgstr "Įveskite adresus"
msgid ""
"Location \"{0}\" found in cache.\n"
@@ -23921,6 +24591,8 @@ msgid ""
"Error loading file.\n"
"Probably an old version of the cache file."
msgstr ""
+"Klaida įkeliant failą.\n"
+"Greičiausiai sena podėlio failo versija."
msgid "Lambert Zone {0} cache file (.{0})"
msgstr ""
@@ -23954,7 +24626,7 @@ msgid ""
msgstr ""
msgid "Choose from..."
-msgstr ""
+msgstr "Pasirinkite iš..."
msgid "Select commune"
msgstr ""
@@ -24052,7 +24724,7 @@ msgid "Enable automatic caching."
msgstr ""
msgid "Max. cache size (in MB)"
-msgstr ""
+msgstr "Didžiausias podėlio dydis (MB)"
msgid "French cadastre WMS"
msgstr ""
@@ -24090,19 +24762,19 @@ msgid "Draw a rectangle around downloaded data from WMS server."
msgstr ""
msgid "Image resolution:"
-msgstr "Paveiksliuko resoliucija:"
+msgstr "Paveikslo skiriamoji geba:"
msgid "High resolution (1000x800)"
-msgstr "Aukšta resoliucija (1000x800)"
+msgstr "Aukšta skiriamoji geba (1000x800)"
msgid "Medium resolution (800x600)"
-msgstr "Vidutinė resoliucija (800x600)"
+msgstr "Vidutinė skiriamoji geba (800x600)"
msgid "Low resolution (600x400)"
-msgstr "Žema resoliucija (600x400)"
+msgstr "Žema skiriamoji geba (600x400)"
msgid "Image filter interpolation:"
-msgstr ""
+msgstr "Paveikslo filtro interpoliacija:"
msgid "Nearest-Neighbor (fastest) [ Default ]"
msgstr ""
@@ -24132,7 +24804,7 @@ msgid "Layers:"
msgstr "Sluoksniai:"
msgid "Sea, rivers, swimming pools."
-msgstr ""
+msgstr "Jūra, upės, plaukimo baseinai."
msgid "Buildings, covers, underground constructions."
msgstr ""
@@ -24147,7 +24819,7 @@ msgid "Parcels numbers, street names."
msgstr ""
msgid "Address, houses numbers."
-msgstr ""
+msgstr "Adresas, namų numeriai."
msgid "Locality, hamlet, place."
msgstr ""
@@ -24198,7 +24870,7 @@ msgid "Contacting WMS Server..."
msgstr ""
msgid "Create buildings"
-msgstr ""
+msgstr "Pastatų kūrimas"
msgid ""
"To avoid cadastre WMS overload,\n"
@@ -24499,6 +25171,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24614,7 +25289,7 @@ msgid "Format errors: "
msgstr ""
msgid "TangoGPS import success"
-msgstr "TangoGPS pavyko importouti"
+msgstr "TangoGPS pavyko importuoti"
msgid "TangoGPS import failure!"
msgstr "TangoGPS nepavyko importuoti!"
@@ -24623,19 +25298,19 @@ msgid "TCX Files (*.tcx)"
msgstr "TCX Failai (*.tcx)"
msgid "Download along..."
-msgstr ""
+msgstr "Atsiųsti palei..."
msgid "Download OSM data along the selected ways."
-msgstr ""
+msgstr "Atsiųsti OSM duomenis palei pažymėtus kelius."
msgid "Download Along"
-msgstr ""
+msgstr "Atsiųsti palei"
msgid "Please select 1 or more ways to download along"
-msgstr ""
+msgstr "Pažymėkite 1 ar daugiau kelių palei kuriuos atsiųsti"
msgid "Download from OSM along selected ways"
-msgstr ""
+msgstr "Atsiųsti iš OSM palei pažymėtus kelius"
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -24813,9 +25488,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25194,10 +25884,10 @@ msgid ""
msgstr ""
msgid "Imagery XML Files"
-msgstr ""
+msgstr "Vaizdų XML failai"
msgid "Save Imagery XML file"
-msgstr ""
+msgstr "Įrašyti vaizdų XML failą"
msgid "XML Imagery Bounds"
msgstr ""
@@ -25218,7 +25908,7 @@ msgid ""
msgstr ""
msgid "Open Imagery XML file"
-msgstr ""
+msgstr "Atverti vaizdų XML failą"
msgid "Calibration Layer"
msgstr ""
@@ -25236,7 +25926,7 @@ msgid "Deprecate Offset"
msgstr ""
msgid "Are you sure this imagery offset is wrong?"
-msgstr ""
+msgstr "Ar esate tikri, kad šis vaizdų poslinkis klaidingas?"
msgid "Are you sure this calibration geometry is aligned badly?"
msgstr ""
@@ -25245,7 +25935,7 @@ msgid "Warning: deprecation is basically irreversible!"
msgstr ""
msgid "To store imagery offsets you must be a registered OSM user."
-msgstr ""
+msgstr "Vaizdų poslinkiams įrašyti turite būti registruotas OSM naudotojas."
msgid ""
"Please enter the reason why you mark this imagery offset as deprecated"
@@ -25259,17 +25949,19 @@ msgid "Notifying the server of the deprecation..."
msgstr ""
msgid "Get Imagery Offset..."
-msgstr ""
+msgstr "Gauti vaizdų poslinkį..."
msgid "Download offsets for current imagery from a server"
-msgstr ""
+msgstr "Atsiųsti dabartinių vaizdų poslinkius iš serverio"
msgid ""
"No data for this region. Please adjust imagery layer and upload an offset."
msgstr ""
+"Nėra duomenų šiame regione. Suderinkite vaizdų sluoksnį ir išsiųskite "
+"poslinkį."
msgid "Loading imagery offsets..."
-msgstr ""
+msgstr "Įkeliami vaizdų poslinkiai..."
msgid "Error processing XML response: {0}"
msgstr ""
@@ -25278,7 +25970,7 @@ msgid "Offset"
msgstr ""
msgid "Imagery Offset Database"
-msgstr ""
+msgstr "Vaizdų poslinkių duomenų bazė"
msgid "mm"
msgstr ""
@@ -25328,10 +26020,10 @@ msgid "Reporting the offset..."
msgstr ""
msgid "An imagery offset of {0}"
-msgstr ""
+msgstr "„{0}“ vaizdų poslinkis"
msgid "Imagery ID"
-msgstr ""
+msgstr "Vaizdų ID"
msgid "A calibration geometry of {0} nodes"
msgstr ""
@@ -25355,7 +26047,7 @@ msgid "Unable to connect to the server"
msgstr ""
msgid "Store Imagery Offset..."
-msgstr ""
+msgstr "Saugoti vaizdų poslinkį..."
msgid ""
"Upload an offset for current imagery (or calibration object geometry) to a "
@@ -25366,7 +26058,7 @@ msgid "Store calibration geometry"
msgstr ""
msgid "Store imagery offset"
-msgstr ""
+msgstr "Saugoti vaizdų poslinkį"
msgid ""
"The selected object can be used as a calibration geometry. What do you "
@@ -25377,6 +26069,8 @@ msgid ""
"The topmost imagery layer has no offset. Are you sure you want to upload "
"this?"
msgstr ""
+"Aukščiausias vaizdų sluoksnis neturi poslinkio. Ar tikrai norite tai "
+"išsiųsti?"
msgid ""
"You are registering an imagery offset. Other users in this area will be able "
@@ -25393,25 +26087,25 @@ msgid ""
msgstr ""
msgid "Uploading a new offset..."
-msgstr ""
+msgstr "Išsiunčiamas naujas poslinkis..."
msgid "This string should be 3 to 200 letters long."
msgstr ""
msgid "Adjust imagery"
-msgstr ""
+msgstr "Derinti vaizdus"
msgid "Adjust the position of the selected imagery layer"
-msgstr ""
+msgstr "Derinkite pasirinkto vaizdų sluoksnio poziciją"
msgid "Please select the imagery layer to adjust."
-msgstr ""
+msgstr "Pasirinkite vaizdų sluoksnį derinimui."
msgid "Start adjusting"
msgstr ""
msgid "There are currently no imagery layer to adjust."
-msgstr ""
+msgstr "Nėra vaizdų sluoksnio derinimui."
msgid "No layers to adjust"
msgstr ""
@@ -25525,7 +26219,7 @@ msgid "Converting OSM graph into Channel Digraph"
msgstr ""
msgid "filtering ways"
-msgstr ""
+msgstr "filtruojami keliai"
msgid "creating Channel-Digraph"
msgstr ""
@@ -25651,7 +26345,7 @@ msgid "east"
msgstr "rytai"
msgid "northeast"
-msgstr "šiaurės rytrai"
+msgstr "šiaurės rytai"
msgid "north"
msgstr "šiaurė"
@@ -25690,7 +26384,7 @@ msgid "Line simplification accuracy (degrees)"
msgstr ""
msgid "Resolution of Landsat tiles (pixels per degree)"
-msgstr ""
+msgstr "Landsat kaladėlių skiriamoji geba (pikselių laipsniui)"
msgid "Size of Landsat tiles (pixels)"
msgstr ""
@@ -25748,6 +26442,8 @@ msgstr ""
msgid ""
"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
msgstr ""
+"Landsat kaladėlių skiriamoji geba, matuojama pikseliais laipsniui. "
+"Numatytoji – 4000."
msgid "Size of one landsat tile, measured in pixels. Default 2000."
msgstr ""
@@ -25854,9 +26550,12 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
-msgid "Measured values"
+msgid "Export"
msgstr ""
+msgid "Measured values"
+msgstr "Išmatuotos reikšmės"
+
msgid "Open the measurement window."
msgstr ""
@@ -25864,19 +26563,19 @@ msgid "Reset current measurement results and delete measurement path."
msgstr ""
msgid "Path Length"
-msgstr ""
+msgstr "Kelio ilgis"
msgid "Selection Length"
-msgstr ""
+msgstr "Pažymėjimo ilgis"
msgid "Selection Area"
-msgstr ""
+msgstr "Pažymėjimo plotas"
msgid "Angle"
-msgstr ""
+msgstr "Kampas"
msgid "Angle between two selected Nodes"
-msgstr ""
+msgstr "Kampas tarp dviejų pažymėtų taškų"
msgid "Layer to make measurements"
msgstr ""
@@ -25972,7 +26671,7 @@ msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
-msgstr ""
+msgstr "Apie papildinį"
msgid "Native password manager plugin"
msgstr ""
@@ -26042,7 +26741,7 @@ msgid "The username and password is protected by {0}."
msgstr ""
msgid "username"
-msgstr "vartotojo vardas"
+msgstr "naudotojas"
msgid "password"
msgstr "slaptažodis"
@@ -26195,13 +26894,15 @@ msgid "Open Data Module description URL"
msgstr ""
msgid "Download OSM data corresponding to the current data set."
-msgstr ""
+msgstr "Atsiųsti OSM duomenis atitinkančius dabartinę duomenų aibę."
msgid "Diff"
msgstr ""
msgid "Perform diff between current data set and existing OSM data."
msgstr ""
+"Atlikti skirtumų palyginimą tarp dabartinės duomenų aibės ir egzistuojančių "
+"OSM duomenų."
msgid "Open tools menu for this data."
msgstr ""
@@ -26365,12 +27066,14 @@ msgid "Launch browser to the summary license page of the selected data set"
msgstr ""
msgid "View the license of the selected data set"
-msgstr ""
+msgstr "Parodyti pasirinktos duomenų aibės licenciją"
msgid ""
"Warning: Cannot download module ''{0}''. Its download link is not known. "
"Skipping download."
msgstr ""
+"Įspėjimas: Nepavyko atsiųsti modulio „{0}“. Jo atsiuntimo nuoroda nežinoma. "
+"Atsiuntimas praleidžiamas."
msgid ""
"Warning: Cannot download module ''{0}''. Its download link ''{1}'' is not a "
@@ -26424,8 +27127,9 @@ msgstr ""
msgid "JOSM could not find information about the following module:"
msgid_plural "JOSM could not find information about the following modules:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "JOSM nepavyko rasti informacijos apie šį modulį:"
+msgstr[1] "JOSM nepavyko rasti informacijos apie šiuos modulius:"
+msgstr[2] "JOSM nepavyko rasti informacijos apie šiuos modulius:"
msgid "The module is not going to be loaded."
msgid_plural "The modules are not going to be loaded."
@@ -26441,7 +27145,7 @@ msgid "Module update failed"
msgstr ""
msgid "Warning: failed to download module information list"
-msgstr ""
+msgstr "Įspėjimas: nepavyko atsiųsti modulių informacijos sąrašo"
msgid "Disable module"
msgstr ""
@@ -26472,6 +27176,8 @@ msgid ""
"Do not ask again and remember my decision (go to Preferences->Modules to "
"change it later)"
msgstr ""
+"Daugiau neklausti ir prisiminti sprendimą (jei norėsite pakeisti, eikite į "
+"Nuostatos->Moduliai)"
msgid "The module file ''{0}'' does not include a Manifest."
msgstr ""
@@ -26562,7 +27268,7 @@ msgid "Download PBF"
msgstr ""
msgid "Invalid changeset id: {0}"
-msgstr ""
+msgstr "Neteisingas pakeitimo id: {0}"
msgid "Invalid timestamp: {0}"
msgstr ""
@@ -26589,7 +27295,7 @@ msgid "Transform error: Unsupported orientation"
msgstr ""
msgid "Finished"
-msgstr ""
+msgstr "Baigta"
msgid "Prefs"
msgstr ""
@@ -26742,7 +27448,7 @@ msgid "Could not parse numbers. Please check."
msgstr ""
msgid "Building JOSM layer"
-msgstr ""
+msgstr "Kuriamas JOSM sluoksnis"
msgid "Postprocessing layer"
msgstr ""
@@ -26754,7 +27460,7 @@ msgid " Writing to file"
msgstr ""
msgid "Building JOSM layer."
-msgstr ""
+msgstr "Kuriamas JOSM sluoksnis."
msgid " "
msgstr " "
@@ -27072,7 +27778,7 @@ msgid "Download Osmosis poly"
msgstr ""
msgid "Reading polygon filter file..."
-msgstr ""
+msgstr "Skaitomas daugiakampių filtro failas..."
msgid "Error reading poly file: {0}"
msgstr ""
@@ -27096,7 +27802,7 @@ msgid "{0} points were outside world bounds and were moved"
msgstr ""
msgid "Osmosis polygon filter files"
-msgstr ""
+msgstr "Osmosis daugiakampių filtrų failas"
msgid "Print..."
msgstr "Spausdinti..."
@@ -27123,7 +27829,7 @@ msgid "Scale"
msgstr ""
msgid "Resolution"
-msgstr ""
+msgstr "Skiriamoji geba"
msgid "Map information"
msgstr ""
@@ -27156,7 +27862,7 @@ msgid "Selected: {0}"
msgstr ""
msgid "Proj4J Plugin"
-msgstr ""
+msgstr "Proj4J papildinys"
msgid "Code"
msgstr ""
@@ -27436,7 +28142,7 @@ msgid "Create administrative boundary relations"
msgstr ""
msgid "Add tags boundary and admin_level to boundary relation ways"
-msgstr ""
+msgstr "Pridėti boundary ir admin_level žymas ribų rišių keliams"
msgid "Move area tags from contour to relation"
msgstr ""
@@ -27535,7 +28241,7 @@ msgid "Complete multipolygon for way {0}"
msgstr ""
msgid "Node without ''house'' role found"
-msgstr ""
+msgstr "Rastas taškas be rolės „house“"
msgid "Way without ''house'' or ''street'' role found"
msgstr ""
@@ -27568,7 +28274,7 @@ msgid "Way platform without ''platform'' role found"
msgstr ""
msgid "Revert changeset fully"
-msgstr ""
+msgstr "Visiškai grąžinti pakeitimą"
msgid "Revert selection only"
msgstr ""
@@ -27577,34 +28283,34 @@ msgid "Revert selection and restore deleted objects"
msgstr ""
msgid "Revert changeset"
-msgstr ""
+msgstr "Grąžinti pakeitimą"
msgid "Revert"
msgstr ""
msgid "Enter the ID of the changeset that should be reverted"
-msgstr ""
+msgstr "Įveskite pakeitimo, kuris turėtų būti grąžintas, ID"
msgid "Reverted changeset"
-msgstr ""
+msgstr "Pakeitimas grąžintas"
msgid "It is not allowed to revert changeset from {0}"
-msgstr ""
+msgstr "Negalima grąžinti pakeitimo iš {0}"
msgid "Missing merge target for {0} with id {1}"
msgstr ""
msgid "Objects history"
-msgstr ""
+msgstr "Objektų istorija"
msgid "History reverter"
msgstr ""
msgid "Preparing history data..."
-msgstr ""
+msgstr "Ruošiami istorijos duomenys..."
msgid "Remote Control has been asked to revert a changeset."
-msgstr ""
+msgstr "Nuotolinio valdymo paprašyta grąžinti pakeitimą."
msgid "Reverting..."
msgstr ""
@@ -27613,6 +28319,8 @@ msgid ""
"This changeset has objects that are not present in current dataset.\n"
"It is needed to download them before reverting. Do you want to continue?"
msgstr ""
+"Šis pakeitimas turi objektų, kurių nėra dabartinėje duomenų aibėje.\n"
+"Reikia juos atsiųsti prieš grąžinimą. Ar norite tęsti?"
msgid "Confirm"
msgstr "Patvirtinti"
@@ -27621,26 +28329,30 @@ msgid "Fetching missing primitives"
msgstr ""
msgid "Downloading changeset"
-msgstr ""
+msgstr "Atsiunčiamas pakeitimas"
msgid "See {0}"
msgstr ""
msgid "Revert changeset #{0}"
-msgstr ""
+msgstr "Grąžinti pakeitimą #{0}"
msgid ""
"Warning: unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
+"Įspėjimas: nepalaikomas pradžios elementas „{0}“ pakeitimo turinio "
+"pozicijoje ({1},{2}). Praleidžiama."
msgid ""
"Warning: unsupported end element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
+"Įspėjimas: nepalaikomas pabaigos elementas „{0}“ pakeitimo turinio "
+"pozicijoje ({1},{2}). Praleidžiama."
msgid "Road Sign Plugin"
-msgstr "Kelio Ženklų Priedas"
+msgstr "Kelio ženklų papildinys"
msgid "signs"
msgstr ""
@@ -27649,7 +28361,7 @@ msgid "Change Properties"
msgstr ""
msgid "Country preset:"
-msgstr ""
+msgstr "Šalies ruošinys:"
msgid "Show all signs"
msgstr ""
@@ -27676,19 +28388,19 @@ msgid "Roadsign tagging"
msgstr "Kelio ženklų žymėjimas"
msgid "Add tags by clicking on road signs"
-msgstr ""
+msgstr "Prideda žymas paspaudus ant kelio ženklų"
msgid "Roadsigns plugin: open dialog"
-msgstr ""
+msgstr "Kelio ženklų papildinys: atverti dialogo langą"
msgid "custom"
msgstr ""
msgid "Could not read tagging preset source: ''{0}''"
-msgstr ""
+msgstr "Nepavyko perskaityti žymėjimo ruošinio šaltinio: „{0}“"
msgid "Error parsing tagging preset from ''{0}'':\n"
-msgstr ""
+msgstr "Klaida nagrinėjant žymėjimo ruošinį iš „{0}“:\n"
msgid "Sign {0}"
msgstr "Ženklas {0}"
@@ -27772,7 +28484,7 @@ msgid "Weight"
msgstr "Masė"
msgid "Enter weight values"
-msgstr "Įveskite masės reilšmes"
+msgstr "Įveskite svorių reikšmes"
msgid "New value for {0}"
msgstr "Nauja reikšmė {0}"
@@ -27854,7 +28566,7 @@ msgid "SDS server URL"
msgstr "SDS serverio URL"
msgid "SDS username"
-msgstr "SDS vartotojo vardas"
+msgstr "SDS naudotojas"
msgid "SDS password"
msgstr "SDS slaptažodis"
@@ -27881,7 +28593,7 @@ msgid "Save SDS file"
msgstr "Išsaugoti SDS failą"
msgid "No object selected"
-msgstr ""
+msgstr "Joks objektas nepažymėtas"
msgid "SeaChart Editor"
msgstr ""
@@ -27899,16 +28611,16 @@ msgid "Simplify Area"
msgstr "Supaprastinti Sritį"
msgid "Delete unnecessary nodes from an area."
-msgstr "Ištrinti nebūtinus taškis esančius srityje."
+msgstr "Šalinti nebūtinus srities taškus."
msgid "Yes, delete nodes"
-msgstr "Taip, ištrinti taškus"
+msgstr "Taip, šalinti taškus"
msgid "Delete nodes outside of downloaded data regions"
msgstr ""
msgid "No, abort"
-msgstr "Ne, atšaukti"
+msgstr "Ne, nutraukti"
msgid "Do you want to delete them anyway?"
msgstr ""
@@ -27958,6 +28670,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
@@ -28018,7 +28739,7 @@ msgid "Launches the tag editor dialog"
msgstr ""
msgid "JOSM Tag Editor Plugin"
-msgstr ""
+msgstr "JOSM žymų rengyklės papildinys"
msgid "Abort tag editing and close dialog"
msgstr ""
@@ -28039,7 +28760,7 @@ msgid "unexpected column number {0}"
msgstr ""
msgid "Tagging Preset Tester"
-msgstr ""
+msgstr "Žymėjimo ruošinių testavimas"
msgid ""
"Open the tagging preset test tool for previewing tagging preset dialogs."
@@ -28124,7 +28845,7 @@ msgid "Terrace a building"
msgstr ""
msgid "Creates individual buildings from a long building."
-msgstr ""
+msgstr "Sukuria individualius pastatus iš ilgo pastato."
msgid "Invalid selection"
msgstr ""
@@ -28198,7 +28919,7 @@ msgid "Tile size:"
msgstr ""
msgid "Resolution:"
-msgstr ""
+msgstr "Skiriamoji geba:"
msgid "Mode:"
msgstr ""
@@ -28540,10 +29261,10 @@ msgid "Add turn"
msgstr ""
msgid "Delete lane."
-msgstr "Ištrinti juostą."
+msgstr "Šalinti juostą."
msgid "Delete turn."
-msgstr "Itrinti posūkį."
+msgstr "Šalinti posūkį."
msgid "{0} lanes are not referenced in any turn-relation."
msgstr ""
@@ -28710,13 +29431,13 @@ msgid "{0} warning"
msgid_plural "{0} warnings"
msgstr[0] "{0} įspėjimas"
msgstr[1] "{0} įspėjimai"
-msgstr[2] "{0} įspėjimai"
+msgstr[2] "{0} įspėjimų"
msgid "{0} error"
msgid_plural "{0} errors"
msgstr[0] "{0} klaida"
msgstr[1] "{0} klaidos"
-msgstr[2] "{0} klaidos"
+msgstr[2] "{0} klaidų"
msgid "no issues"
msgstr ""
@@ -28741,7 +29462,7 @@ msgstr "Sukurti naują krypties apribojimą"
msgid "Launch the turn restriction editor to create a new turn restriction"
msgstr ""
-"Paleisti krypties ribijimų redaktorių ir sukurti naują krypties aprybojimą"
+"Paleisti krypties ribojimų rengyklę naujam krypties apribojimui sukurti"
msgid "No Right Turn"
msgstr "Sukti į Dešinę Draudžiama"
@@ -28753,7 +29474,7 @@ msgid "No U-Turn"
msgstr "Apsisukti draudžiama"
msgid "No Straight On"
-msgstr "Eismas Tiesiai Draudžiams"
+msgstr "Eismas tiesiai draudžiamas"
msgid "Only Right Turn"
msgstr "Važiuoti į Dešinę"
@@ -28846,7 +29567,7 @@ msgid "Turn Restrictions"
msgstr ""
msgid "Display and manage turn restrictions in the current data set"
-msgstr ""
+msgstr "Rodyti ir valdyti posūkių apribojimus dabartinėje duomenų aibėje"
msgid "Open an editor for the selected turn restriction"
msgstr ""
@@ -28911,13 +29632,13 @@ msgid ""
msgstr ""
msgid "Delete ''from''"
-msgstr "Ištrinti ''from''"
+msgstr "Šalinti „from“"
msgid "Removes the member with role ''from''"
msgstr ""
msgid "Delete ''to''"
-msgstr "Ištrinti ''to''"
+msgstr "Šalinti „to“"
msgid "Removes the member with role ''to''"
msgstr ""
@@ -29062,30 +29783,35 @@ msgid "Change to the Basic Editor and select a way"
msgstr ""
msgid "Undelete object..."
-msgstr "Atkurti objektą..."
+msgstr "Grąžinti pašalintą objektą..."
msgid "Undelete object by id"
-msgstr "Atkurti objektą pagal id"
+msgstr "Grąžinti pašalintą objektą pagal id"
msgid "Unable to undelete node {0}. Object has likely been redacted"
msgstr ""
+"Nepavyko grąžinti pašalinto taško {0}. Objektas greičiausiai buvo pakeistas"
msgid "Unable to undelete way {0}. Object has likely been redacted"
msgstr ""
+"Nepavyko grąžinti pašalinto kelio {0}. Objektas greičiausiai buvo pakeistas"
msgid "Unable to undelete relation {0}. Object has likely been redacted"
msgstr ""
+"Nepavyko grąžinti pašalinto ryšio {0}. Objektas greičiausiai buvo pakeistas"
msgid "Undelete Object"
-msgstr "Atkurti objetą"
+msgstr "Grąžinti pašalintą objektą"
msgid "Undelete object"
-msgstr "Atkuriti objektą"
+msgstr "Grąžinti pašalintą objektą"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
"w2''"
msgstr ""
+"Įveskite pašalintų objektų, kurie turėtų būti grąžinti, tipą ir ID, pvz., "
+"„n1 w2“"
msgid "Select if the data should be added into a new layer"
msgstr ""
@@ -29132,7 +29858,7 @@ msgid "Extract node from line"
msgstr ""
msgid "Paste Relations"
-msgstr ""
+msgstr "Įdėti ryšius"
msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
@@ -29145,7 +29871,7 @@ msgid "Split an object at the selected nodes."
msgstr ""
msgid "The current selection cannot be used for splitting."
-msgstr "Parinktis negali būti panaudota perskyrimui"
+msgstr "Dabartinė parinktis negali būti panaudota perskyrimui."
msgid "The selected way is not closed."
msgstr ""
@@ -29187,7 +29913,7 @@ msgid "Copy tags from previous selection"
msgstr ""
msgid "Pastes tags of previously selected object(s)"
-msgstr ""
+msgstr "Įdėti anksčiau pažymėtų objektų žymas"
msgid "Add Source Tag"
msgstr ""
@@ -29196,17 +29922,17 @@ msgid "Add remembered source tag"
msgstr ""
msgid "UnGlue Relation"
-msgstr ""
+msgstr "Atjungti ryšį"
msgid ""
"Duplicate nodes, ways and relations that are used by multiple relations."
msgstr ""
msgid "UnGlue Relations"
-msgstr ""
+msgstr "Atjungti ryšius"
msgid "Unglued Relations"
-msgstr ""
+msgstr "Atjungti ryšiai"
msgid "Change relation member for {0} {1}"
msgstr ""
@@ -29236,10 +29962,10 @@ msgid "Opens specified URL browser"
msgstr ""
msgid "Utilsplugin2 settings"
-msgstr ""
+msgstr "Utilsplugin2 nustatymai"
msgid "Here you can change some preferences of Utilsplugin2 functions"
-msgstr ""
+msgstr "Čia galite pakeisti Utilsplugin2 funkcijų kai kuriuos nustatymus"
msgid "Save to file"
msgstr "Išsaugoti į failą"
@@ -29318,7 +30044,7 @@ msgid "Set tags for multiple objects"
msgstr ""
msgid "Delete from history"
-msgstr ""
+msgstr "Pašalinti iš istorijos"
msgid "Find primitives with these tags"
msgstr ""
@@ -29398,13 +30124,13 @@ msgid "All connected ways"
msgstr "Visi sujungti keliai"
msgid "Select all connected ways"
-msgstr "Parinkti visus sujungtus kelius"
+msgstr "Pažymėti visus sujungtus kelius"
msgid "Intersecting ways"
msgstr "Susikertantys keliai"
msgid "Select intersecting ways"
-msgstr "Parinkti susikertančius kelius"
+msgstr "Pažymėti susikertančius kelius"
msgid "Please select some ways to find connected and intersecting ways!"
msgstr ""
@@ -29413,7 +30139,7 @@ msgid "All intersecting ways"
msgstr "Visi susikertantys keliai"
msgid "Select all intersecting ways"
-msgstr "Parinkti visus susikertančius kelius"
+msgstr "Pažymėti visus susikertančius kelius"
msgid "Please select some ways to find all connected and intersecting ways!"
msgstr ""
@@ -29422,7 +30148,7 @@ msgid "Middle nodes"
msgstr "Centriniai taškai"
msgid "Select middle nodes"
-msgstr "Parinkti centrinius taškus"
+msgstr "Pažymėti centrinius taškus"
msgid "Please select two nodes connected by way!"
msgstr "Parinkite du taškus sujungtus keliu!"
@@ -29453,7 +30179,7 @@ msgid ""
msgstr ""
msgid "Select Highway"
-msgstr "Parinkti Greitkelį"
+msgstr "Pažymėti greitkelį"
msgid "Select highway for the name/ref given"
msgstr ""
@@ -29486,7 +30212,7 @@ msgid "Removes all nodes from selection"
msgstr ""
msgid "Import Video"
-msgstr "Įkelti Video"
+msgstr "Importuoti video"
msgid "Sync a video against this GPS track"
msgstr "Suderinti video su GPS pėdsaku"
@@ -29513,7 +30239,7 @@ msgid "jumps n sec back"
msgstr ""
msgid "Forward"
-msgstr "Primyn"
+msgstr "Pirmyn"
msgid "jumps n sec forward"
msgstr ""
@@ -29609,7 +30335,7 @@ msgid "loop"
msgstr "ciklas"
msgid "mute"
-msgstr "nutylditi"
+msgstr "nutildyti"
msgid "Walking Papers Scanned Map"
msgstr ""
@@ -29684,7 +30410,7 @@ msgid "Search after waypoint. Click and move the map view to the waypoint."
msgstr ""
msgid "Way Select"
-msgstr "Parinkti Kelią"
+msgstr "Pažymėti kelią"
msgid "Add names from Wikipedia"
msgstr ""
@@ -29728,7 +30454,7 @@ msgid "Fetches all coordinates from Wikipedia in the current view"
msgstr ""
msgid "coordinates"
-msgstr ""
+msgstr "koordinatės"
msgid "Category"
msgstr "Kategorija"
@@ -29737,28 +30463,28 @@ msgid "Fetches a list of all Wikipedia articles of a category"
msgstr ""
msgid "Enter the Wikipedia category"
-msgstr ""
+msgstr "Įveskite Vikipedijos kategoriją"
msgid "Clipboard"
-msgstr ""
+msgstr "Iškarpinė"
msgid "Pastes Wikipedia articles from the system clipboard"
-msgstr ""
+msgstr "Įdeda Vikipedijos straipsnius iš sistemos iškarpinės"
msgid "clipboard"
-msgstr ""
+msgstr "iškarpinė"
msgid "Open Article"
msgstr "Atverti straipsnį"
msgid "Opens the Wikipedia article of the selected item in a browser"
-msgstr ""
+msgstr "Atveria pažymėto elemento Vikipedijos straipsnį naršyklėje"
msgid "Sets the default language for the Wikipedia articles"
-msgstr ""
+msgstr "Nustato Vikipedijos straipsnių numatytąją kalbą"
msgid "Enter the Wikipedia language"
-msgstr "Įveskite Wikipedia kalbą"
+msgstr "Įveskite Vikipedijos kalbą"
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
@@ -29773,3 +30499,6 @@ msgstr ""
msgid "Drive a race car on this layer"
msgstr ""
+
+#~ msgid "Note comment background"
+#~ msgstr "Pastabos komentaro fonas"
diff --git a/i18n/po/lv.po b/i18n/po/lv.po
index b11a24c..18cf9a5 100644
--- a/i18n/po/lv.po
+++ b/i18n/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2012-10-03 22:16+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Latvian <lv at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:49+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:48+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: lv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -449,15 +449,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "Sadalīt mezglus"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Sadalīt iezīmētos mezglus vienmērīgos attālumos gar līniju."
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Lejupielādēt no OSM..."
@@ -472,6 +475,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Lejupielādēt objektu..."
@@ -972,6 +978,12 @@ msgstr "Aizvērt logu un atcelt lejupielādi"
msgid "Download Data"
msgstr "Lejupielādēt datus"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Labi"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1716,6 +1728,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1725,6 +1759,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2307,134 +2344,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2474,6 +2383,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2489,12 +2404,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2531,7 +2440,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2543,6 +2457,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3876,7 +3793,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4515,6 +4432,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4573,6 +4493,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5963,9 +5886,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr "Labi"
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6834,9 +6754,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6852,6 +6782,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6982,6 +6918,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7708,18 +7654,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7728,6 +7677,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8750,6 +8702,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10714,6 +10669,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11351,6 +11312,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14083,6 +14052,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14186,6 +14158,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14313,6 +14288,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14935,11 +14913,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15256,6 +15229,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15959,15 +15937,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17215,6 +17212,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17613,22 +17616,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17840,6 +17843,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17895,9 +17901,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18024,7 +18027,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18669,9 +18672,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18845,6 +18845,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19592,9 +19604,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22150,6 +22159,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22316,36 +22335,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23464,6 +23453,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23518,6 +23513,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24127,6 +24150,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24441,9 +24467,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25482,6 +25523,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27586,6 +27630,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/mk.po b/i18n/po/mk.po
index 9463cf2..8d7157a 100644
--- a/i18n/po/mk.po
+++ b/i18n/po/mk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2013-05-11 04:37+0000\n"
"Last-Translator: Bojan Jankuloski <bojan.jankuloski at gmail.com>\n"
"Language-Team: Macedonian <mk at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:49+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:49+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: mk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -447,15 +447,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -470,6 +473,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -964,6 +970,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1708,6 +1720,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1717,6 +1751,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2299,134 +2336,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2466,6 +2375,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2481,12 +2396,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2523,7 +2432,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2535,6 +2449,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3868,7 +3785,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4508,6 +4425,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4566,6 +4486,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5956,9 +5879,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6827,9 +6747,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6845,6 +6775,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6975,6 +6911,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7701,18 +7647,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7721,6 +7670,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8743,6 +8695,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10707,6 +10662,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11345,6 +11306,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14073,6 +14042,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14176,6 +14148,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14303,6 +14278,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14925,11 +14903,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15246,6 +15219,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15949,15 +15927,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17205,6 +17202,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17603,22 +17606,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17830,6 +17833,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17885,9 +17891,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18014,7 +18017,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18659,9 +18662,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18835,6 +18835,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19582,9 +19594,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22140,6 +22149,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22306,36 +22325,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23454,6 +23443,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23508,6 +23503,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24117,6 +24140,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24431,9 +24457,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25472,6 +25513,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27576,6 +27620,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ms.po b/i18n/po/ms.po
index 8508bf9..65cd623 100644
--- a/i18n/po/ms.po
+++ b/i18n/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2011-12-11 22:14+0000\n"
"Last-Translator: abuyop <Unknown>\n"
"Language-Team: Malay <ms at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:50+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:49+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: ms\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/nb.po b/i18n/po/nb.po
index 29333e9..55a8fc2 100644
--- a/i18n/po/nb.po
+++ b/i18n/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2014-03-19 14:25+0000\n"
"Last-Translator: Magnus Meyer Hustveit <Unknown>\n"
"Language-Team: Norwegian Bokmal <nb at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:51+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:51+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: nb\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -450,15 +450,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "Jevn fordeling av noder"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Fordel valgte noder med lik avstand etter en linje."
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Last ned fra OSM …"
@@ -475,6 +478,9 @@ msgstr ""
msgid "Download data"
msgstr "Last ned data"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Last ned objekt..."
@@ -969,6 +975,12 @@ msgstr "Steng dialog og avbryt nedlasting"
msgid "Download Data"
msgstr "Laster ned data"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1722,6 +1734,28 @@ msgstr ""
msgid "Notes"
msgstr "Sedler"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1731,6 +1765,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2319,136 +2356,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> – alle endrede objekter"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> – alle objekter i utvalg"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> – alle uferdige objekter"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> – alle objekter uten egenskaper"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>uttrykk</i></b> – alle underobjekter av objektene i uttrykket"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>uttrykk</i></b> – alle overobjekter av objektene i uttrykket"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Bruk <b>|</b> eller <b>OR</b> for søk med logisk <i>eller</i>"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Bruk <b>(</b> og <b>)</b> for å gruppere uttrykk"
-
msgid "basic examples"
msgstr ""
@@ -2488,6 +2395,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2503,12 +2416,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2545,7 +2452,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2557,6 +2469,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3902,7 +3817,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4549,6 +4464,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4607,6 +4525,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -6025,9 +5946,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6896,8 +6814,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<different>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr ""
@@ -6914,6 +6842,12 @@ msgstr "Medlem av"
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr "<different>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -7044,6 +6978,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7779,18 +7723,21 @@ msgstr "Objekt"
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7799,6 +7746,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8835,6 +8785,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10841,6 +10794,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11478,6 +11437,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14234,6 +14201,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14337,6 +14307,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14464,6 +14437,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -15086,11 +15062,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15422,6 +15393,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Legger inn markører eller Noder på gps posisjon."
@@ -16128,15 +16104,34 @@ msgstr ""
msgid "deciduous"
msgstr "løvskog"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahai"
@@ -17384,6 +17379,12 @@ msgstr "Fergerute"
msgid "Marina"
msgstr "Marina"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr "Brygge"
@@ -17782,6 +17783,12 @@ msgstr "Bilvask"
msgid "Car Dealer"
msgstr "Bilforretning"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Repair"
msgstr "Verksted"
@@ -17794,12 +17801,6 @@ msgstr ""
msgid "Rental"
msgstr "Utleie"
-msgid "Second hand"
-msgstr ""
-
-msgid "only"
-msgstr ""
-
msgid "Sharing"
msgstr "Bildeling"
@@ -18009,6 +18010,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr "T-baneinngang"
+
msgid "Station or amenities"
msgstr ""
@@ -18064,9 +18068,6 @@ msgstr "Stasjon"
msgid "Building"
msgstr "Bygning"
-msgid "Subway Entrance"
-msgstr "T-baneinngang"
-
msgid "Ticket Machine"
msgstr ""
@@ -18193,7 +18194,7 @@ msgstr "Stjerner"
msgid "Motel"
msgstr "Motell"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18838,9 +18839,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -19014,6 +19012,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr "Ryggstø"
@@ -19761,9 +19771,6 @@ msgstr "Fyrtårn"
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22319,6 +22326,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22485,36 +22502,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "Oppdater liste over Porter"
-
-msgid "Configure"
-msgstr "Konfigurer"
-
-msgid "Connection Error."
-msgstr "Feil i forbindelsen"
-
-msgid "configure the connected DG100"
-msgstr "konfigurer DG100 som er tilkoblet"
-
-msgid "delete data after import"
-msgstr "slett data etter import"
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23635,6 +23622,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23689,6 +23682,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24319,6 +24340,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "Konfigurer"
+
msgid "Configure conflation options"
msgstr ""
@@ -24633,9 +24657,24 @@ msgstr "Slå av Data logg hvis avstand er mindre enn"
msgid "Unknown logFormat"
msgstr "Ukjent Logg format"
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "Oppdater liste over Porter"
+
msgid "Configure Device"
msgstr "Konfigurer enhet"
+msgid "Connection Error."
+msgstr "Feil i forbindelsen"
+
+msgid "configure the connected DG100"
+msgstr "konfigurer DG100 som er tilkoblet"
+
+msgid "delete data after import"
+msgstr "slett data etter import"
+
msgid "Importing data from device."
msgstr "Importerer data fra enhet"
@@ -25687,6 +25726,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr "Måleverdier"
@@ -27792,6 +27834,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr "Lagre LiveData automatisk"
diff --git a/i18n/po/nds.po b/i18n/po/nds.po
index 6022326..bcea38b 100644
--- a/i18n/po/nds.po
+++ b/i18n/po/nds.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2009-11-29 09:01+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: German, Low <nds at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:50+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:50+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3864,7 +3781,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4504,6 +4421,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4562,6 +4482,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5952,9 +5875,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6823,9 +6743,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6841,6 +6771,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6971,6 +6907,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7697,18 +7643,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7717,6 +7666,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8739,6 +8691,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10703,6 +10658,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11340,6 +11301,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14068,6 +14037,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14171,6 +14143,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14298,6 +14273,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14920,11 +14898,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15241,6 +15214,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15944,15 +15922,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17200,6 +17197,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17598,22 +17601,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17825,6 +17828,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17880,9 +17886,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18009,7 +18012,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18654,9 +18657,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18830,6 +18830,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19577,9 +19589,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22135,6 +22144,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22301,36 +22320,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23449,6 +23438,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23503,6 +23498,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24112,6 +24135,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24426,9 +24452,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25467,6 +25508,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27571,6 +27615,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/nl.po b/i18n/po/nl.po
index c101792..08a13c0 100644
--- a/i18n/po/nl.po
+++ b/i18n/po/nl.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-03-14 09:21+0000\n"
-"Last-Translator: Erik Bent <Unknown>\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-25 16:03+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: 2015-04-01 04:38+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:38+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: nl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -470,15 +470,21 @@ msgstr "paneel Schakelvensters"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "paneel Schakelvensters , kaartweergave maximaliseren"
-msgid "Distribute Nodes"
-msgstr "Knopen gelijkmatig verdelen"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Verdeel de geselecteerde knopen op gelijke afstanden langs een lijn."
msgid "Ignoring {0} nodes with null coordinates"
msgstr "{0} nodes zonder coordinaten worden genegeerd"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+"Selecteer :\n"
+"* Eén niet zichzelf kruisende weg met tenminste twee van zijn knopen;\n"
+"* Drie knopen."
+
msgid "Download from OSM..."
msgstr "Downloaden vanuit OSM..."
@@ -495,6 +501,9 @@ msgstr ""
msgid "Download data"
msgstr "Ophalen gegevens"
+msgid "Download notes in current view"
+msgstr "Opmerkingen in huidige weergave downloaden"
+
msgid "Download object..."
msgstr "Object downloaden..."
@@ -1054,6 +1063,12 @@ msgstr "Sluit dialoogvenster en stop het downloaden"
msgid "Download Data"
msgstr "Download gegevens"
+msgid "Which tasks to perform?"
+msgstr "Welke taken moeten worden uitgevoerd?"
+
+msgid "Ok"
+msgstr "OK"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1886,6 +1901,32 @@ msgstr "Notities worden opgehaald"
msgid "Notes"
msgstr "Notities"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] "{0} opmerking is gedownload."
+msgstr[1] "{0} opmerkingen zijn gedownload."
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+"Er zouden meer opmerkingen te downloaden kunnen zijn geweest, maar de limiet "
+"voor downloaden was {0}."
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+"Verzoek een kleiner gebied om er zeker van te zijn dat alle opmerkingen "
+"worden gedownload."
+
+msgid "More notes to download"
+msgstr "Meer opmerkingen te downloaden"
+
+msgid "Download OSM Notes within Bounds"
+msgstr "Download OSM opmerkingen binnen grenzen"
+
+msgid "Download OSM Note by ID"
+msgstr "Download OSM opmerkingen per ID"
+
msgid "Download Compressed OSM Change"
msgstr "Gecomprimeerde wijziging van OSM downloaden"
@@ -1895,6 +1936,9 @@ msgstr "Wjziging van OSM downloaden"
msgid "Download Compressed OSM"
msgstr "Gecomprimeerde OSM downloaden"
+msgid "Download OSM object by ID"
+msgstr "Download OSM object per ID"
+
msgid "Download OSM"
msgstr "OSM downloaden"
@@ -2019,7 +2063,7 @@ msgid "Click the location where you wish to create a new note"
msgstr "Geef locatie aan waar een notitie gemaakt moet worden"
msgid "Create new note"
-msgstr "Maan nieuwe notitie"
+msgstr "Maak een nieuwe notitie"
msgid "Create note"
msgstr "Maak notitie"
@@ -2167,7 +2211,7 @@ msgid "Dual alignment active."
msgstr "Dubbel uitlijnen"
msgid "Segment collapsed due to its direction reversing."
-msgstr ""
+msgstr "Segment samengevouwen wegens omdraaien van de richting."
msgid "Move a segment along its normal, then release the mouse button."
msgstr ""
@@ -2537,170 +2581,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Ongeldige zoekexpressie"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Baker Street</b> - ''Baker'' en ''Street'' in een sleutel"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' in een sleutel"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>sleutel:Bak</b> - ''Bak'' ergens in de sleutel ''sleutel''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-sleutel:Bak</b> - ''Bak'' nergens in de sleutel ''sleutel''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-"<b>sleutel=waarde</b> - sleutel \"sleutel\" met de exacte waarde \"waarde\""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - sleutel ''key'' met elke waarde. Probeer ook <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>sleutel:</b> - sleutel \"sleutel\" met welke waarde dan ook"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>sleutel?</b> - sleutel \"sleutel\" met de waarde \"yes\", \"true\", \"1\" "
-"of \"on\""
-
-msgid "Special targets"
-msgstr "Speciale doelen"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - objecten met overeenkomende type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - objecten veranderd door gebruiker"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b>\t- objecten veranderd door anonieme gebruikers"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - objecten met opgegeven ID (0 voor nieuwe objecten)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - objecten met opgegeven versie (0 objecten zonder een "
-"toegewezen versie)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - objecten met een bepaalde wijzigingenset-ID (0 "
-"objecten zonder toegewezen wijzigingenset)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - objecten met opgegeven aantal knopen "
-"(<b>nodes:</b>aantal, <b>nodes:</b>min-max, <b>nodes:</b>min- of "
-"<b>nodes:</b>-max)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - objecten met opgegeven aantal tags (<b>tags:</b>aantal, "
-"<b>tags:</b>min-max, <b>tags:</b>min- of <b>tags:</b>-max)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - objecten met opgegeven rol in een relatie"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>tijdopgave - objecten met dit laatste wijzigingsmoment "
-"(2009-11-12T14:51:09Z, 2009-11-12 of T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-"<b>timestamp:</b>min/max - objecten met de laatste wijziging binnen dit "
-"bereik"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - gesloten wegen met opgegeven gebied in m² "
-"(<b>areasize:</b>min-max of <b>areasize:</b>max)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - alle aangepaste objecten"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - alle geselecteerde objecten"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - alle incomplete objecten"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - alle objecten zonder tag"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-"<b>closed</b> - alle gesloten wegen (een knoop wordt niet als gesloten weg "
-"beschouwd)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>expr</i></b> - alle kinderen van objecten die aan de expressie "
-"voldoen"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - alle ouders van objecten die aan de expressie "
-"voldoen"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - objecten (en al diens wegknopen / leden van "
-"relaties) in gedownload gebied"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - objecten (en alle wegknopen / leden van relaties "
-"daarvan) in huidige weergave"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Gebruik <b>|</b> of <b>OR</b> om te combineren met een logische OF"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Gebruik <b>\"</b> om operatoren te citeren (bijv. of een sleutel <b>:</b> "
-"bevat)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Tussen aanhalingstekens moet vóór de tekens <b>\"</b>- en <b>\\</b> een <b>\\"
-"</b> gezet worden. (bijv. <b>\\\"</b> en <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Gebruik <b>(</b> en <b>)</b> om expressies te groeperen"
-
msgid "basic examples"
msgstr "Basisvoorbeelden"
@@ -2741,6 +2621,15 @@ msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
"komt overeen als ''key'' groter is dan ''value'' (vergelijkbaar, kleiner dan)"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"om operatoren aan te halen.<br>Binnen aangehaalde tekenreeksen moeten de "
+"tekens <b>\"</b> en <b>\\</b> worden geëscaped door een daaraan voorafgaande "
+"<b>\\</b> (bijv. <b>\\\"</b> en <b>\\\\</b>)."
+
msgid "combinators"
msgstr "combinatoren"
@@ -2756,15 +2645,6 @@ msgstr "logische NOT"
msgid "use parenthesis to group expressions"
msgstr "gebruik haakjes om uitdrukkingen te groeperen"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"om operatoren aan te halen.<br>Binnen aangehaalde tekenreeksen moeten de "
-"tekens <b>\"</b> en <b>\\</b> worden geëscaped door een daaraan voorafgaande "
-"<b>\\</b> (bijv. <b>\\\"</b> en <b>\\\\</b>)."
-
msgid "objects"
msgstr "objecten"
@@ -2801,8 +2681,16 @@ msgstr "objecten met laatste tijdstempel voor wijziging binnen het bereik"
msgid "properties"
msgstr "eigenschappen"
-msgid "objects with at least 20 nodes"
-msgstr "objecten met tenminste 20 knopen"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+"wegen met ten minste 20 knopen, of relaties die tenminste 20 knopen bevatten"
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
+"knopen met ten minste 3 wegen waarnaar wordt verwezen, of relaties die ten "
+"minste 3 wegen bevatten"
msgid "objects having 5 to 10 tags"
msgstr "objecten met 5 tot 10 labels"
@@ -2813,6 +2701,9 @@ msgstr "objecten met de opgegeven rol in een relatie"
msgid "closed ways with an area of 100 m²"
msgstr "gesloten wegen met een gebied van 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr "wegen met een lengte van 200 m of meer"
+
msgid "state"
msgstr "status"
@@ -3934,7 +3825,7 @@ msgid "URL contains an invalid protocol: {0}"
msgstr "URL bevan ongeldig protocol: {0}"
msgid "URL contains an invalid authority: {0}"
-msgstr ""
+msgstr "URL bevat een ongeldige authoriteit: {0}"
msgid "URL contains an invalid path: {0}"
msgstr "URL heeft ongeldig pad: {0}"
@@ -4233,12 +4124,18 @@ msgid ""
msgid_plural ""
"Multipolygon relation should be tagged with area tags and not the outer ways"
msgstr[0] ""
+"Multipolygone relatie zou moeten zijn getagd met tags voor gebieden en niet "
+"voor buitenste weg"
msgstr[1] ""
+"Multipolygone relaties zou moeten zijn getagd met tags voor gebieden en niet "
+"voor buitenste wegen"
msgid ""
"With the currently used mappaint style the style for inner way equals the "
"multipolygon style"
msgstr ""
+"Met de huidige gebruikte kaarttekenstijl komt de stijl voor de binnenste weg "
+"overeen met die van de stijl voor de multipolygoon"
msgid "Style for outer way mismatches"
msgstr "De stijl voor buitenste weg komt niet overeen"
@@ -4247,9 +4144,11 @@ msgid ""
"With the currently used mappaint style(s) the style for outer way mismatches "
"polygon"
msgstr ""
+"Met de huidige gebruikte kaarttekenstijl(en) komt de stijl voor de buitenste "
+"weg niet overeen met die van de multipolygoon"
msgid "Area style on outer way"
-msgstr ""
+msgstr "Stijl voor gebied op buitenste weg"
msgid "Multipolygon is not closed"
msgstr "Multipolygoon is niet gesloten"
@@ -4279,8 +4178,8 @@ msgstr ""
"gelijk is aan enkele attributen ''name:*'' en niet een samenstelling van "
"attributen ''name:*'', bijv., Italia - Italiaans - Italië."
-msgid "A name:* translation is missing."
-msgstr "Een vertaling voor name:* ontbreekt."
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr "Ontbrekende naam:*={0}. Voeg tag met juiste taalsleutel toe."
msgid "A name is missing, even though name:* exists."
msgstr "Een naam ontbreekt, terwijl wel name:* bestaan."
@@ -4940,6 +4839,9 @@ msgstr "Geeft de versie van JOSM weer en eindigt"
msgid "Print debugging messages to console"
msgstr "Druk berichten voor debuggen af naar scherm"
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -5004,6 +4906,9 @@ msgstr "Zorg dat u wat gegevens inlaadt, als u --selection gebruikt."
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5260,7 +5165,7 @@ msgid "Last change date"
msgstr ""
msgid "Select note sorting method"
-msgstr ""
+msgstr "Sorteervolgorde van notities"
msgid "Click to cancel the current operation"
msgstr "Klik om de huidige bewerking te annuleren."
@@ -6546,9 +6451,6 @@ msgstr "Lat/Lon"
msgid "East/North"
msgstr "Oost/Noord"
-msgid "Ok"
-msgstr "OK"
-
msgid "Please enter a GPS coordinates"
msgstr "Voer GPS-coördinaten in"
@@ -6710,7 +6612,7 @@ msgid "Customize the style"
msgstr ""
msgid "List of notes"
-msgstr ""
+msgstr "Lijst van opmerkingen"
msgid "Add comment"
msgstr ""
@@ -6719,34 +6621,34 @@ msgid "Comment"
msgstr "Commentaar"
msgid "Comment on note"
-msgstr ""
+msgstr "Opmerking bij notitie"
msgid "Add comment to note:"
-msgstr ""
+msgstr "Voeg een opmerking bij de notitie toe"
msgid "Close note"
-msgstr ""
+msgstr "Notitie afsluiten"
msgid "Close note with message:"
-msgstr ""
+msgstr "Notitie afsluiten met een toelichting"
msgid "Create a new note"
-msgstr ""
+msgstr "Maak een nieuwe notitie"
msgid "Create"
msgstr "Maken"
msgid "Reopen note"
-msgstr ""
+msgstr "Notitie heropenen"
msgid "Reopen"
msgstr ""
msgid "Reopen note with message:"
-msgstr ""
+msgstr "Notitie heropenen met een toelichting"
msgid "Sort notes"
-msgstr ""
+msgstr "Sorteer notities"
msgid "Sort"
msgstr "Sorteren"
@@ -7511,8 +7413,18 @@ msgstr "Te missen sleutel: voorgrond"
msgid "Discardable key: background"
msgstr "Te missen sleutel: achtergrond"
-msgid "<different>"
-msgstr "<verschillend>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr "Selecteer de objecten waarvan de tags gewijzigd moeten worden."
@@ -7529,6 +7441,12 @@ msgstr "Lid van"
msgid "Position"
msgstr "Positie"
+msgid "<different>"
+msgstr "<verschillend>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Tags: {0} / Leden: {1}"
@@ -7661,6 +7579,16 @@ msgstr "Stel aantal recent toegevoegde tags in"
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
"Voer het aantal recent toegevoegde tags in dat moet worden weergegeven"
@@ -8184,6 +8112,7 @@ msgstr "Selecteren om GPS-sporen voor het geselecteerde gebied te downloaden"
msgid "Select to download notes in the selected download area."
msgstr ""
+"Selecteer dit om de notities van het geselecteerde gebied op te halen"
msgid "Download as new layer"
msgstr "Als nieuwe laag downloaden"
@@ -8485,18 +8414,21 @@ msgstr "Object"
msgid "not present"
msgstr "niet aanwezig"
-msgid "Changeset:"
-msgstr "Wijzigingenset:"
-
msgid "Changeset comment"
msgstr "Opmerking wijzigingenset"
msgid "Changeset source"
msgstr "Bron wijzigingenset"
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr "<b>Bron</b>:"
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8507,6 +8439,9 @@ msgid ""
msgstr ""
"<html>Versie <strong>{0}</strong> gemaakt op <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "Wijzigingenset info"
@@ -9541,13 +9476,13 @@ msgid "Save Layer"
msgstr "Laag opslaan"
msgid "Note"
-msgstr "Opmerking"
+msgstr "Notitie"
msgid "Notes layer"
-msgstr ""
+msgstr "Notities kaartlaag"
msgid "Total notes:"
-msgstr ""
+msgstr "Totaal aantal notities"
msgid "Changes need uploading?"
msgstr ""
@@ -9692,6 +9627,9 @@ msgstr "Pixelschaal: {0}"
msgid "Best zoom: {0}"
msgstr "Beste zoomniveau: {0}"
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "TMS-laag ({0}), downloaden met zoom {1}"
@@ -11909,6 +11847,12 @@ msgstr "Toevoegen aan kiezer voor slippykaart: "
msgid "Tile cache directory: "
msgstr "Map voor cache van tegels: "
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12619,6 +12563,14 @@ msgstr "Controleer periodiek op nieuwe berichten"
msgid "Check interval (minutes):"
msgstr "Interval voor controle (minuten):"
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
"Ophalen van toegangstoken voor OAuth vanaf beheerder van inloggegevens "
@@ -13897,7 +13849,7 @@ msgid "Contacting Server..."
msgstr "Met server verbinden..."
msgid "Downloading OSM notes..."
-msgstr ""
+msgstr "Notities worden gedownload..."
msgid "Failed to open connection to API {0}."
msgstr "Openen van verbinding met {0} mislukt."
@@ -15732,6 +15684,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -15835,6 +15790,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -15962,6 +15920,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -16584,13 +16545,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"Maakt bewerken verkeersinformatie mogelijk en exporteert het naar de "
-"stedelijke mobiliteitssimulator SUMO"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -16996,6 +16950,13 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "Mogelijkheden om te bewerken voor OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Maakt bewerken verkeersinformatie mogelijk en exporteert het naar de "
+"stedelijke mobiliteitssimulator SUMO"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
"Maakt het mogelijk markeringen/knopen toe te voegen op huidige GPS-posities."
@@ -17735,15 +17696,34 @@ msgstr ""
msgid "deciduous"
msgstr "loofbomen"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "Bahai"
@@ -19004,6 +18984,12 @@ msgstr "Route veerpont"
msgid "Marina"
msgstr "Jachthaven"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "openbaar"
+
msgid "Pier"
msgstr "Pier"
@@ -19402,6 +19388,12 @@ msgstr "Autowasstraat"
msgid "Car Dealer"
msgstr "Autodealer"
+msgid "Second hand"
+msgstr "Tweedehands"
+
+msgid "only"
+msgstr "alleen"
+
msgid "Repair"
msgstr "Garage"
@@ -19414,12 +19406,6 @@ msgstr ""
msgid "Rental"
msgstr "Verhuur"
-msgid "Second hand"
-msgstr "Tweedehands"
-
-msgid "only"
-msgstr "alleen"
-
msgid "Sharing"
msgstr "Auto delen"
@@ -19630,6 +19616,9 @@ msgstr "Halte"
msgid "Platform"
msgstr "Perron"
+msgid "Subway Entrance"
+msgstr "In-/uitgang metro"
+
msgid "Station or amenities"
msgstr "Station of faciliteiten"
@@ -19685,9 +19674,6 @@ msgstr "Station"
msgid "Building"
msgstr "Gebouw"
-msgid "Subway Entrance"
-msgstr "In-/uitgang metro"
-
msgid "Ticket Machine"
msgstr "Kaartjesautomaat"
@@ -19814,7 +19800,7 @@ msgstr "Sterren"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -20459,9 +20445,6 @@ msgstr ""
msgid "Access rights"
msgstr "Toegangsrechten"
-msgid "public"
-msgstr "openbaar"
-
msgid "seasonal"
msgstr "seizoengebonden"
@@ -20521,7 +20504,7 @@ msgstr "Munten"
msgctxt "payment"
msgid "Notes"
-msgstr ""
+msgstr "Notities"
msgid "Telephone cards"
msgstr "Telefoonkaarten"
@@ -20635,6 +20618,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr "Brandtijden"
+
msgid "Backrest"
msgstr "Ruggensteun"
@@ -21382,9 +21377,6 @@ msgstr "Vuurtoren"
msgid "Street Lamp"
msgstr "Straatlantaarn"
-msgid "Operation times"
-msgstr "Brandtijden"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Ma-Vr 22:00-05:00"
@@ -23466,7 +23458,7 @@ msgstr ""
msgctxt "the tag note=*"
msgid "Note"
-msgstr ""
+msgstr "Notitie"
msgctxt "note=*"
msgid "An important hint for other mappers (not for the end user)."
@@ -23942,6 +23934,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24115,36 +24117,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr "OSM exporteren"
-
-msgid "Export traffic data to SUMO network file."
-msgstr "Exporteer verkeersgegevens naar SUMO netwerkbestand."
-
-msgid "SUMO Export"
-msgstr "SUMO exporteren"
-
-msgid "Export"
-msgstr "Exporteren"
-
-msgid "Port:"
-msgstr "Poort:"
-
-msgid "refresh the port list"
-msgstr "Lijst met poorten vernieuwen"
-
-msgid "Configure"
-msgstr "Configureren"
-
-msgid "Connection Error."
-msgstr "Verbindingsfout."
-
-msgid "configure the connected DG100"
-msgstr "De verbonden DG100 configureren"
-
-msgid "delete data after import"
-msgstr "gegevens na importeren verwijderen"
-
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV-bestanden"
@@ -25404,6 +25376,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Straatnaam:"
@@ -25458,6 +25436,34 @@ msgstr "Punt aan het tegenoverliggende einde van het gebouw"
msgid "Set width of the building"
msgstr "Stel de breedte van het gebouw in"
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr "op polygoon"
@@ -26139,6 +26145,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "Configureren"
+
msgid "Configure conflation options"
msgstr ""
@@ -26459,9 +26468,24 @@ msgstr "Loggen van gegevens uitschakelen als afstand kleiner wordt dan"
msgid "Unknown logFormat"
msgstr "Onbekende indeling log"
+msgid "Port:"
+msgstr "Poort:"
+
+msgid "refresh the port list"
+msgstr "Lijst met poorten vernieuwen"
+
msgid "Configure Device"
msgstr "Apparaat configureren"
+msgid "Connection Error."
+msgstr "Verbindingsfout."
+
+msgid "configure the connected DG100"
+msgstr "De verbonden DG100 configureren"
+
+msgid "delete data after import"
+msgstr "gegevens na importeren verwijderen"
+
msgid "Importing data from device."
msgstr "Gegevens vanaf apparaat importeren."
@@ -27595,6 +27619,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr "Exporteren"
+
msgid "Measured values"
msgstr "Gemeten waarden"
@@ -29838,6 +29865,15 @@ msgstr "Drempel voor samenvoegen dicht bij elkaar gelegen knopen"
msgid "SeaMap Editor"
msgstr "Bewerken SeaMap"
+msgid "OSM Export"
+msgstr "OSM exporteren"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Exporteer verkeersgegevens naar SUMO netwerkbestand."
+
+msgid "SUMO Export"
+msgstr "SUMO exporteren"
+
msgid "AutoSave LiveData"
msgstr "LiveData automatisch opslaan"
diff --git a/i18n/po/nn.po b/i18n/po/nn.po
index 8786ed6..1fa12c2 100644
--- a/i18n/po/nn.po
+++ b/i18n/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2009-07-15 12:49+0000\n"
"Last-Translator: Skippern <Unknown>\n"
"Language-Team: Norwegian Nynorsk <nn at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:51+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:50+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: nn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/oc.po b/i18n/po/oc.po
index f348934..d5c2920 100644
--- a/i18n/po/oc.po
+++ b/i18n/po/oc.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2012-10-03 22:14+0000\n"
"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary at yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:52+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:51+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -451,15 +451,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "Distribuir los nosèls"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Telecargar dempuèi OSM…"
@@ -474,6 +477,9 @@ msgstr ""
msgid "Download data"
msgstr "Telecargar las donadas."
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Telecargar un objècte..."
@@ -968,6 +974,12 @@ msgstr ""
msgid "Download Data"
msgstr "Telecargar de donadas"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "D'acòrdi"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1712,6 +1724,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1721,6 +1755,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2303,134 +2340,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2470,6 +2379,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2485,12 +2400,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2527,7 +2436,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2539,6 +2453,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3872,7 +3789,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4512,6 +4429,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4570,6 +4490,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5960,9 +5883,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr "D'acòrdi"
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6831,8 +6751,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<diferent>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr ""
@@ -6849,6 +6779,12 @@ msgstr "Membre de"
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr "<diferent>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6979,6 +6915,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7705,18 +7651,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7725,6 +7674,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8747,6 +8699,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10713,6 +10668,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11350,6 +11311,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14078,6 +14047,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14181,6 +14153,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14308,6 +14283,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14930,11 +14908,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15251,6 +15224,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15954,15 +15932,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17210,6 +17207,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17608,22 +17611,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17835,6 +17838,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17890,9 +17896,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18019,7 +18022,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18664,9 +18667,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18840,6 +18840,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19587,9 +19599,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22145,6 +22154,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22311,36 +22330,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23459,6 +23448,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23513,6 +23508,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24122,6 +24145,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24436,9 +24462,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25477,6 +25518,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27581,6 +27625,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/pa.po b/i18n/po/pa.po
index db1bf65..9dd330c 100644
--- a/i18n/po/pa.po
+++ b/i18n/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2011-05-06 15:52+0000\n"
"Last-Translator: A S Alam <aalam at users.sf.net>\n"
"Language-Team: Punjabi <pa at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:52+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:52+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: pa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/pl.po b/i18n/po/pl.po
index 414e032..7649062 100644
--- a/i18n/po/pl.po
+++ b/i18n/po/pl.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-04-01 00:29+0000\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-21 15:02+0000\n"
"Last-Translator: Daniel Koć <daniel at xn--ko-wla.pl>\n"
"Language-Team: Polish <josm-lang-pl at googlegroups.com>\n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,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: 2015-04-01 04:53+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:53+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: pl\n"
"X-Poedit-Bookmarks: 1098,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
"X-Poedit-Basepath: /home/mfloryan/dev/josm/i18n/\n"
@@ -478,9 +478,6 @@ msgstr "Przełącz panel dialogowy"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Przełącz panel dialogowy, maksymalizuj widok mapy"
-msgid "Distribute Nodes"
-msgstr "Rozmieść węzły"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Rozmieszcza wybrane węzły tak by znajdowały się w równych odległościach na "
@@ -489,6 +486,12 @@ msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Zignorowane punkty {0} bez współrzędnych"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Pobierz z OSM..."
@@ -505,6 +508,9 @@ msgstr ""
msgid "Download data"
msgstr "Pobiera dane"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Pobierz obiekt…"
@@ -1037,6 +1043,12 @@ msgstr "Zamknij okno i porzuć pobieranie"
msgid "Download Data"
msgstr "Pobierz dane"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "OK"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1281,7 +1293,7 @@ msgid "Search for notes"
msgstr "Wyszukaj uwagi"
msgid "You must enter a search term"
-msgstr ""
+msgstr "Musisz wpisać szukane hasło"
msgid "Select All"
msgstr "Zaznacz wszystko"
@@ -1856,7 +1868,7 @@ msgid "Markers from {0}"
msgstr "Znaczniki z {0}"
msgid "Download OSM Notes"
-msgstr ""
+msgstr "Pobierz Uwagi OSM"
msgid "Downloading Notes"
msgstr "Pobieranie uwag"
@@ -1864,6 +1876,28 @@ msgstr "Pobieranie uwag"
msgid "Notes"
msgstr "Uwagi"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr "Pobiera skompresowane zmiany OSM"
@@ -1873,6 +1907,9 @@ msgstr "Pobiera zmiany OSM"
msgid "Download Compressed OSM"
msgstr "Pobiera skompresowany OSM"
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "Pobiera OSM"
@@ -2281,17 +2318,17 @@ msgid_plural ""
"an error.\n"
"Really move them?"
msgstr[0] ""
-"Przesunąłeś więcej niż {0} elementy. Przesuwanie dużej liczby elementów jest "
+"Przesunąłeś więcej niż {0} element. Przesuwanie dużej liczby elementów jest "
"często błędem.\n"
-"Na prawdę chcesz je przesunąć?"
+"Naprawdę chcesz je przesunąć?"
msgstr[1] ""
"Przesunąłeś więcej niż {0} elementy. Przesuwanie dużej liczby elementów jest "
"często błędem.\n"
-"Na prawdę chcesz je przesunąć?"
+"Naprawdę chcesz je przesunąć?"
msgstr[2] ""
"Przesunąłeś więcej niż {0} elementów. Przesuwanie dużej liczby elementów "
"jest często błędem.\n"
-"Na prawdę chcesz je przesunąć?"
+"Naprawdę chcesz je przesunąć?"
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Zwolnij przycisk myszki, aby zaznaczyć obiekty w kwadracie."
@@ -2521,163 +2558,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Niepoprawne wyrażenie regularne."
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Aleja Wolności</b> - \"Aleja\" i \"Wolności\" w dowolnym kluczu"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Aleja Wolności\"</b> - \"Aleja Wolności\" w dowolnym kluczu"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Bak</b> - \"Bak\" w dowolnym miejscu w kluczu \"key\""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Bak</b> - \"Bak\" nie występuje w kluczu \"key\""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-"<b>klucz=nazwa</b> - klucz \"klucz\" z zawartością \"nazwa\" (dokładnie)"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>klucz=*</b> - klucz \"klucz\" z dowolną zawartością. Inne możliwości: "
-"<b>*=nazwa</b>, <b>klucz=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - klucz ''key'' ustawiony na dowolną wartość"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>klucz?</b> - klucz ''klucz'' z wartością ''yes'', ''true'', ''1'' lub "
-"''on''"
-
-msgid "Special targets"
-msgstr "Specjalne cele"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>typ:</b>... - obiekty o określonym typie (<b>node</b> - węzeł, <b>way</b> "
-"- linia, <b>relation</b> - relacja)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - obiekty zmienione przez \"user\""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-"<b>user:anonymous</b> - obiekty zmienione przez użytkownika anonimowego"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - obiekty z podanym ID (ID jest 0 w nowych obiektach)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - obiekty z podaną wersją (0 - obiekty bez wersji)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - obiekty w grupie zmian ID (0 obiekty nie będące w "
-"grupie zmian)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - obiekty z podaną ilością węzłów (<b>nodes:</b>ilość, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- lub <b>nodes:</b>-max)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - obiekty z podaną ilością tagów (<b>tags:</b>ilość, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - obiekty o określonej roli w relacji"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>timestamp - obiekty z ostatnią datą modyfikacji w timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 lub T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr "<b>timestamp:</b>min/max - obiekty z ostatnią modyfikacją w zakresie"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - zamknięte linie ograniczające obszar o podanej "
-"wielkości w m² (<b>areasize:</b>min-max lub <b>areasize:</b>max)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - wszystkie zmienione obiekty"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - wszystkie zaznaczone obiekty"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - wszystkie niekompletne obiekty"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - wszystkie obiekty bez tagów"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-"<b>closed</b> - wszystkie zamknięte linie (pojedynczy węzeł nie tworzy "
-"zamkniętej linii)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>expr</i></b> - wszystkie dzieci obiektu pacujące do wyrażenia"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - wszyscy rodzice obiektu pasujący do wyrażenia"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - obiekty (i wszystkie węzły należace do linii, "
-"i obiekty w relacjach) w pobranym obszarze"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - obiekty (i wszystkie węzły należace do linii, i obiekty "
-"w relacjach) w aktualnym widoku"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Użyj <b>I</b> lub <b>OR</b> by połączyć logicznym \"lub\""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr "Użyj <b>\"</b> aby „zacytować” operatory (n.p. jeśli klucz <b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Wewnątrz cytowanego tekstu znaki <b>\"</b> and <b>\\</b> muszą być "
-"poprzedzone znakiem <b>\\</b> (n.p. <b>\\\"</b> and <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Użyj <b>(</b> oraz <b>)</b> aby pogrupować wyrażenia"
-
msgid "basic examples"
msgstr "Podstawowe przykłady"
@@ -2718,6 +2598,15 @@ msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
"pasuje jeśli \"klucz\" jest większy niż \"wartość\" (analogicznie, niecały)"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"aby zacytować operatory.<br>Teksty zawierające znaki cudzysłowu <b>\"</b> "
+"lub wsteczny ukośnik <b>\\</b> powinny koniecznie być cytowane za pomocą "
+"znaku modyfikacji (np. <b>\\\"</b> i <b>\\\\</b>)."
+
msgid "combinators"
msgstr "kombinacje"
@@ -2733,15 +2622,6 @@ msgstr "znak zaprzeczenia"
msgid "use parenthesis to group expressions"
msgstr "użyj nawiasów do zgrupowania wyrażeń"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"aby zacytować operatory.<br>Teksty zawierające znaki cudzysłowu <b>\"</b> "
-"lub wsteczny ukośnik <b>\\</b> powinny koniecznie być cytowane za pomocą "
-"znaku modyfikacji (np. <b>\\\"</b> i <b>\\\\</b>)."
-
msgid "objects"
msgstr "obiekty"
@@ -2778,8 +2658,13 @@ msgstr "obiekty z ostatnim czasem modyfikacji w zakresie"
msgid "properties"
msgstr "właściwości"
-msgid "objects with at least 20 nodes"
-msgstr "obiekty z minimalnie 20 węzłami"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "obiekty mające od 5 do 10 tagów"
@@ -2790,6 +2675,9 @@ msgstr "obiekty w ustaloną rolą w relacji"
msgid "closed ways with an area of 100 m²"
msgstr "zamknięte linie z terenem od 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr "stan"
@@ -3949,7 +3837,7 @@ msgid "House number too far from street"
msgstr "Numer domu zbyt daleko od ulicy"
msgid "API Capabilities"
-msgstr ""
+msgstr "Możliwości API"
msgid "Checks for errors against API capabilities"
msgstr ""
@@ -4264,8 +4152,8 @@ msgstr ""
"równy innym atrybutom ''name:*'' i zbiorom atrybutów ''name:*'', na "
"przykład, Italia - Italien - Włochy."
-msgid "A name:* translation is missing."
-msgstr "Brakuje tłumaczenia dla name:*."
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "Brak tagu name, istnieje jednak name:*"
@@ -4921,6 +4809,9 @@ msgstr "Wyświetla wersję JOSM i wychodzi."
msgid "Print debugging messages to console"
msgstr "Drukuj wiadomości debugowania do konsoli"
+msgid "Skip loading plugins"
+msgstr "Pomiń ładowanie wtyczek"
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr "Wyłącz dostęp do danego zasobu(-ów), oddzielone przecinkiem"
@@ -4984,6 +4875,9 @@ msgstr "Upewnij się że ładujesz jakieś dane jeśli używasz --selection"
msgid "Printing debugging messages to console"
msgstr "Wypisywanie komunikatów debugowania na konsoli"
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr "Włączony poziom dokładnego debugowania (trace)"
@@ -6495,9 +6389,6 @@ msgstr "Szer/Dł"
msgid "East/North"
msgstr "Północny-wschód"
-msgid "Ok"
-msgstr "OK"
-
msgid "Please enter a GPS coordinates"
msgstr "Podaj współrzędne GPS"
@@ -6658,7 +6549,7 @@ msgid "Customize the style"
msgstr "Dostosuj styl"
msgid "List of notes"
-msgstr ""
+msgstr "Lista uwag"
msgid "Add comment"
msgstr "Dodaj komentarz"
@@ -7426,8 +7317,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<różne>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr "Zaznacz obiekty, którym chcesz zmienić znaczniki"
@@ -7444,6 +7345,12 @@ msgstr "Członek"
msgid "Position"
msgstr "Pozycja"
+msgid "<different>"
+msgstr "<różne>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Znaczniki: {0} / Członkowie: {1}"
@@ -7580,6 +7487,16 @@ msgstr "Ustal liczbę ostatnio dodanych tagów"
msgid "Remember last used tags after a restart"
msgstr "Pmiętaj ostatnio używane tagi po restarcie"
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr "Podaj liczbę wyświetlanych ostatnio dodanych tagów"
@@ -8363,18 +8280,21 @@ msgstr "Obiekt"
msgid "not present"
msgstr "nie występuje"
-msgid "Changeset:"
-msgstr "Zestaw zmian:"
-
msgid "Changeset comment"
msgstr "Komentarz zestawu zmian"
msgid "Changeset source"
msgstr "Źródło zestawu zmian"
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr "<b>Źródło</b>:"
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8385,6 +8305,9 @@ msgid ""
msgstr ""
"<html>Wersja <strong>{0}</strong> stworzone na <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "Informacje o zestawie zmian"
@@ -9558,6 +9481,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr "Najlepsze przybliżenie: {0}"
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "Warstwa TMS ({0}), pobieranie w powiększeniu {1}"
@@ -10461,11 +10387,11 @@ msgstr ""
"serwera OSM ''{0}''.</body></html>"
msgid "Please enter an Access Token Key"
-msgstr ""
+msgstr "Wprowadź Token dostępu"
msgid ""
"The Access Token Key must not be empty. Please enter an Access Token Key"
-msgstr ""
+msgstr "Token dostępu nie może być pusty. Wprowadź Token dostępu"
msgid "Please enter an Access Token Secret"
msgstr ""
@@ -11677,6 +11603,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr "Katalog buforowania kafelków: "
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12370,6 +12302,14 @@ msgstr "Okresowo sprawdzaj czy są nowe wiadomości"
msgid "Check interval (minutes):"
msgstr "Sprawdzaj co (w minutach):"
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -12657,7 +12597,7 @@ msgid "Choose tests to enable"
msgstr "Wybierz które testy mają być aktywne"
msgid "multiple"
-msgstr ""
+msgstr "wielokrotny"
msgid "Remove old keys from up to {0} object"
msgid_plural "Remove old keys from up to {0} objects"
@@ -13170,7 +13110,7 @@ msgid "Message notifier"
msgstr "Powiadamianie"
msgid "{0} not available (offline mode)"
-msgstr ""
+msgstr "{0} jest niedostępny (tryb offline)"
msgid ""
"No primitive with id {0} in local dataset. Cannot infer primitive type."
@@ -13250,7 +13190,7 @@ msgid "Unable to access ''{0}'': {1} not available (offline mode)"
msgstr ""
msgid "Unable to initialize OSM API."
-msgstr ""
+msgstr "Nie można zainicjować OSM API."
msgid "This version of JOSM is incompatible with the configured server."
msgstr "Ta wersja JOSM jest niekompatybilna z konfiguracją serwera."
@@ -13510,7 +13450,7 @@ msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
msgstr ""
msgid "{0} bytes have been read"
-msgstr ""
+msgstr "odczytano {0} bajtów"
msgid "Prepare OSM data..."
msgstr "Przygotowywanie danych OSM..."
@@ -13659,7 +13599,7 @@ msgid "Add checked tags to selected objects"
msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
-msgstr ""
+msgstr "Shift+Enter: Dodaj wszystkie tagi do wybranych obiektów"
msgid "Assume"
msgstr ""
@@ -13668,7 +13608,7 @@ msgid "Existing values"
msgstr "Obecne wartości"
msgid "Enable the checkbox to accept the value"
-msgstr ""
+msgstr "Zaznacz pole wyboru, aby zaakceptować wartość"
msgid "Accept all tags from {0} for this session"
msgstr ""
@@ -13756,7 +13696,7 @@ msgid "Remote Control has been asked to load data from the API."
msgstr ""
msgid "The latitudes must be between {0} and {1}"
-msgstr ""
+msgstr "Szerokość geograficzna musi być pomiędzy {0} i {1}"
msgid "The longitudes must be between {0} and {1}"
msgstr "Długości geograficzne muszą być pomiędzy {0} a {1}"
@@ -14153,7 +14093,7 @@ msgid "Update plugin"
msgstr "Aktualizuj wtyczkę"
msgid "Click to update the plugin ''{0}''"
-msgstr ""
+msgstr "Kliknij aby zaaktualizować wtyczkę ''{0}''"
msgid "Click to disable the plugin ''{0}''"
msgstr "Kliknij aby zablokować wtyczkę ''{0}''"
@@ -14482,9 +14422,11 @@ msgid ""
"<html>Authorisation at the OSM server failed.<br>The server reported the "
"following error:<br>''{0}''</html>"
msgstr ""
+"<html>Autoryzacja z serwerem OSM nie powiodła się.<br>Serwer zwrócił podany "
+"błąd:<br>''{0}''</html>"
msgid "<html>Authorisation at the OSM server failed.<br></html>"
-msgstr ""
+msgstr "<html>Autoryzacja z serwerem OSM nie powiodła się.<br></html>"
msgid ""
"<html>Authorisation at the OSM server with the OAuth token ''{0}'' "
@@ -15150,7 +15092,7 @@ msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
-msgstr ""
+msgstr "OpenCycleMap"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -15233,6 +15175,9 @@ msgstr ""
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -15336,6 +15281,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -15463,6 +15411,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -15617,16 +15568,16 @@ msgid "Będzin: Ortofotomapa 2013 (aerial image)"
msgstr ""
msgid "Będzin: Budynki (buildings)"
-msgstr ""
+msgstr "Będzin: Budynki"
msgid "Bytom: Ortofotomapa 2012 (aerial image)"
msgstr ""
msgid "Bytom: Budynki (buildings)"
-msgstr ""
+msgstr "Bytom: Budynki"
msgid "Chorzów: Budynki (buildings)"
-msgstr ""
+msgstr "Chorzów: Budynki"
msgid "Częstochowa: Ortofotomapa 2011 (aerial image)"
msgstr ""
@@ -15635,7 +15586,7 @@ msgid "Gliwice: Ortofotomapa 2013 (aerial image)"
msgstr ""
msgid "Gliwice: Budynki (buildings)"
-msgstr ""
+msgstr "Gliwice: Budynki"
msgid "Katowice: Ortofotomapa (aerial image)"
msgstr ""
@@ -15650,7 +15601,7 @@ msgid "Rzeszów: Ortofotomapa (aerial image)"
msgstr ""
msgid "Rzeszów: Budynki (buildings)"
-msgstr ""
+msgstr "Rzeszów: Budynki"
msgid "Siemianowice Śląskie: Ortofotomapa (aerial image)"
msgstr ""
@@ -15662,7 +15613,7 @@ msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
msgid "trail.pl: Szlaki (paths)"
-msgstr ""
+msgstr "trail.pl: Szlaki"
msgid "ScanEx IRS"
msgstr ""
@@ -16085,11 +16036,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -16428,6 +16374,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "Narzędzia i ułatwienia edycji dla OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -17043,7 +16994,7 @@ msgstr "wielopoziomowy"
msgctxt "parking"
msgid "surface"
-msgstr ""
+msgstr "na powierzchni"
msgctxt "parking"
msgid "underground"
@@ -17131,15 +17082,34 @@ msgstr ""
msgid "deciduous"
msgstr "liściasty"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahaizm"
@@ -18387,6 +18357,12 @@ msgstr "Trasa promu"
msgid "Marina"
msgstr "Port jachtowy (marina)"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "publiczny"
+
msgid "Pier"
msgstr "Molo"
@@ -18785,6 +18761,12 @@ msgstr "Myjnia samochodowa"
msgid "Car Dealer"
msgstr "Dealer samochodowy"
+msgid "Second hand"
+msgstr "Używane"
+
+msgid "only"
+msgstr "tylko"
+
msgid "Repair"
msgstr "Warsztat samochodowy"
@@ -18797,12 +18779,6 @@ msgstr "Opony"
msgid "Rental"
msgstr "Wypożyczalnia"
-msgid "Second hand"
-msgstr "Używane"
-
-msgid "only"
-msgstr "tylko"
-
msgid "Sharing"
msgstr "Punkt carsharingu"
@@ -19012,6 +18988,9 @@ msgstr "Miejsce zatrzymania"
msgid "Platform"
msgstr "Miejsce oczekiwania"
+msgid "Subway Entrance"
+msgstr "Wejście do metra"
+
msgid "Station or amenities"
msgstr ""
@@ -19067,9 +19046,6 @@ msgstr "Stacja kolejowa"
msgid "Building"
msgstr "Budynek"
-msgid "Subway Entrance"
-msgstr "Wejście do metra"
-
msgid "Ticket Machine"
msgstr "Automat biletowy"
@@ -19196,8 +19172,8 @@ msgstr "Gwiazdki"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
-msgstr "Pensjonat/pokoje gościnne"
+msgid "Guest House/Bed & Breakfast"
+msgstr "Pokoje gościnne/pensjonat"
msgid "Chalet"
msgstr "Chata górska"
@@ -19841,9 +19817,6 @@ msgstr "Toalety"
msgid "Access rights"
msgstr "Prawa dostępu"
-msgid "public"
-msgstr "publiczny"
-
msgid "seasonal"
msgstr "sezonowo"
@@ -20017,6 +19990,18 @@ msgstr "Kosz na śmieci"
msgid "Waste Disposal/Dumpster"
msgstr "Miejsca składowania śmieci"
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr "Czas działania"
+
msgid "Backrest"
msgstr "Oparcie"
@@ -20764,9 +20749,6 @@ msgstr "Latarnia morska"
msgid "Street Lamp"
msgstr "Latarnia uliczna"
-msgid "Operation times"
-msgstr "Czas działania"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Pon-Pt 22:00-05:00"
@@ -23326,6 +23308,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -23493,36 +23485,6 @@ msgstr "Wyświetlaj etykiety ulic (przy wysokim przybliżeniu)"
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr "Eksport"
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "odśwież listę portów"
-
-msgid "Configure"
-msgstr "Konfiguruj"
-
-msgid "Connection Error."
-msgstr "Błąd połączenia."
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr "usuń dane po imporcie"
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24649,20 +24611,26 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Nazwa ulicy:"
msgid "Big buildings mode"
-msgstr ""
+msgstr "Tryb dużych budynków"
msgid "Rotate crosshair"
-msgstr ""
+msgstr "Obracaj kursor"
msgid "Advanced settings"
msgstr "Ustawienia zaawansowane"
msgid "Buildings tags:"
-msgstr ""
+msgstr "Tagi budynków:"
msgid "Cannot place building outside of the world."
msgstr ""
@@ -24686,7 +24654,7 @@ msgid "Buildings width:"
msgstr "Szerokość:"
msgid "Length step:"
-msgstr ""
+msgstr "Długość segmentu:"
msgid "Advanced..."
msgstr "Zaawansowane..."
@@ -24703,6 +24671,34 @@ msgstr ""
msgid "Set width of the building"
msgstr "Ustal szerokość budynku"
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -25316,6 +25312,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "Konfiguruj"
+
msgid "Configure conflation options"
msgstr ""
@@ -25631,9 +25630,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "odśwież listę portów"
+
msgid "Configure Device"
msgstr "Konfiguruj urządzenie"
+msgid "Connection Error."
+msgstr "Błąd połączenia."
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr "usuń dane po imporcie"
+
msgid "Importing data from device."
msgstr ""
@@ -26678,6 +26692,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr "Eksport"
+
msgid "Measured values"
msgstr "Zmierzone wartości"
@@ -27659,7 +27676,7 @@ msgid "File could not be deleted!"
msgstr ""
msgid "Could not rename file!"
-msgstr ""
+msgstr "Nie można zmienić nazwy pliku!"
msgid "Could not rename file {0} to {1}!"
msgstr ""
@@ -27674,7 +27691,7 @@ msgid "Keep old backups and continue"
msgstr ""
msgid "Override"
-msgstr ""
+msgstr "Nadpisz"
msgid "Could not delete temporary file!"
msgstr ""
@@ -27997,7 +28014,7 @@ msgid "Code"
msgstr ""
msgid "added"
-msgstr ""
+msgstr "dodany"
msgid "Public Transport: Enable GTFSStops"
msgstr ""
@@ -28032,7 +28049,7 @@ msgid ""
msgstr ""
msgid "No data found"
-msgstr ""
+msgstr "Nie znaleziono danych"
msgid "The GTFS file was empty."
msgstr ""
@@ -28113,7 +28130,7 @@ msgid "[incomplete]"
msgstr ""
msgid "[empty way]"
-msgstr ""
+msgstr "[pusta droga]"
msgid "[ID] {0}"
msgstr "[ID] {0}"
@@ -28143,7 +28160,7 @@ msgid "Stops"
msgstr ""
msgid "Meta"
-msgstr ""
+msgstr "Meta"
msgid "Existing route patterns:"
msgstr ""
@@ -28158,7 +28175,7 @@ msgid "Common tags:"
msgstr ""
msgid "Additional tags:"
-msgstr ""
+msgstr "Dodatkowe znaczniki"
msgid "Add a new Tag"
msgstr "Dodaj nowy tag"
@@ -28493,7 +28510,7 @@ msgid "Show a selection of the most useful signs"
msgstr ""
msgid "Belgium"
-msgstr ""
+msgstr "Belgia"
msgid "Spain"
msgstr "Hiszpania"
@@ -28796,6 +28813,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
@@ -29062,7 +29088,7 @@ msgid "Delete parameter \"{0}\"?"
msgstr ""
msgid "Add new"
-msgstr ""
+msgstr "Dodaj nowy"
msgid "Add predefined"
msgstr ""
@@ -29149,7 +29175,7 @@ msgid "Signed"
msgstr ""
msgid "Unknown"
-msgstr ""
+msgstr "Nieznany"
msgid "Object signatures"
msgstr ""
@@ -29266,7 +29292,7 @@ msgid "Use a random key from this list"
msgstr ""
msgid "Create new Key"
-msgstr ""
+msgstr "Stwórz nowy klucz"
msgid "Select a Key to sign"
msgstr ""
@@ -29320,16 +29346,16 @@ msgid "Strength in bit: "
msgstr ""
msgid "Creation date: "
-msgstr ""
+msgstr "Data utworzenia: "
msgid "Expiration date: "
-msgstr ""
+msgstr "Data wygaśnięcia: "
msgid "PGP-Key details"
msgstr ""
msgid "User-ID:"
-msgstr ""
+msgstr "User-ID:"
msgid "Select algorithm:"
msgstr ""
@@ -29387,7 +29413,7 @@ msgid "Add turn"
msgstr ""
msgid "Delete lane."
-msgstr ""
+msgstr "Usuń pas"
msgid "Delete turn."
msgstr ""
@@ -29870,10 +29896,10 @@ msgid "Add in editor"
msgstr "Dodaj w edytorze"
msgid "Add a way with role ''from''"
-msgstr ""
+msgstr "Dodaj drogę z rolą \"from\""
msgid "Add a way with role ''to''"
-msgstr ""
+msgstr "Dodaj drogę z rolą \"to\""
msgid ""
"The two ways participating in the turn restriction <strong>aren''t "
@@ -30208,7 +30234,7 @@ msgstr ""
"11' 47.60\" E</li></ul>"
msgid "Tag multiple objects [alpha]"
-msgstr "Tagowanie wielu obiektów (wwersja alfa)"
+msgstr "Tagowanie wielu obiektów (wersja alfa)"
msgid "Edit tags of object list in table"
msgstr ""
@@ -30430,7 +30456,7 @@ msgid "starts/pauses video playback"
msgstr "otwiera/wstrzymuje odtwarzanie wideo"
msgid "Video: {0}"
-msgstr ""
+msgstr "Film: {0}"
msgid "Backward"
msgstr "Do tyłu"
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index 1a2b763..f06108d 100644
--- a/i18n/po/pt.po
+++ b/i18n/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2015-03-15 00:41+0000\n"
"Last-Translator: Rui <xande6ruz at yandex.com>\n"
"Language-Team: Portuguese <pt at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:54+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:53+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: pt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -473,15 +473,18 @@ msgstr "Mostra os painéis laterais"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Mostra os painéis laterais. maximizando a área visível"
-msgid "Distribute Nodes"
-msgstr "Distribuir Nós a Distâncias Iguais"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Distribui os nós selecionados a distâncias iguais ao longo da linha."
msgid "Ignoring {0} nodes with null coordinates"
msgstr "A ignorar {0} nós com coordenadas nulas"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Descarregar do OpenStreetMap..."
@@ -498,6 +501,9 @@ msgstr ""
msgid "Download data"
msgstr "Descarregar dados"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Descarregar objeto..."
@@ -1047,6 +1053,12 @@ msgstr "Fechar janela e cancelar o descarregamento"
msgid "Download Data"
msgstr "Descarregar Dados"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Ok"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1886,6 +1898,28 @@ msgstr "A descarregar erros reportados"
msgid "Notes"
msgstr "Erros reportados"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr "Descarregar OSM Change comprimido"
@@ -1895,6 +1929,9 @@ msgstr "Descarregar OSM Change"
msgid "Download Compressed OSM"
msgstr "Descarregar OSM comprimido"
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "Descarregar do OSM"
@@ -2531,171 +2568,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "A expressão de pesquisa está incorreta"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Avenida Central</b> - ''Avenida'' e ''Central'' em qualquer chave"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Avenida Central\"</b> - ''Avenida Central'' em qualquer chave"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Av</b> - ''Av'' em qualquer posição da chave ''key''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Av</b> - ''Av'' em nenhum sítio da chave ''key''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - chave ''key'' com o valor igual a ''value''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - chave ''key'' com qualquer valor. Tente também "
-"<b>*=value</b>, <b>key=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - chave ''key'' definida com qualquer valor"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>key?</b> - chave ''key'' com o valor ''yes'', ''true'', ''1'' ou ''on''"
-
-msgid "Special targets"
-msgstr "Alvos especiais"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - objetos com o tipo correspondente (<b>node</b>, "
-"<b>way</b>, <b>relation</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - objetos alterados pelo utilizador"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - objetos alterados por utilizadores anónimos"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-"<b>id:</b>... - objetos com o identificador (ID) fornecido (0 para objetos "
-"novos)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - objetos com a versão fornecida (0 para objetos com "
-"versão por atribuir)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - objetos com o identificador de conjunto de alterações "
-"fornecido (0 para objetos sem identificador)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - objetos com o número de nós fornecido "
-"(<b>nodes:</b>número, <b>nodes:</b>min-máx, <b>nodes:</b>min- ou "
-"<b>nodes:</b>-máx)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - objetos com o número fornecido de etiquetas "
-"(<b>tags:</b>número, <b>tags:</b>min-máx, <b>tags:</b>min- ou <b>tags:</b>-"
-"máx)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - objetos com a função indicada numa relação"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>timestamp - objetos com esta marca de tempo da alteração "
-"(2009-11-12T14:51:09Z, 2009-11-12 ou T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-"<b>timestamp:</b>min/max - objetos com a última alteração no intervalo"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - linhas fechadas com a área fornecida em m² "
-"(<b>areasize:</b>min-max ou <b>areasize:</b>max)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - todos os objetos modificados"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - todos os objetos selecionados"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - todos os objetos incompletos"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - todos os objetos não rotulados"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-"<b>closed</b> - todas as linhas fechadas (os nós não são considerados "
-"fechados)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>expr</i></b> - todos os filhos de todos os objetos que "
-"correspondam à expressão"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - todos os pais de todos os objetos que "
-"correspondam à expressão"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - objetos (e todos os seus nós / membros de "
-"relações) na área descarregada"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - objetos (e todos os seus nós / membros de relações) na "
-"vista atual"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Usar <b>|</b> ou <b>OR</b> para combinações lógicas ou"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Usar <b>\"</b> para referir operadores lógicos (por exemplo, se a chave "
-"contiver <b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Em expressões entre aspas, os caracteres <b>\"</b> e<b>\\</b> têm de ser "
-"antecedidos pelo caractere de escape <b>\\</b> (por exemplo <b>\\\"</b> e "
-"<b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Usar <b>(</b> e <b>)</b> para agrupar expressões"
-
msgid "basic examples"
msgstr "exemplos básicos"
@@ -2737,6 +2609,15 @@ msgstr ""
"corresponde se ''key'' (chave) for maior do que ''value'' (valor), (por "
"analogia menos de)"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"para referir operadores lógicos.<br>Dentro de expressões entre aspas os "
+"caracteres <b>\"</b> e <b>\\</b> têm de ser antecedidos pelo caractere de "
+"escape <b>\\</b> (por exemplo <b>\\\"</b> e <b>\\\\</b>)."
+
msgid "combinators"
msgstr "combinadores"
@@ -2752,15 +2633,6 @@ msgstr "NOT lógico"
msgid "use parenthesis to group expressions"
msgstr "use parêntesis para agrupar expressões"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"para referir operadores lógicos.<br>Dentro de expressões entre aspas os "
-"caracteres <b>\"</b> e <b>\\</b> têm de ser antecedidos pelo caractere de "
-"escape <b>\\</b> (por exemplo <b>\\\"</b> e <b>\\\\</b>)."
-
msgid "objects"
msgstr "objetos"
@@ -2797,8 +2669,13 @@ msgstr "objetos com a última alteração no intervalo"
msgid "properties"
msgstr "propriedades"
-msgid "objects with at least 20 nodes"
-msgstr "objetos com pelo menos 20 nós"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "objetos com 5 a 10 etiquetas"
@@ -2809,6 +2686,9 @@ msgstr "objetos com a função fornecida na relação"
msgid "closed ways with an area of 100 m²"
msgstr "linhas fechadas com uma área de 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr "estado"
@@ -4285,10 +4165,8 @@ msgstr ""
"Verifica por exemplo se existe a etiqueta ''name:Lisboa'' e "
"''name:en:Lisbon'' mas não ''name:pt:Lisboa'' ou o inverso."
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
-"Falta 1 tradução de ''name:'' (p.ex. existe name:Lisboa e name:en:Lisbon mas "
-"não name:pt:Lisboa)"
msgid "A name is missing, even though name:* exists."
msgstr "Tem etiquetas ''name:*'' mas falta a etiqueta ''name='' principal."
@@ -4971,6 +4849,9 @@ msgstr "Mostra a versão do JOSM e sai"
msgid "Print debugging messages to console"
msgstr "A colocar mensagens na consola de comandos"
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr "Impedir o acesso as seguintes recursos(s), separados por vírgula"
@@ -5039,6 +4920,9 @@ msgstr "Tenha a certeza que carrega alguns dados se usar --selection."
msgid "Printing debugging messages to console"
msgstr "A colocar mensagens na consola de comandos"
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -6578,9 +6462,6 @@ msgstr "Latitude/Longitude"
msgid "East/North"
msgstr "Este/Norte"
-msgid "Ok"
-msgstr "Ok"
-
msgid "Please enter a GPS coordinates"
msgstr "Por favor introduza coordenadas GPS"
@@ -7545,8 +7426,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<diferente>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr "Selecione os objetos nos quais quer alterar as etiquetas."
@@ -7563,6 +7454,12 @@ msgstr "Membro das relações"
msgid "Position"
msgstr "Posição"
+msgid "<different>"
+msgstr "<diferente>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Etiquetas: {0} / Membros: {1}"
@@ -7700,6 +7597,16 @@ msgstr "Definir o número de etiquetas adicionadas recentemente"
msgid "Remember last used tags after a restart"
msgstr "Lembrar as últimas etiquetas usadas após reiniciar o JOSM"
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr "Introduza o número de etiquetas recentes a mostrar"
@@ -8520,18 +8427,21 @@ msgstr "Objeto"
msgid "not present"
msgstr "não está presente"
-msgid "Changeset:"
-msgstr "Conjunto de Alterações:"
-
msgid "Changeset comment"
msgstr "Comentário do conjunto de dados"
msgid "Changeset source"
msgstr "Fonte das informações do conjunto de dados"
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr "<b>Fonte</b>:"
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8542,6 +8452,9 @@ msgid ""
msgstr ""
"<html>Versão <strong>{0}</strong> criada em <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "Informação do conjunto de alterações"
@@ -9719,6 +9632,9 @@ msgstr "Escala do pixel: {0}"
msgid "Best zoom: {0}"
msgstr "Melhor aproximação: {0}"
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "Camada TMS ({0}) no nível de zoom {1}"
@@ -11954,6 +11870,12 @@ msgstr "Mostrar em Descarregar do OSM>sinal + no canto sup.dir.: "
msgid "Tile cache directory: "
msgstr "Pasta para armazenar as telas temporariamente: "
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12670,6 +12592,14 @@ msgstr "Verificar se existem novas mensagens periodicamente"
msgid "Check interval (minutes):"
msgstr "A cada (minutos):"
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
"Não foi possível obter o Token de Acesso OAuth do gestor de credenciais."
@@ -15816,6 +15746,9 @@ msgstr "Geoimage.at MaxRes"
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (mapa base)"
@@ -15920,6 +15853,9 @@ msgstr "Estónia - Cadastro (Maaamet)"
msgid "Estonia Forestry (Maaamet)"
msgstr "Estónia - Florestas (Maaamet)"
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr "Bordéus - 2012"
@@ -16050,6 +15986,9 @@ msgstr "NRW-Atlas: Carta Topográfica 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Imagens de Drone (Haiti)"
@@ -16673,13 +16612,6 @@ msgid "Landsat 233055"
msgstr "Landsat 233055"
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"Permite editar informação de trânsito e exportar para o simulador de "
-"mobilidade urbana SUMO"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -17107,6 +17039,13 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "Editar funcionalidades para o OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Permite editar informação de trânsito e exportar para o simulador de "
+"mobilidade urbana SUMO"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
"Destinado principalmente a ser utilizado em portáteis ou tablets com GPS ou "
@@ -17876,15 +17815,34 @@ msgstr ""
msgid "deciduous"
msgstr "caducifólias (caem todas as folhas)"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr "folhas persistentes"
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr "semi-caducifólias (caem folhas mas voltam a nascer rapidamente)"
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr "folhas semi-persistentes"
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahai"
@@ -19151,6 +19109,12 @@ msgstr "Rota de Ferry"
msgid "Marina"
msgstr "Marina"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "locais públicos (vigiado pela polícia)"
+
msgid "Pier"
msgstr "Pontão (atracadouro)"
@@ -19549,6 +19513,12 @@ msgstr "Lavagem"
msgid "Car Dealer"
msgstr "Loja de Automóveis"
+msgid "Second hand"
+msgstr "Usados"
+
+msgid "only"
+msgstr "apenas tem destes produtos"
+
msgid "Repair"
msgstr "Oficina"
@@ -19561,12 +19531,6 @@ msgstr "Pneus"
msgid "Rental"
msgstr "Aluguer"
-msgid "Second hand"
-msgstr "Usados"
-
-msgid "only"
-msgstr "apenas tem destes produtos"
-
msgid "Sharing"
msgstr "Partilha de Veículos"
@@ -19776,6 +19740,9 @@ msgstr "Paragem"
msgid "Platform"
msgstr "Plataforma"
+msgid "Subway Entrance"
+msgstr "Entrada para Metropolitano Subterrâneo"
+
msgid "Station or amenities"
msgstr "Estação ou infraestruturas"
@@ -19831,9 +19798,6 @@ msgstr "Estação Ferroviária"
msgid "Building"
msgstr "Edifício"
-msgid "Subway Entrance"
-msgstr "Entrada para Metropolitano Subterrâneo"
-
msgid "Ticket Machine"
msgstr "Máquina de Bilhetes"
@@ -19960,8 +19924,8 @@ msgstr "Estrelas"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
-msgstr "Pensão / Guest House / Hospedagem Domiciliar"
+msgid "Guest House/Bed & Breakfast"
+msgstr ""
msgid "Chalet"
msgstr "Chalé"
@@ -20608,9 +20572,6 @@ msgstr "Casas de Banho"
msgid "Access rights"
msgstr "Direitos de acesso"
-msgid "public"
-msgstr "locais públicos (vigiado pela polícia)"
-
msgid "seasonal"
msgstr "sasonal"
@@ -20784,6 +20745,18 @@ msgstr "Caixote de lixo"
msgid "Waste Disposal/Dumpster"
msgstr "Contentor de lixo"
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr "Intervalos em que está ligado"
+
msgid "Backrest"
msgstr "Encosto"
@@ -21533,9 +21506,6 @@ msgstr "Farol"
msgid "Street Lamp"
msgstr "Poste de Iluminação"
-msgid "Operation times"
-msgstr "Intervalos em que está ligado"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Segunda a Sexta 22:00 às 05:00"
@@ -24118,6 +24088,16 @@ msgstr "Etiqueta genérica {0}"
msgid "Definition of {0} is unclear"
msgstr "A definição de {0} é incerta"
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} num nó. Deve ser usado numa linha."
@@ -24288,36 +24268,6 @@ msgstr "Mostrar nomes das vias (em níveis de aproximação de vista altos)"
msgid "Use alternative turn restriction icon set"
msgstr "Usar conjunto de ícones alternativo em restrições de viragem"
-msgid "OSM Export"
-msgstr "Exportar OSM"
-
-msgid "Export traffic data to SUMO network file."
-msgstr "Exportar dados de tráfego para um ficheiro de rede SUMO."
-
-msgid "SUMO Export"
-msgstr "Exportar SUMO"
-
-msgid "Export"
-msgstr "Exportar"
-
-msgid "Port:"
-msgstr "Porta:"
-
-msgid "refresh the port list"
-msgstr "atualizar a lista de porta"
-
-msgid "Configure"
-msgstr "Configurar"
-
-msgid "Connection Error."
-msgstr "Erro de Ligação."
-
-msgid "configure the connected DG100"
-msgstr "configurar o DG100 ligado"
-
-msgid "delete data after import"
-msgstr "eliminar dados após importar"
-
msgid "Columbus V-900 CSV Files"
msgstr "Ficheiros CSV Columbus V-900 - Visiontac VGPS-900"
@@ -25590,6 +25540,12 @@ msgstr "Quantas vezes esta operação deve ser aplicada (Padrão{0})."
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Nome da Rua:"
@@ -25648,6 +25604,34 @@ msgstr "Clique no canto oposto"
msgid "Set width of the building"
msgstr "Escolher a largura do edifício"
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr "no polígono"
@@ -26328,6 +26312,9 @@ msgstr "Apenas referência ({0})"
msgid "Subject only ({0})"
msgstr "Apenas sujeita a fusão ({0})"
+msgid "Configure"
+msgstr "Configurar"
+
msgid "Configure conflation options"
msgstr "Configurar opções de fusão de dados"
@@ -26647,9 +26634,24 @@ msgstr "Desativar registo dos dados se a distãncia for inferior a"
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr "Porta:"
+
+msgid "refresh the port list"
+msgstr "atualizar a lista de porta"
+
msgid "Configure Device"
msgstr "Configurar Dispositivo"
+msgid "Connection Error."
+msgstr "Erro de Ligação."
+
+msgid "configure the connected DG100"
+msgstr "configurar o DG100 ligado"
+
+msgid "delete data after import"
+msgstr "eliminar dados após importar"
+
msgid "Importing data from device."
msgstr "A importar dados do dispositivo."
@@ -27753,6 +27755,9 @@ msgstr "Mapillary"
msgid "Create Mapillary layer."
msgstr "Criar camada Mapillary."
+msgid "Export"
+msgstr "Exportar"
+
msgid "Measured values"
msgstr "Valores medidos"
@@ -30017,6 +30022,15 @@ msgstr "Limiar de Fusão de Nós Adjacentes"
msgid "SeaMap Editor"
msgstr "Editor SeaMap"
+msgid "OSM Export"
+msgstr "Exportar OSM"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Exportar dados de tráfego para um ficheiro de rede SUMO."
+
+msgid "SUMO Export"
+msgstr "Exportar SUMO"
+
msgid "AutoSave LiveData"
msgstr "Gravar Automaticamente"
diff --git a/i18n/po/pt_BR.po b/i18n/po/pt_BR.po
index 88c4dd0..84dde19 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: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-02-05 00:48+0000\n"
-"Last-Translator: Felipe L. <felipe.idj at hotmail.com>\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-24 14:11+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: 2015-04-01 05:02+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 05:02+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: pt_BR\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -467,15 +467,18 @@ msgstr "Mostrar/esconder o painel de diálogos"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Esconde o painel de diálogos,expande o mapa"
-msgid "Distribute Nodes"
-msgstr "Distribuir nós"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Distribuir nós selecionados equidistantemente sobre uma linha."
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Igonrando {0} nós com coordenadas nulas"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Baixar do OSM..."
@@ -492,6 +495,9 @@ msgstr ""
msgid "Download data"
msgstr "Dados baixados"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Baixar objeto..."
@@ -576,7 +582,7 @@ msgid "Adjust the position of this imagery layer"
msgstr "Ajustar a posição desta camada imaginária"
msgid "Adjust imagery offset"
-msgstr "ajustar deslocamento das imagens"
+msgstr "Ajustar o deslocamento das imagens"
msgid "OK"
msgstr "Aceitar"
@@ -1038,6 +1044,12 @@ msgstr "Feche a mensagem e cancele a transferência"
msgid "Download Data"
msgstr "Baixar dados"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Ok"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1859,6 +1871,28 @@ msgstr "Baixando notas"
msgid "Notes"
msgstr "Notas"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr "Baixar modificações OSM comprimidas"
@@ -1868,6 +1902,9 @@ msgstr "Baixando modificações OSM"
msgid "Download Compressed OSM"
msgstr "Baixando OSM comprimido"
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "Baixando OSM"
@@ -2503,168 +2540,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Expressão de busca inválida"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Baker Street</b> - ''Baker'' e ''Street'' em qualquer chave"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Rua Rebouças\"</b> - ''Rua'' e ''Rebouças'' em qualquer chave"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>chave:Reb</b> - ''Reb'' em qualquer lugar da chave ''chave''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-chave:Reb</b> - ''Reb'' em nenhum lugar da chave ''chave''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>chave=valor</b> - chave ''chave'' com valor ''valor'' exato"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>chave=*</b> - chave ''chave'' com qualquer valor. Tente ainda "
-"<b>*=valor</b>, <b>chave=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - chave ''key'' definida para qualquer valor"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>key?</b> - chave ''key''com o valor ''yes'', ''true'', ''1'' ou ''on''"
-
-msgid "Special targets"
-msgstr "Alvos especiais"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - objetos com o tipo correspondente (<b>nó</b>, <b>via</b>, "
-"<b>relação</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - objetos alterados pelo usuário"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - objetos alterados por usuários anônimos"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - objetos com determinado ID (0 para novos objetos)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - objetos com determinada versão (0 para objetos sem "
-"versão atribuída)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - objetos com o determinado changeset ID (0 objetos sem "
-"associação com um changeset)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - objetos com determinado número de nós "
-"(<b>nodes:</b>count, <b>nodes:</b>min-max, <b>nodes:</b>min- ou "
-"<b>nodes:</b>-max)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - objetos com determinados números de tags "
-"(<b>tags:</b>conta, <b>tags:</b>min-máx, <b>tags:</b>min- ou <b>tags:</b>-"
-"máx)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-"<b>role:</b>... - objetos com determinado papel (role) numa relação "
-"(relation)"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>timestamp - objetos com este último horário de modificação "
-"(2009-11-12T14:51:09Z, 2009-11-12 ou T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-"<b>timestamp:</b>min/max - objetos com a última modificação dentro do "
-"intervalo"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - vias fechadas com determinada área em m² "
-"(<b>areasize:</b>min-max ou <b>areasize:</b>max)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - todos os objetos modificados"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - todos os objetos selecionados"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - todos os objetos incompletos"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - todos objetos não marcados"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-"<b>fechado</b> - todos os caminhos fechados(um nó não é considerado fechado)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>expr</i></b> - todos objetos filhos que coincidem com a expressão"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - todos os pais de objetos que coincidem com a "
-"expressão"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - objetos (e todos os seus nós / membros da "
-"relação) na área baixada"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)indownloadedarea</b> - objetos (e todos os seus nós / membros da "
-"relação) na visão atual"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Use <b>|</b> ou <b>OR</b> para combinar com \"ou\" lógico"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Usar <b>\"</b> para comentar operadores (ex. se uma chave contem <b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Em strings entre aspas, os caracteres <b>\"</b> e <b>\\</b> necessitam ser "
-"precedidos por <b>\\</b> (ex: <b>\\\"</b> e <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Usar <b>(</b> e <b>)</b> para agrupar expressões"
-
msgid "basic examples"
msgstr "exemplos básicos"
@@ -2705,6 +2580,15 @@ msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
"resultados se ''chave'' é maior que ''valor'' (analogamente, se menor)"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"para usar operadores.<br>Em sequências de caracteres os caracteres <b>\"</b> "
+"e <b>\\</b> precisam ser precedidos por <b>\\</b> (ex. <b>\\\"</b> e <b>\\\\"
+"</b>)."
+
msgid "combinators"
msgstr "elementos de combinação"
@@ -2720,15 +2604,6 @@ msgstr "NÃO lógico"
msgid "use parenthesis to group expressions"
msgstr "use parênteses para agrupar expressões"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"para usar operadores.<br>Em sequências de caracteres os caracteres <b>\"</b> "
-"e <b>\\</b> precisam ser precedidos por <b>\\</b> (ex. <b>\\\"</b> e <b>\\\\"
-"</b>)."
-
msgid "objects"
msgstr "objetos"
@@ -2765,8 +2640,13 @@ msgstr "objetos com último horário de modificação dentro do intervalo"
msgid "properties"
msgstr "propriedades"
-msgid "objects with at least 20 nodes"
-msgstr "objetos com pelo menos 20 nós"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "objetos com 5 a 10 tags"
@@ -2777,6 +2657,9 @@ msgstr "objetos com determinado papel numa relação"
msgid "closed ways with an area of 100 m²"
msgstr "caminhos fechados com uma área de 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr "estado"
@@ -3637,7 +3520,7 @@ msgstr[0] "relação"
msgstr[1] "relações"
msgid "closedway"
-msgstr "via sem saída"
+msgstr "caminho fechado"
msgid "multipolygon"
msgstr "multipolígono"
@@ -4241,8 +4124,8 @@ msgstr ""
"a um atributo ''nome: *'' e não uma composição de atributos ''nome: * '', "
"por exemplo, Italia - Italien - Italy."
-msgid "A name:* translation is missing."
-msgstr "Uma tradução de name:* está faltando."
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "Um nome está faltando, embora nome:* exista."
@@ -4631,7 +4514,7 @@ msgid "Way node near other way"
msgstr "Nó da via muito próximo de outra via"
msgid "Connected way end node near other way"
-msgstr "Nó final conectado da via próximo de outra via"
+msgstr ""
msgid "Untagged and unconnected nodes"
msgstr "Nós não marcados e desconectados"
@@ -4903,6 +4786,9 @@ msgstr "Exibe a versão JOSM e sai"
msgid "Print debugging messages to console"
msgstr "Imprimir mensagens de depuração no console"
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr "Desative o acesso ao recurso especificado(s), separados por vírgula"
@@ -4967,6 +4853,9 @@ msgstr "Tenha certeza de que irá carregar algum dado, caso use --selection."
msgid "Printing debugging messages to console"
msgstr "Imprimindo mensagens de depuração no console"
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr "Habilitado nível de depuração detalhado (trace)"
@@ -6508,9 +6397,6 @@ msgstr "Lat/Lon"
msgid "East/North"
msgstr "Leste/Norte"
-msgid "Ok"
-msgstr "Ok"
-
msgid "Please enter a GPS coordinates"
msgstr "Por favor, insira uma coordenada do GPS"
@@ -7464,8 +7350,18 @@ msgstr "Chave descartável: seleção primeiro plano"
msgid "Discardable key: background"
msgstr "Chave descartável: seleção segundo plano"
-msgid "<different>"
-msgstr "<diferente>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr "Selecione os objetos para os quais mudar as tags."
@@ -7482,6 +7378,12 @@ msgstr "Membro de"
msgid "Position"
msgstr "Posição"
+msgid "<different>"
+msgstr "<diferente>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Tags: {0}/ Membors: {1}"
@@ -7616,6 +7518,16 @@ msgstr "Defina o número de tags adicionadas recentemente"
msgid "Remember last used tags after a restart"
msgstr "Lembrar das últimas tags usadas antes do restar"
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
"Por favor, indique o número de tags adicionadas recentemente para exibir"
@@ -8421,18 +8333,21 @@ msgstr "Objeto"
msgid "not present"
msgstr "não presente"
-msgid "Changeset:"
-msgstr "Changeset:"
-
msgid "Changeset comment"
msgstr "Comentário do Changeset"
msgid "Changeset source"
msgstr "Fonte do changeset"
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr "<b>Fonte</b>:"
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8443,6 +8358,9 @@ msgid ""
msgstr ""
"<html>Versão <strong>{0}</strong> criada em <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "Informações do changeset"
@@ -9619,6 +9537,9 @@ msgstr "Escala de pixels: {0}"
msgid "Best zoom: {0}"
msgstr "Melhor zoom: {0}"
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "Camada TMS ({0}), baixando em zoom {1}"
@@ -11725,7 +11646,7 @@ msgid "Strong"
msgstr "Forte"
msgid "Sharpen (requires layer re-add): "
-msgstr "Afiado (requer re-adicionar camada): "
+msgstr "Aguçar (requer readicionar camada) "
msgid "Imagery Preferences"
msgstr "Preferências das imagens"
@@ -11820,6 +11741,12 @@ msgstr "Adicionar ao seletor no slippymap: "
msgid "Tile cache directory: "
msgstr "Diretória de cahce de quadros: "
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12524,6 +12451,14 @@ msgstr "Verifique periodicamente se há novas mensagens"
msgid "Check interval (minutes):"
msgstr "Verificar intervalo (minutos):"
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
"Falha ao recuperar o token de acesso do OAuth do Gerenciador de Credenciais"
@@ -12778,7 +12713,7 @@ msgid "Wikipedia"
msgstr "Wikipédia"
msgid "Checks for wrong wikipedia tags"
-msgstr "Verifica a existência de etiquetas erradas da Wikipédia"
+msgstr "Verifica etiquetas wikipedia erradas"
msgid "Tag checker rules"
msgstr "Regras de verificação tag"
@@ -15646,6 +15581,9 @@ msgstr "Geoimage.at MaxRes"
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (base map)"
@@ -15749,6 +15687,9 @@ msgstr "Estônia Cadastre (Maaamet)"
msgid "Estonia Forestry (Maaamet)"
msgstr "Estônia Forestry (Maaamet)"
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
@@ -15881,6 +15822,9 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Drone Imagery (Haiti)"
@@ -16503,13 +16447,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"Permite editar as informações de trânsito e exportá-lo para o urban mobility "
-"simulator SUMO"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -16910,6 +16847,13 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "Editar recursos para OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Permite editar as informações de trânsito e exportá-lo para o urban mobility "
+"simulator SUMO"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Permitir a adição de marcadores/nós na posições de GPS atual."
@@ -16917,7 +16861,7 @@ msgid ""
"Launch browser to a Web resource about a selected object having known tags, "
"such as Wikipedia"
msgstr ""
-"Abre o navegador em uma página Web sobre um objeto selecionado que tem tagas "
+"Abre o navegador em uma página Web sobre um objeto selecionado que tem tags "
"conhecidas, como a Wikipédia"
msgid "Provides a dialog for editing tags in a tabular grid."
@@ -17640,15 +17584,34 @@ msgstr "Ciclo"
msgid "deciduous"
msgstr "decídua"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr "sempre-viva"
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr "semi_deciduous"
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr "semi_evergreen"
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahai"
@@ -18915,6 +18878,12 @@ msgstr "Rota de Barca"
msgid "Marina"
msgstr "marina"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "público"
+
msgid "Pier"
msgstr "Embarcadouro"
@@ -18952,7 +18921,7 @@ msgid "industrial"
msgstr "industrial"
msgid "military"
-msgstr "exército"
+msgstr "militar"
msgid "tourism"
msgstr "turismo"
@@ -19313,6 +19282,12 @@ msgstr "Lava Jato"
msgid "Car Dealer"
msgstr "Concessionária"
+msgid "Second hand"
+msgstr "De segunda mão"
+
+msgid "only"
+msgstr "apenas"
+
msgid "Repair"
msgstr "Oficina"
@@ -19325,12 +19300,6 @@ msgstr "Tires"
msgid "Rental"
msgstr "Aluguel"
-msgid "Second hand"
-msgstr "De segunda mão"
-
-msgid "only"
-msgstr "apenas"
-
msgid "Sharing"
msgstr "Compartilhamento"
@@ -19542,6 +19511,9 @@ msgstr "Posição de parada"
msgid "Platform"
msgstr "Plataforma"
+msgid "Subway Entrance"
+msgstr "Entrada do Metrô"
+
msgid "Station or amenities"
msgstr "Estação ou comodidades"
@@ -19597,9 +19569,6 @@ msgstr "Estação"
msgid "Building"
msgstr "Edificação"
-msgid "Subway Entrance"
-msgstr "Entrada do Metrô"
-
msgid "Ticket Machine"
msgstr "Maquina de ingresso"
@@ -19726,8 +19695,8 @@ msgstr "Estrelhas"
msgid "Motel"
msgstr "Motor Hotel"
-msgid "Guest House/Bed & Breakfast"
-msgstr "Casa de hóspedes/Pensäo"
+msgid "Guest House/Bed & Breakfast"
+msgstr ""
msgid "Chalet"
msgstr "Chalé"
@@ -20374,9 +20343,6 @@ msgstr "Banheiros"
msgid "Access rights"
msgstr "Direitos de acesso"
-msgid "public"
-msgstr "público"
-
msgid "seasonal"
msgstr "sazonal"
@@ -20550,6 +20516,18 @@ msgstr "Cesta de Lixo/Lata de lixo"
msgid "Waste Disposal/Dumpster"
msgstr "Descarte de resíduos/Lixeira"
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr "Horário de funcionamento"
+
msgid "Backrest"
msgstr "encosto"
@@ -21297,9 +21275,6 @@ msgstr "Farol"
msgid "Street Lamp"
msgstr "Poste de Iluminação"
-msgid "Operation times"
-msgstr "Horário de funcionamento"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Seg-Sex 22:00-05:00"
@@ -23881,6 +23856,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} em um nó. Deveria ser usado em uma via."
@@ -23918,7 +23903,7 @@ msgid "Overlapping Identical Landuses"
msgstr "Sobrepoição de Landuses idênticos"
msgid "{0} must be connected to a way"
-msgstr "{0} precisa se conectado em uma via"
+msgstr "{0} precisa estar conectado à uma via"
msgid "node connects waterway and bridge"
msgstr ""
@@ -23970,8 +23955,8 @@ msgstr "nível deve ser números com incrementos opcionais de .5"
msgid ""
"{0}: meters is default; period is separator; if units, put space then unit"
msgstr ""
-"{0}: metros é o padrão; período é o separador; se as unidades, colocar "
-"espaço então a unidade"
+"{0}: metros é padrão; ponto é separador; se unidades, colocar espaço então a "
+"unidade"
msgid "unusual {0} format"
msgstr "formato {0} incomum"
@@ -24027,7 +24012,8 @@ msgstr "Nós duplicando tags pai"
msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-"sem linguagem wikipédia dada, use ''wikipedia''=''language:page title''"
+"nenhum idioma de wikipedia dado, use ''wikipedia''=''idioma:título da "
+"página''"
msgid "unknown language prefix in wikipedia tag"
msgstr "prefixo língua desconhecida na tag wikipedia"
@@ -24036,7 +24022,7 @@ msgid "deprecated format for wikipedia tag"
msgstr "formato depreciado para tag wikipedia"
msgid "''wikipedia''=''language:page title''"
-msgstr "''wikipédia''=''idioma:título da página''"
+msgstr "''wikipedia''=''idioma:título da página''"
msgid "Hide icons at low zoom"
msgstr "Ocultar ícones ao apróximar zoom"
@@ -24050,36 +24036,6 @@ msgstr "Exibir rótulos de rua (com zoom alto)"
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr "Exportar OSM"
-
-msgid "Export traffic data to SUMO network file."
-msgstr "Exportar dados de tráfego para SUMO network file."
-
-msgid "SUMO Export"
-msgstr "Exportar SUMO"
-
-msgid "Export"
-msgstr "Exportar"
-
-msgid "Port:"
-msgstr "Porta:"
-
-msgid "refresh the port list"
-msgstr "atualizar a lista de portas"
-
-msgid "Configure"
-msgstr "Configurar"
-
-msgid "Connection Error."
-msgstr "Erro de conexão."
-
-msgid "configure the connected DG100"
-msgstr "configurar o DG100 conectado"
-
-msgid "delete data after import"
-msgstr "apagar dados depois de importar"
-
msgid "Columbus V-900 CSV Files"
msgstr "Arquivos CSV Columbus V-900"
@@ -25346,6 +25302,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Nome da Rua:"
@@ -25400,6 +25362,34 @@ msgstr "Ponto na extremidade oposta do edifício"
msgid "Set width of the building"
msgstr "Definir a largura do prédio"
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr "no polígono"
@@ -26081,6 +26071,9 @@ msgstr "Única referência ({0})"
msgid "Subject only ({0})"
msgstr "Apenas assunto {0}"
+msgid "Configure"
+msgstr "Configurar"
+
msgid "Configure conflation options"
msgstr "Configurar opções de fusão"
@@ -26402,9 +26395,24 @@ msgstr "Desabilitar registo de dados se a distância for baixa"
msgid "Unknown logFormat"
msgstr "Formato de log desconhecido"
+msgid "Port:"
+msgstr "Porta:"
+
+msgid "refresh the port list"
+msgstr "atualizar a lista de portas"
+
msgid "Configure Device"
msgstr "Configurar o Aparelho"
+msgid "Connection Error."
+msgstr "Erro de conexão."
+
+msgid "configure the connected DG100"
+msgstr "configurar o DG100 conectado"
+
+msgid "delete data after import"
+msgstr "apagar dados depois de importar"
+
msgid "Importing data from device."
msgstr "Importando dados do dispositivo."
@@ -27522,6 +27530,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr "Exportar"
+
msgid "Measured values"
msgstr "Valores medidos"
@@ -29758,6 +29769,15 @@ msgstr "Unir nós próximos"
msgid "SeaMap Editor"
msgstr "Editor SeaMap"
+msgid "OSM Export"
+msgstr "Exportar OSM"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Exportar dados de tráfego para SUMO network file."
+
+msgid "SUMO Export"
+msgstr "Exportar SUMO"
+
msgid "AutoSave LiveData"
msgstr "AutoSave LiveData"
diff --git a/i18n/po/rm.po b/i18n/po/rm.po
index dfad704..bbc89ec 100644
--- a/i18n/po/rm.po
+++ b/i18n/po/rm.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2009-06-21 19:14+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Raeto-Romance <rm at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n !=1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:54+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:54+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ro.po b/i18n/po/ro.po
index b55dd4c..33e95ba 100644
--- a/i18n/po/ro.po
+++ b/i18n/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JOSM\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2015-02-24 11:34+0000\n"
"Last-Translator: Ciprian <c1pr1an_43v3r at yahoo.com>\n"
"Language-Team: Romanian <gnomero-list at lists.sourceforge.net>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
"== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:54+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:54+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"X-Poedit-Country: ROMANIA\n"
"Language: ro\n"
"X-Poedit-Language: Romanian\n"
@@ -476,9 +476,6 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "Distribuie noduri"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Distributi nodurile selectate pentru distante egale de-a lungul unei linii."
@@ -486,6 +483,12 @@ msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Descarc datele OSM..."
@@ -500,6 +503,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Descarcă obiect..."
@@ -1015,6 +1021,12 @@ msgstr "Închide fereastra și anulează descărcarea"
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1759,6 +1771,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1768,6 +1802,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2350,134 +2387,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2517,6 +2426,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2532,12 +2447,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2574,7 +2483,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2586,6 +2500,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3923,7 +3840,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4563,6 +4480,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4621,6 +4541,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -6013,9 +5936,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6884,8 +6804,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<diferit>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr ""
@@ -6902,6 +6832,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr "<diferit>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -7032,6 +6968,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7758,18 +7704,21 @@ msgstr "Obiect"
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7778,6 +7727,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8802,6 +8754,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10770,6 +10725,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11407,6 +11368,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14136,6 +14105,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14239,6 +14211,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14366,6 +14341,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14988,11 +14966,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15309,6 +15282,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -16012,15 +15990,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17268,6 +17265,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17666,22 +17669,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17893,6 +17896,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17948,9 +17954,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18077,7 +18080,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18722,9 +18725,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18898,6 +18898,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19645,9 +19657,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22203,6 +22212,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22369,36 +22388,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23517,6 +23506,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23571,6 +23566,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24180,6 +24203,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24494,9 +24520,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25535,6 +25576,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27639,6 +27683,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/ru.po b/i18n/po/ru.po
index 8dc5cc4..77c3ee5 100644
--- a/i18n/po/ru.po
+++ b/i18n/po/ru.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-03-29 05:19+0000\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-24 06:08+0000\n"
"Last-Translator: Nkolay Parukhin <parukhin at gmail.com>\n"
"Language-Team: Koptev Oleg <koptev.oleg at gmail.com>\n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:55+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:54+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: ru_RU\n"
msgid "Note"
@@ -482,15 +482,21 @@ msgstr "Показать/скрыть панели"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Скрыть диалоговые панели и панели инструментов"
-msgid "Distribute Nodes"
-msgstr "Распределить точки"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Расположить выделенные точки на равных расстояниях вдоль линии."
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Пропущено {0} точек с нулевыми координатами"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+"Выделите:\n"
+"* Одну линию без самопересечений с не более чем двумя её точками;\n"
+"* Три точки."
+
msgid "Download from OSM..."
msgstr "Скачать с OSM..."
@@ -507,6 +513,9 @@ msgstr ""
msgid "Download data"
msgstr "Скачать данные"
+msgid "Download notes in current view"
+msgstr "Скачать заметки в текущей просматриваемой области"
+
msgid "Download object..."
msgstr "Скачать объект..."
@@ -1059,6 +1068,12 @@ msgstr "Закрыть диалог и отменить скачивание"
msgid "Download Data"
msgstr "Скачать данные"
+msgid "Which tasks to perform?"
+msgstr "Что нужно сделать?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1880,6 +1895,30 @@ msgstr "Загрузка заметок"
msgid "Notes"
msgstr "Заметки"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] "{0} заметка скачана."
+msgstr[1] "{0} заметки скачаны."
+msgstr[2] "{0} заметок скачано."
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+"Поскольку лимит загрузки был {0}, могут быть ещё заметки для скачивания."
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr "Запросите меньшую область, чтобы наверняка скачать все заметки."
+
+msgid "More notes to download"
+msgstr "Ещё заметки для скачивания"
+
+msgid "Download OSM Notes within Bounds"
+msgstr "Скачать заметки OSM в выделенной области"
+
+msgid "Download OSM Note by ID"
+msgstr "Скачать заметку OSM по идентификатору"
+
msgid "Download Compressed OSM Change"
msgstr "Скачать сжатые OSM изменения"
@@ -1889,6 +1928,9 @@ msgstr "Скачать изменения данных OSM"
msgid "Download Compressed OSM"
msgstr "Скачать сжатые OSM данные"
+msgid "Download OSM object by ID"
+msgstr "Скачать объект OSM по ID"
+
msgid "Download OSM"
msgstr "Скачать OSM"
@@ -2543,164 +2585,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Неверное выражение для поиска"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Baker Street</b> - ''Baker'' и ''Street'' в любом теге"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' в любом теге"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Bak</b> - ''Bak'' в любом месте тега ''key''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Bak</b> - ''Bak'' не входит в тег ''key''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - тег ''key'' со значением ''value''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - тег ''key'' с любым значением. Попробуйте также "
-"<b>*=value</b>, <b>key=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - тег ''key'' с каким-либо значением"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>key?</b> - тег ''key'' со значениями ''yes'', ''true'', ''1'' или ''on''"
-
-msgid "Special targets"
-msgstr "Специальные цели"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - объекты соответствующие типу (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - объекты изменены пользователем"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - объекты изменены анонимными пользователями"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - объекты с данным ID (0 для новых объектов)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr "<b>version:</b>... - объекты данной версии (0 объекты без версии)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - объекты с заданным номером пакета правок (укажите 0 "
-"для объектов не входящих в пакеты правок)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - объекты с данным числом точек (<b>nodes:</b>число, "
-"<b>nodes:</b>мин-макс, <b>nodes:</b>мин- или <b>nodes:</b>-макс)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - объекты с данным числом тегов (<b>tags:</b>число, "
-"<b>tags:</b>мин-макс, <b>tags:</b>мин- или <b>tags:</b>-макс)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - объекты с данной ролью в отношении"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>время - объекты с последним временем изменений (2009-11-"
-"12T14:51:09Z, 2009-11-12 або T14:51 …)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-"<b>timestamp:</b>min/max - объекты, которые были изменены в этом диапазоне"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - замкнутые линии с площадью ... (м²) "
-"(<b>areasize:</b>мин-макс или <b>areasize:</b>макс)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - все изменённые объекты"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - все выделенные объекты"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - все неполные объекты"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - все объекты без тегов"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr "<b>closed</b> - все замкнутые линии (точка не считается замкнутым)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>выражение</i></b> - все дочерние элементы, соответствующие "
-"выражению"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>выражение</i></b> - все предки объектов, соответствующие "
-"выражению"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - объекты (и все точки линии / участники "
-"отношения) в скачанной области"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - объекты (и все точки линии / участники отношения) в "
-"текущем виде"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-"Используйте <b>|</b> либо <b>OR</b> чтобы объединить выражения логическим "
-"«или»"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Используйте <b>\"</b> для написания операторов (например если ключ содержит "
-"<b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Внутри строк в кавычках, перед символами <b>\"</b> и <b>\\</b> надо ставить "
-"дополнительный обратный слэш (вот так: <b>\\\"</b> и <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Используйте <b>(</b> и <b>)</b> для группировки выражений"
-
msgid "basic examples"
msgstr "простые примеры"
@@ -2742,6 +2626,15 @@ msgstr ""
"соответствует, если ''key'' больше, чем ''value'' (аналогично для знака "
"\"<\")"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"Цитирование операторов.<br>Строки, заключённые в кавычки <b>\"</b>, и символ "
+"<b>\\</b> необходимо экранировать добавлением <b>\\</b> (например <b>\\"
+"\"</b> и <b>\\\\</b>)."
+
msgid "combinators"
msgstr "комбинаторы"
@@ -2757,15 +2650,6 @@ msgstr "логическое НЕТ"
msgid "use parenthesis to group expressions"
msgstr "используйте круглые скобки для группировки выражений"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"Цитирование операторов.<br>Строки, заключённые в кавычки <b>\"</b>, и символ "
-"<b>\\</b> необходимо экранировать добавлением <b>\\</b> (например <b>\\"
-"\"</b> и <b>\\\\</b>)."
-
msgid "objects"
msgstr "объекты"
@@ -2802,8 +2686,16 @@ msgstr "объекты с временем последнего изменени
msgid "properties"
msgstr "свойства"
-msgid "objects with at least 20 nodes"
-msgstr "объекты как минимум из 20 точек"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+"линии как минимум из 20 точек или отношения, содержащие не менее 20 точек"
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
+"точки, входящие в 3 или более линии, или отношения, содержащие не менее 3 "
+"линий"
msgid "objects having 5 to 10 tags"
msgstr "объекты, имеющие от 5 до 10 тегов"
@@ -2814,6 +2706,9 @@ msgstr "объекты с указанной ролью в отношении"
msgid "closed ways with an area of 100 m²"
msgstr "замкнутые линии площадью 100 м²"
+msgid "ways with a length of 200 m or more"
+msgstr "линии, длиной 200 м и более"
+
msgid "state"
msgstr "состояние"
@@ -4295,8 +4190,8 @@ msgstr ""
"атрибутом ''name:*'' и не состоят из атрибутов ''name:*'', например, Italia "
"- Italien - Italy."
-msgid "A name:* translation is missing."
-msgstr "Перевод name:* отсутствует."
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr "Отсутствует name:*={0}. Добавьте тег с правильным ключом языка."
msgid "A name is missing, even though name:* exists."
msgstr "Отсутствует name, несмотря на то, что существует name: *"
@@ -4953,6 +4848,9 @@ msgstr "Показать версию JOSM и выйти"
msgid "Print debugging messages to console"
msgstr "Выводить отладочные сообщения в консоль"
+msgid "Skip loading plugins"
+msgstr "Пропустить скачивание модулей"
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr "Отключить доступ к указанным ресурсам (разделяются запятыми)"
@@ -5022,6 +4920,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr "Вывод отладочных сообщений в консоль"
+msgid "Plugin loading skipped"
+msgstr "Скачивание модулей пропущено"
+
msgid "Enabled detailed debug level (trace)"
msgstr "Включен расширенный уровень отладки (трассировка)"
@@ -6576,9 +6477,6 @@ msgstr "Широта/долгота"
msgid "East/North"
msgstr "Прямоугольные координаты"
-msgid "Ok"
-msgstr "Ok"
-
msgid "Please enter a GPS coordinates"
msgstr "Введите координаты GPS"
@@ -7518,8 +7416,20 @@ msgstr "Удаляемый ключ: foreground"
msgid "Discardable key: background"
msgstr "Удаляемый ключ: background"
-msgid "<different>"
-msgstr "<различные>"
+msgid "{0} ''{1}''"
+msgstr "{0} ''{1}''"
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] "{0} разное"
+msgstr[1] "{0} разных"
+msgstr[2] "{0} разных"
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ", {0} не задано"
+msgstr[1] ", {0} не заданы"
+msgstr[2] ", {0} не заданы"
msgid "Select objects for which to change tags."
msgstr "Выберите объекты для изменения тегов."
@@ -7536,6 +7446,12 @@ msgstr "Участник"
msgid "Position"
msgstr "Расположение"
+msgid "<different>"
+msgstr "<различные>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr "Объекты: {2} / Теги: {0} / Участие: {1}"
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Теги: {0} / Участие: {1}"
@@ -7672,6 +7588,17 @@ msgstr "Задать количество недавно добавленных
msgid "Remember last used tags after a restart"
msgstr "Помнить недавно добавленные теги после перезапуска"
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr "<code>Ctrl-1</code> — применить первое предложение"
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr "<code>Shift-Enter</code> — добавить без закрытия диалога"
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+"<code>Shift-Ctrl-1</code> — добавить первое предложение без закрытия диалога"
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
"Введите количество недавно добавленных тегов для отображения в списке"
@@ -8322,7 +8249,7 @@ msgid "Type"
msgstr "Тип"
msgid "Slippy map"
-msgstr "Быстрая карта"
+msgstr "Карта"
msgid "Tile Numbers"
msgstr "Номера квадратов"
@@ -8492,18 +8419,21 @@ msgstr "Объект"
msgid "not present"
msgstr "не существует"
-msgid "Changeset:"
-msgstr "Пакет правок"
-
msgid "Changeset comment"
msgstr "Комментарий к пакету правок"
msgid "Changeset source"
msgstr "Источник данных пакета правок"
+msgid "Imagery used"
+msgstr "Использованные снимки"
+
msgid "<b>Source</b>:"
msgstr "<b>Источник</b>:"
+msgid "<b>Imagery</b>:"
+msgstr "<b>Снимок</b>:"
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8515,6 +8445,9 @@ msgid ""
msgstr ""
"<html>Версия <strong>{0}</strong> Создано на <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr "Пакет правок"
+
msgid "Changeset info"
msgstr "Информация о пакете правок"
@@ -9737,6 +9670,9 @@ msgstr "Масштаб пиксела: {0}"
msgid "Best zoom: {0}"
msgstr "Наилучший масштаб: {0}"
+msgid "Cache stats: {0}"
+msgstr "Статистика кэша: {0}"
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "TMS-слой ({0}), загрузка в масштабе {1}"
@@ -11183,7 +11119,7 @@ msgid "Load profile"
msgstr "Загрузить профиль"
msgid "Save {0} profile"
-msgstr "Сохранить {0} профиль"
+msgstr "Сохранить профиль {0}"
msgid "All the preferences of this group are default, nothing to save"
msgstr "Все настройки этой группы стандартные, сохранять нечего"
@@ -11934,6 +11870,12 @@ msgstr "Добавить в меню быстрой карты "
msgid "Tile cache directory: "
msgstr "Каталог кэша квадратов: "
+msgid "Maximum concurrent downloads: "
+msgstr "Макс. число одновременных загрузок: "
+
+msgid "Maximum elements in disk cache: "
+msgstr "Макс. число элементов в дисковом кэше: "
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12636,6 +12578,16 @@ msgstr "Периодически проверять наличие новых с
msgid "Check interval (minutes):"
msgstr "Интервал проверки (минуты):"
+msgid "Max age for closed notes (days):"
+msgstr "Срок использования закрытых заметок (дней):"
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+"Указывает, сколько дней должно пройти после закрытия заметки, чтобы она "
+"больше не скачивалась"
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr "Не удалось получить токен доступа OAuth из менеджера учётных данных"
@@ -15786,6 +15738,9 @@ msgstr "Geoimage.at MaxRes"
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr "basemap.at ортофото"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Грац: базовая карта"
@@ -15889,6 +15844,9 @@ msgstr "Эстония: кадастр (Maaamet)"
msgid "Estonia Forestry (Maaamet)"
msgstr "Эстония: лесные массивы (Maaamet)"
+msgid "BANO"
+msgstr "BANO"
+
msgid "Bordeaux - 2012"
msgstr "Бордо - 2012"
@@ -16017,6 +15975,9 @@ msgstr "NRW-Atlas: топографическая карта 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Городская агломерация Рур: аэрофотосъёмка (10 см)"
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr "Саксония: аэроснимки, дорожная сеть, административные границы"
+
msgid "Drone Imagery (Haiti)"
msgstr "Снимки с дрона (Гаити)"
@@ -16639,13 +16600,6 @@ msgid "Landsat 233055"
msgstr "Landsat 233055"
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"Позволяет редактировать информацию о трафике и экспортировать её в симулятор "
-"городского дорожного движения SUMO"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -17047,6 +17001,13 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "Изменений свойств редактирования OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Позволяет редактировать информацию о трафике и экспортировать её в симулятор "
+"городского дорожного движения SUMO"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Позволяет добавлять метки/точки в текущей GPS позиции."
@@ -17174,7 +17135,7 @@ msgid "wood"
msgstr "дерево"
msgid "paving_stones"
-msgstr "брусчатка"
+msgstr "тротуарная плитка"
msgid "cobblestone"
msgstr "мостовая"
@@ -17776,15 +17737,38 @@ msgstr "Фенологический цикл"
msgid "deciduous"
msgstr "Листопадный"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr "Растения, полностью сбрасывающие листву в определённый период года."
+
msgid "evergreen"
msgstr "вечнозелёный"
+msgid "Plants that are never entirely without green foliage."
+msgstr "Растения, никогда не сбрасывающие листву полностью."
+
msgid "semi_deciduous"
msgstr "полулистопадный"
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+"Растения, остающиеся без листвы на очень короткий период, когда старые "
+"листья опадают, а новые начинают расти."
+
msgid "semi_evergreen"
msgstr "полувечнозелёный"
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+"Растения, сбрасывающие большую часть листы (но не всю) в определённый период "
+"года."
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr "Ареал с вечнозелёной и листопадной растительностью."
+
msgid "bahai"
msgstr "бахаи"
@@ -19056,6 +19040,12 @@ msgstr "Маршрут водного транспорта"
msgid "Marina"
msgstr "Пристань для яхт"
+msgid "Dump Station"
+msgstr "Сливная станция"
+
+msgid "public"
+msgstr "общедоступное"
+
msgid "Pier"
msgstr "Пирс"
@@ -19456,6 +19446,12 @@ msgstr "Автомойка"
msgid "Car Dealer"
msgstr "Автосалон"
+msgid "Second hand"
+msgstr "Подержанные"
+
+msgid "only"
+msgstr "только"
+
msgid "Repair"
msgstr "Автомастерская"
@@ -19468,12 +19464,6 @@ msgstr "Шины"
msgid "Rental"
msgstr "Прокат"
-msgid "Second hand"
-msgstr "Подержанные"
-
-msgid "only"
-msgstr "только"
-
msgid "Sharing"
msgstr "Кратковременный прокат"
@@ -19685,6 +19675,9 @@ msgstr "Место остановки вагона"
msgid "Platform"
msgstr "Платформа"
+msgid "Subway Entrance"
+msgstr "Вход в метро"
+
msgid "Station or amenities"
msgstr "Станция или услуги"
@@ -19740,9 +19733,6 @@ msgstr "Станция"
msgid "Building"
msgstr "Здание"
-msgid "Subway Entrance"
-msgstr "Вход в метро"
-
msgid "Ticket Machine"
msgstr "Автомат для покупки билетов"
@@ -19869,8 +19859,8 @@ msgstr "Звёзды"
msgid "Motel"
msgstr "Мотель"
-msgid "Guest House/Bed & Breakfast"
-msgstr "Гостевой дом/Мини-гостиница (B & B)"
+msgid "Guest House/Bed & Breakfast"
+msgstr "Гостевой дом/Bed & Breakfast"
msgid "Chalet"
msgstr "Съёмный домик (шале)"
@@ -20514,9 +20504,6 @@ msgstr "Общественный туалет"
msgid "Access rights"
msgstr "Права доступа"
-msgid "public"
-msgstr "общедоступное"
-
msgid "seasonal"
msgstr "в зависимости от сезона"
@@ -20690,6 +20677,18 @@ msgstr "Урна"
msgid "Waste Disposal/Dumpster"
msgstr "Мусорный бак"
+msgid "Sanitary Dump Station"
+msgstr "Ассенизационная сливная станция"
+
+msgid "Suction pumpout"
+msgstr "Всасывающий насос"
+
+msgid "Gravity dump station"
+msgstr "Самотечная сливная станция"
+
+msgid "Operation times"
+msgstr "Время работы"
+
msgid "Backrest"
msgstr "Спинка"
@@ -21437,9 +21436,6 @@ msgstr "Маяк"
msgid "Street Lamp"
msgstr "Уличный фонарь"
-msgid "Operation times"
-msgstr "Время работы"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Mo-Fr 22:00-05:00"
@@ -24029,6 +24025,18 @@ msgstr "Неспецифичный тег {0}"
msgid "Definition of {0} is unclear"
msgstr "Неточное определение {0}"
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+"{0} не рекомендуется. Используйте функцию «Изменить направление линии» из "
+"меню «Инструменты»."
+
+msgid "key with uncommon character"
+msgstr "ключ с необычным символом"
+
+msgid "uncommon short key"
+msgstr "необычно короткий ключ"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} на точке. Должен использоваться на линии."
@@ -24201,36 +24209,6 @@ msgstr "Показывать названия улиц (при крупных
msgid "Use alternative turn restriction icon set"
msgstr "Использовать альтернативный набор значков для запретов поворотов"
-msgid "OSM Export"
-msgstr "Экспорт OSM"
-
-msgid "Export traffic data to SUMO network file."
-msgstr "Экспортировать данные о трафике в network-файл симулятора SUMO."
-
-msgid "SUMO Export"
-msgstr "Экспорт в SUMO"
-
-msgid "Export"
-msgstr "Экспорт"
-
-msgid "Port:"
-msgstr "Порт:"
-
-msgid "refresh the port list"
-msgstr "обновить список портов"
-
-msgid "Configure"
-msgstr "Настройка"
-
-msgid "Connection Error."
-msgstr "Ошибка соединения."
-
-msgid "configure the connected DG100"
-msgstr "настроить подключенный DG100"
-
-msgid "delete data after import"
-msgstr "удалить данные после импорта"
-
msgid "Columbus V-900 CSV Files"
msgstr "Файлы Columbus V-900 CSV"
@@ -25493,6 +25471,12 @@ msgstr "Как часто должна применяться операция
msgid "Thinning Iterations"
msgstr "Итерации утончения"
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr "Использовать оттенок и насыщенность вместо RGB отличия"
+
+msgid "use HSV based algorithm"
+msgstr "использовать алгоритм, основанный на HSV"
+
msgid "Street Name:"
msgstr "Улица:"
@@ -25547,6 +25531,36 @@ msgstr "Отметьте противоположный угол здания"
msgid "Set width of the building"
msgstr "Укажите ширину здания"
+msgid "Merge address points"
+msgstr "Объединить адресные точки"
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr "Перенести теги с адресных точек внутри зданий на линии зданий"
+
+msgid "Select both address nodes and building ways to merge"
+msgstr "Для объединения выделите адресные точки и линии зданий"
+
+msgid "No address nodes found in the selection"
+msgstr "Адресные точки не выделены"
+
+msgid "No building ways found in the selection"
+msgstr "Линии зданий не выделены"
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] "{0} здание с несколькими адресными точками внутри"
+msgstr[1] "{0} здания с несколькими адресными точками внутри"
+msgstr[2] "{0} зданий с несколькими адресными точками внутри"
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] "{0} здание с конфликтами адресов"
+msgstr[1] "{0} здания с конфликтами адресов"
+msgstr[2] "{0} зданий с конфликтами адресов"
+
+msgid "No address nodes inside buildings found"
+msgstr "Адресные точки внутри зданий не найдены"
+
msgid "on polygon"
msgstr "на полигоне"
@@ -26223,6 +26237,9 @@ msgstr "Только справочный слой ({0})"
msgid "Subject only ({0})"
msgstr "Только целевой слой ({0})"
+msgid "Configure"
+msgstr "Настройка"
+
msgid "Configure conflation options"
msgstr "Настроить параметры объединения"
@@ -26545,9 +26562,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr "Неизвестный формат протоколирования"
+msgid "Port:"
+msgstr "Порт:"
+
+msgid "refresh the port list"
+msgstr "обновить список портов"
+
msgid "Configure Device"
msgstr "Конфигурация устройства"
+msgid "Connection Error."
+msgstr "Ошибка соединения."
+
+msgid "configure the connected DG100"
+msgstr "настроить подключенный DG100"
+
+msgid "delete data after import"
+msgstr "удалить данные после импорта"
+
msgid "Importing data from device."
msgstr "Импортирование данных с устройства."
@@ -27663,6 +27695,9 @@ msgstr "Mapillary"
msgid "Create Mapillary layer."
msgstr "Создать слой Mapillary."
+msgid "Export"
+msgstr "Экспорт"
+
msgid "Measured values"
msgstr "Измеренные значения"
@@ -29888,6 +29923,15 @@ msgstr "Порог близости точек (м)"
msgid "SeaMap Editor"
msgstr "Редактор морских карт"
+msgid "OSM Export"
+msgstr "Экспорт OSM"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Экспортировать данные о трафике в network-файл симулятора SUMO."
+
+msgid "SUMO Export"
+msgstr "Экспорт в SUMO"
+
msgid "AutoSave LiveData"
msgstr "Автосохранение данных позиционирования"
@@ -31931,3 +31975,6 @@ msgstr "Приступить к вождению"
msgid "Drive a race car on this layer"
msgstr "Вести гоночный автомобиль на этом слое"
+
+#~ msgid "Note comment background"
+#~ msgstr "Фон комментария к заметке"
diff --git a/i18n/po/sk.po b/i18n/po/sk.po
index 000dcfe..0c09d06 100644
--- a/i18n/po/sk.po
+++ b/i18n/po/sk.po
@@ -9,16 +9,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-03-25 22:02+0000\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-20 19:26+0000\n"
"Last-Translator: aceman444 <Unknown>\n"
"Language-Team: Slovak <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:56+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:56+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: sk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -473,15 +473,18 @@ msgstr "Prepnúť lištu s panelmi"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Prepnúť lištu s panelmi, maximalizovať miesto na mapu"
-msgid "Distribute Nodes"
-msgstr "Rozložiť body rovnomerne"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Rozložiť zvolené body v rovnakej vzdialenosti od seba pozdĺž trasy."
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Ignoruje sa {0} bodov s prázdnymi súradnicami"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Stiahnuť z OSM..."
@@ -498,6 +501,9 @@ msgstr ""
msgid "Download data"
msgstr "Stiahnuť dáta"
+msgid "Download notes in current view"
+msgstr "Stiahnuť poznámky v terajšom pohľade"
+
msgid "Download object..."
msgstr "Stiahnuť objekt..."
@@ -1038,6 +1044,12 @@ msgstr "Zavrieť dialóg a zrušiť sťahovanie"
msgid "Download Data"
msgstr "Sťahovanie dát"
+msgid "Which tasks to perform?"
+msgstr "Akú úlohu vykonať?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1857,6 +1869,30 @@ msgstr "Sťahujú sa poznámky (Notes)."
msgid "Notes"
msgstr "Poznámky"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] "{0} poznámok bolo stiahnutých."
+msgstr[1] "{0} poznámka bola stiahnutá."
+msgstr[2] "{0} poznámky boli stiahnuté."
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+"Limit na sťahovanie bol {0}, preto ešte mohli zostať nestiahnuté poznámky."
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr "Použite menšiu oblasť, v ktorej bude možné stiahnuť všetky poznámky."
+
+msgid "More notes to download"
+msgstr "Viac poznámok na stiahnutie"
+
+msgid "Download OSM Notes within Bounds"
+msgstr "Stiahnuť OSM Poznámky v oblasti"
+
+msgid "Download OSM Note by ID"
+msgstr "Stiahnuť OSM Poznámku s ID"
+
msgid "Download Compressed OSM Change"
msgstr "Stiahnuť komprimovanú OSM zmenu"
@@ -1866,6 +1902,9 @@ msgstr "Stiahnuť OSM zmenu"
msgid "Download Compressed OSM"
msgstr "Stiahnuť komprimované OSM"
+msgid "Download OSM object by ID"
+msgstr "Stiahnuť OSM objekt pomocou ID"
+
msgid "Download OSM"
msgstr "Stiahnuť OSM"
@@ -2511,162 +2550,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Chybný vyhľadávaný výraz"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Hlavná ulica</b> - \"Hlavná\" a \"ulica\" v niektorom kľúči"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Hlavná ulica\"</b> - reťazec \"Hlavná ulica\" v niektorom kľúči"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>kľúč:Hlav</b> - \"Hlav\" kdekoľvek v kľúči \"kľúč\""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-kľúč:Hlav</b> - \"Hlav\" nikde v kľúči \"kľúč\""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>kľúč=hodnota</b> - kľúč \"kľúč\" presne s hodnotou \"hodnota\""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>kľúč=*</b> - kľúč \"kľúč\" s akoukoľvek hodnotou. Skúste tiež "
-"<b>*=hodnota</b>, <b>kľúč =</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>kľúč:</b>- kľúč \"kľúč\" s akoukoľvek hodnotou"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>kľúč?</b> - kľúč \"kľúč\" s hodnotou \"yes\" (ano), \"true\" (pravda), "
-"\"1\", alebo \"on\" (zapnuté)"
-
-msgid "Special targets"
-msgstr "Špecifické ciele"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - objekty zodpovedajúceho typu (<b>node</b> (bod), "
-"<b>way</b> (cesta), <b>relation</b> (relácia))"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - objekty, ktoré zmenil používateľ"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - objekty, ktoré zmenil anonymný používateľ"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - objekty s daným ID (0 pre nové objekty)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - objekty s danou verziou (0 objekty bez pridelenej "
-"verzie)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - objekty s daným id súboru zmien (0 objekty bez "
-"priradeného súboru zmien)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - objekty s daným počtom bodov (<b>nodes:</b> počet, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- alebo <b> nodes:</b>-max)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - objekty s daným počtom značiek "
-"(<b>tags:</b>počet,<b>tags:</b>min-max,<b>tags:</b>min- alebo <b> tags:</b>-"
-"max)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - objekty s danou úlohu v relácii"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>časová značka - objekty s poslednou úpravou v čase \"časová "
-"značka\" (2009-11-12T14:51:09Z, 2009-11-12 alebo T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr "<b>timestamp:</b>min/max - objekty s poslednou úpravou v rozsahu"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - uzavreté cesty s danou plochou v m² "
-"(<b>areasize:</b>min-max alebo <b>areasize:</b> max)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - všetky zmenené objekty"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - všetky vybraté objekty"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - všetky nekompletné objekty"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - všetky objekty bez značiek"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-"<b>closed</b> - všetky uzavreté cesty (body nie sú považované za uzavreté)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr "<b>child <i>výraz</i></b> - všetky deti objektov vyhovujúcich výrazu"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>výraz</i></b> - všetci rodičia objektov vyhovujúcich výrazu"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - objekty (a všetky ich body ciest / členy "
-"relácií) sa v stiahnutej oblasti"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - objekty (a všetky ich body ciest / členy relácií), v "
-"aktuálnom zobrazení"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Použite <b>|</b> alebo <b>OR</b> pre spojenie logickým \"alebo\""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Použite <b>\"</b> operátor citovania (napr. ak kľúč obsahuje <b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Vo vnútri reťazcov v úvodzovkách musí znaky <b>\"</b> a <b>\\</b> "
-"predchádzať <b>\\</b> (napr. <b>\\\"</b> and <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Použite <b>(</b> a <b>)</b> k zoskupeniu výrazov"
-
msgid "basic examples"
msgstr "základné príklady"
@@ -2706,6 +2589,15 @@ msgstr "ak \"kľúč\" existuje"
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr "ak \"kľúč\" je väčší ako \"hodnota\" (podobne s \"menší než\")"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"deaktivovať operátory.<br>V rámci reťazcov v úvodzovkách musia byť znaky "
+"<b>\"</b> a <b>\\</b> sprevádzané pomocou predchádzajúceho <b>\\</b> (napr. "
+"<b>\\\"</b> a <b>\\\\</b>)."
+
msgid "combinators"
msgstr "kombinátory"
@@ -2721,15 +2613,6 @@ msgstr "logická negácia"
msgid "use parenthesis to group expressions"
msgstr "použiť zátvorky pre zoskupenie výrazov"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"deaktivovať operátory.<br>V rámci reťazcov v úvodzovkách musia byť znaky "
-"<b>\"</b> a <b>\\</b> sprevádzané pomocou predchádzajúceho <b>\\</b> (napr. "
-"<b>\\\"</b> a <b>\\\\</b>)."
-
msgid "objects"
msgstr "objekty"
@@ -2766,8 +2649,14 @@ msgstr "objekty s časom poslednej zmeny v rozsahu"
msgid "properties"
msgstr "vlastnosti"
-msgid "objects with at least 20 nodes"
-msgstr "objekty s aspoň 20 bodmi"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr "cesty s aspoň 20 bodmi alebo relácie obsahujúce aspoň 20 bodov"
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
+"body obsiahnuté v aspoň 3 cestách alebo relácie obsahujúce aspoň 3 cesty"
msgid "objects having 5 to 10 tags"
msgstr "objekty obsahujúce 5 až 10 značiek"
@@ -2778,6 +2667,9 @@ msgstr "objekty s danou rolou v relácii"
msgid "closed ways with an area of 100 m²"
msgstr "uzavreté cesty s plochou 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr "cesty s dĺžkou 200 metrov a viac"
+
msgid "state"
msgstr "stav"
@@ -4258,8 +4150,8 @@ msgstr ""
"rovnaký ako niektorý z atribútov \"name:*\" a nie je zložený z atribútov "
"\"name:*\", napríklad Italia - Italien - Italy."
-msgid "A name:* translation is missing."
-msgstr "Chýba preklad \"name:*\"."
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr "Chýba name:*={0}. Pridajte značky so správnym kódom jazyka."
msgid "A name is missing, even though name:* exists."
msgstr "Chýba ''name'', napriek tomu, že ''name:*'' existuje."
@@ -4916,6 +4808,9 @@ msgstr "Zobrazí JOSM verziu a skončí"
msgid "Print debugging messages to console"
msgstr "Zobrazovať ladiace správy v konzole"
+msgid "Skip loading plugins"
+msgstr "Preskočiť načítanie pluginov"
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr "Zakázať prístup k uvedeným zdrojom, oddeleným čiarkou"
@@ -4985,6 +4880,9 @@ msgstr "Uistite sa, že ste načítali nejaké dáta ak ste použili --výber."
msgid "Printing debugging messages to console"
msgstr "Tlačenie ladiacich správ do konzoly"
+msgid "Plugin loading skipped"
+msgstr "Načítanie pluginov preskočené"
+
msgid "Enabled detailed debug level (trace)"
msgstr "Zapnutá úroveň detailného ladenia (krokovanie)"
@@ -6533,9 +6431,6 @@ msgstr "Šírka/Dĺžka"
msgid "East/North"
msgstr "Východ/Sever"
-msgid "Ok"
-msgstr "Ok"
-
msgid "Please enter a GPS coordinates"
msgstr "Prosím zadajte súradnice GPS"
@@ -7483,8 +7378,20 @@ msgstr "Zbytočný kľúč: popredie"
msgid "Discardable key: background"
msgstr "Zbytočný kľúč: pozadie"
-msgid "<different>"
-msgstr "<rôzne>"
+msgid "{0} ''{1}''"
+msgstr "{0} \"{1}\""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] "{0} rôznych"
+msgstr[1] "{0} rôzny"
+msgstr[2] "{0} rôzne"
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ", {0} nenastavených"
+msgstr[1] ", {0} nenastavené"
+msgstr[2] ", {0} nenastavené"
msgid "Select objects for which to change tags."
msgstr "Vyberte objekty, pre ktoré chcete zmeniť značky."
@@ -7501,6 +7408,12 @@ msgstr "Člen"
msgid "Position"
msgstr "Poloha"
+msgid "<different>"
+msgstr "<rôzne>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr "Objekty: {2} / Značky: {0} / Členstvá: {1}"
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Značky: {0} / Členstvá: {1}"
@@ -7637,6 +7550,16 @@ msgstr "Nastavte počet novo pridaných značiek"
msgid "Remember last used tags after a restart"
msgstr "Zapamätať naposledy používané značky aj po reštarte"
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr "<code>Ctrl-1</code> aplikuje prvý návrh"
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr "<code>Shift-Enter</code> pridá značku bez zatvorenia okna"
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr "<code>Shift-Ctrl-1</code> pridá prvý návrh bez zatvorenia okna"
+
msgid "Please enter the number of recently added tags to display"
msgstr "Zadajte prosím počet nedávno pridaných značiek pre zobrazenie"
@@ -8440,18 +8363,21 @@ msgstr "Objekt"
msgid "not present"
msgstr "nie je prítomný"
-msgid "Changeset:"
-msgstr "Zmenový súbor:"
-
msgid "Changeset comment"
msgstr "Komentár k súboru zmien"
msgid "Changeset source"
msgstr "Zdroj zmenového súboru"
+msgid "Imagery used"
+msgstr "Použité podkladové snímky"
+
msgid "<b>Source</b>:"
msgstr "<b>Zdroj</b>:"
+msgid "<b>Imagery</b>:"
+msgstr "<b>Podkladové snímky</b>:"
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8463,6 +8389,9 @@ msgid ""
msgstr ""
"<html>Verzia <strong>{0}</strong> vytvorená <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "Info súboru zmien"
@@ -9661,6 +9590,9 @@ msgstr "Zväčšenie bodov: {0}"
msgid "Best zoom: {0}"
msgstr "Najlepšie priblíženie: {0}"
+msgid "Cache stats: {0}"
+msgstr "Štatistiky vyrovnávacej pamäte: {0}"
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "TMS vrstva ({0}), sťahovaná vo zväčšení (zoom) {1}"
@@ -11432,7 +11364,7 @@ msgid "Name or offset"
msgstr "Meno alebo vyrovnanie(offset)"
msgid "None"
-msgstr "Žiadny"
+msgstr "Žiadne"
msgid "Custom"
msgstr "Vlastné"
@@ -11752,7 +11684,7 @@ msgid "Fade amount: "
msgstr "Úroveň zoslabenia: "
msgid "Soft"
-msgstr "Jemný"
+msgstr "Jemné"
msgid "Strong"
msgstr "Silné"
@@ -11767,7 +11699,7 @@ msgid "Modify list of imagery layers displayed in the Imagery menu"
msgstr "Zmeniť zoznam vrstiev mapových podkladov zobrazených v ponuke"
msgid "Common Settings"
-msgstr "Všeobecné nasavenia"
+msgstr "Všeobecné nastavenia"
msgid "WMS Settings"
msgstr "WMS nastavenia"
@@ -11853,6 +11785,12 @@ msgstr "Pridať do výberu posúvacej mapy: "
msgid "Tile cache directory: "
msgstr "Adresár pre vyrovnávaciu pamäť dlaždíc: "
+msgid "Maximum concurrent downloads: "
+msgstr "Maximum paralelných sťahovaní: "
+
+msgid "Maximum elements in disk cache: "
+msgstr "Maximum objektov v diskovej vyrovnávacej pamäti: "
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11861,13 +11799,13 @@ msgstr ""
"takže ju nemožno použiť. Táto správa sa znovu nezobrazí ."
msgid "Downloader:"
-msgstr "Stahovač:"
+msgstr "Program na sťahovanie:"
msgid "Simultaneous connections:"
msgstr "Súbežné pripojenia:"
msgid "Overlap tiles"
-msgstr "Prekryť štvorce (tiles)"
+msgstr "Prekrývanie dlaždíc (tiles)"
msgid "% of east:"
msgstr "% z východu:"
@@ -12561,6 +12499,15 @@ msgstr "Pravidelne kontrolovať nové správy"
msgid "Check interval (minutes):"
msgstr "Interval kontroly (minúty):"
+msgid "Max age for closed notes (days):"
+msgstr "Maximálny vek zatvorených poznámok (dni):"
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+"Určuje počet dní koľko musí byť poznámka uzavretá, aby sa už nesťahovala."
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
"Nepodarilo sa získať OAuth autorizačný prístup zo správcu prihlasovacích "
@@ -15729,6 +15676,9 @@ msgstr "Geoimage.at MaxRes"
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr "basemap.at Orthofoto"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (základná mapa)"
@@ -15832,6 +15782,9 @@ msgstr "Estónsky kataster (Maaamet)"
msgid "Estonia Forestry (Maaamet)"
msgstr "Estónsko, Lesníctvo (Maaamet)"
+msgid "BANO"
+msgstr "BANO"
+
msgid "Bordeaux - 2012"
msgstr "Bordeaux - 2012"
@@ -15963,6 +15916,9 @@ msgstr "NRW-Atlas: Topografická mapa 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropola Ruhr: Letecké snímky (10 cm)"
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr "SN Letecké snímky, Cestná sieť, Administratívne hranice"
+
msgid "Drone Imagery (Haiti)"
msgstr "Snímky automatických lietadiel (Haiti)"
@@ -16315,7 +16271,7 @@ msgid "U.S. Forest Service roads"
msgstr "Cesty Lesnej služby U.S.A."
msgid "Ukraine - Orthophotomaps 2012"
-msgstr "Ukraine - Ortofotomapy 2012"
+msgstr "Ukrajina - Ortofotomapy 2012"
msgid "7th Series (OS7)"
msgstr "7th Series (OS7)"
@@ -16585,13 +16541,6 @@ msgid "Landsat 233055"
msgstr "Landsat 233055"
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"Umožňuje upravovať informácie o premávke a exportovať do simulátora mestskej "
-"mobility SUMO"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -16985,6 +16934,13 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "Upravuje vlastnosti pre OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Umožňuje upravovať informácie o premávke a exportovať do simulátora mestskej "
+"mobility SUMO"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Povoľuje pridávanie značiek/bodov na aktuálnu gps pozíciu."
@@ -17716,15 +17672,38 @@ msgstr "Cyklus"
msgid "deciduous"
msgstr "opadavý"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr "Rastliny, ktoré nemajú listy počas časti roku."
+
msgid "evergreen"
msgstr "stálezelený"
+msgid "Plants that are never entirely without green foliage."
+msgstr "Rastliny, ktoré nikdy nie sú bez zelených listov."
+
msgid "semi_deciduous"
msgstr "poloopadavý"
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+"Rastliny, ktoré strácajú listy na veľmi krátku dobu kedy staré listy odpadnú "
+"a začnú rásť nové."
+
msgid "semi_evergreen"
msgstr "skoro stálezelený"
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+"Rastliny, ktoré strácajú väčšinu listov na krátku dobu v roku, ale nikdy nie "
+"všetky."
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr "Plocha so stálezelenou aj opadavou vegetáciou."
+
msgid "bahai"
msgstr "baháisti"
@@ -18997,6 +18976,12 @@ msgstr "Prievoz, trajekt"
msgid "Marina"
msgstr "Prístav pre jachty (Marina)"
+msgid "Dump Station"
+msgstr "Výlevka na odpad z karavanu"
+
+msgid "public"
+msgstr "verejné"
+
msgid "Pier"
msgstr "Mólo"
@@ -19397,6 +19382,12 @@ msgstr "Umývačka"
msgid "Car Dealer"
msgstr "Predajca automobilov"
+msgid "Second hand"
+msgstr "Použitý tovar (second hand)"
+
+msgid "only"
+msgstr "výhradne"
+
msgid "Repair"
msgstr "Servis"
@@ -19409,12 +19400,6 @@ msgstr "Pneumatiky"
msgid "Rental"
msgstr "Požičovňa"
-msgid "Second hand"
-msgstr "Použitý tovar (second hand)"
-
-msgid "only"
-msgstr "výhradne"
-
msgid "Sharing"
msgstr "Autopožičovňa (aj pre krátkodobé požičanie auta aj 1 hod.)"
@@ -19624,6 +19609,9 @@ msgstr "Miesto zastavenia"
msgid "Platform"
msgstr "Nástupište"
+msgid "Subway Entrance"
+msgstr "Vchod do metra"
+
msgid "Station or amenities"
msgstr "Stanica alebo vybavenosť"
@@ -19679,9 +19667,6 @@ msgstr "Stanica"
msgid "Building"
msgstr "Budova"
-msgid "Subway Entrance"
-msgstr "Vchod do metra"
-
msgid "Ticket Machine"
msgstr "Automat na lístky"
@@ -19808,7 +19793,7 @@ msgstr "Hviezdičkový"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr "Penzión"
msgid "Chalet"
@@ -20453,9 +20438,6 @@ msgstr "Toalety"
msgid "Access rights"
msgstr "Oprávnenie prístupu"
-msgid "public"
-msgstr "verejné"
-
msgid "seasonal"
msgstr "sezónne"
@@ -20629,6 +20611,18 @@ msgstr "Odpadkový kôš"
msgid "Waste Disposal/Dumpster"
msgstr "Zhromaždisko odpadu (kontajner)"
+msgid "Sanitary Dump Station"
+msgstr "Výlevka na WC z karavanu"
+
+msgid "Suction pumpout"
+msgstr "Vyliatie nasávaním"
+
+msgid "Gravity dump station"
+msgstr "Vyliatie voľným pádom"
+
+msgid "Operation times"
+msgstr "Prevádzková doba"
+
msgid "Backrest"
msgstr "Operadlo chrbta (Backrest)"
@@ -21376,9 +21370,6 @@ msgstr "Maják"
msgid "Street Lamp"
msgstr "Pouličná lampa"
-msgid "Operation times"
-msgstr "Prevádzková doba"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Po-Pi 22:00-05:00"
@@ -23960,6 +23951,17 @@ msgstr "Málo špecifická značka {0}"
msgid "Definition of {0} is unclear"
msgstr "Definícia {0} je nejasná"
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+"{0} sa neodporúča. Použite funkciu Otočiť smer ciest z menu Nástroje."
+
+msgid "key with uncommon character"
+msgstr "kľúč s nezvyčajným znakom"
+
+msgid "uncommon short key"
+msgstr "nezvyčajne krátky kľúč"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} na bode. Malo by byť použité na ceste."
@@ -24134,36 +24136,6 @@ msgstr "Zobrazovať názvy ulíc (pri vysokom priblížení)"
msgid "Use alternative turn restriction icon set"
msgstr "Použiť alternatívnu sadu ikon pre zákazy odbočenia"
-msgid "OSM Export"
-msgstr "OSM Export"
-
-msgid "Export traffic data to SUMO network file."
-msgstr "Exportovať dopravné údaje do súboru siete SUMO."
-
-msgid "SUMO Export"
-msgstr "SUMO Export"
-
-msgid "Export"
-msgstr "Export"
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "obnoviť obsah okna"
-
-msgid "Configure"
-msgstr "Konfigurovať"
-
-msgid "Connection Error."
-msgstr "Chyba pri pripojovaní."
-
-msgid "configure the connected DG100"
-msgstr "konfigurovať spojenie DG100"
-
-msgid "delete data after import"
-msgstr "zmazať dáta po importe"
-
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV Súbory"
@@ -25311,6 +25283,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Názov ulice:"
@@ -25365,6 +25343,34 @@ msgstr "Označte protiľahlý koniec budovy"
msgid "Set width of the building"
msgstr "Nastavte šírku budovy"
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -26027,6 +26033,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "Konfigurovať"
+
msgid "Configure conflation options"
msgstr ""
@@ -26344,9 +26353,24 @@ msgstr "Vypnúť zaznamenávanie dát ak vzdialenosť klesla pod"
msgid "Unknown logFormat"
msgstr "Neznámy zaznamenaný formát"
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "obnoviť obsah okna"
+
msgid "Configure Device"
msgstr "Konfigurácia zariadenia"
+msgid "Connection Error."
+msgstr "Chyba pri pripojovaní."
+
+msgid "configure the connected DG100"
+msgstr "konfigurovať spojenie DG100"
+
+msgid "delete data after import"
+msgstr "zmazať dáta po importe"
+
msgid "Importing data from device."
msgstr "Importovať dáta zo zariadenia."
@@ -27420,6 +27444,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr "Export"
+
msgid "Measured values"
msgstr "Namerané hodnoty"
@@ -29542,6 +29569,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr "OSM Export"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Exportovať dopravné údaje do súboru siete SUMO."
+
+msgid "SUMO Export"
+msgstr "SUMO Export"
+
msgid "AutoSave LiveData"
msgstr "Automatické ukladanie LiveData"
@@ -31511,3 +31547,6 @@ msgstr "Ísť jazdiť"
msgid "Drive a race car on this layer"
msgstr "Jazdiť so závodným autom na tejto vrstve"
+
+#~ msgid "Note comment background"
+#~ msgstr "Pozadie komentára poznámky"
diff --git a/i18n/po/sl.po b/i18n/po/sl.po
index 438b2a3..7c21407 100644
--- a/i18n/po/sl.po
+++ b/i18n/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2013-03-30 13:06+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Slovenian <sl at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
"n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:57+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:56+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: sl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -447,15 +447,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Sprejem iz OSM..."
@@ -472,6 +475,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -966,6 +972,12 @@ msgstr "Zapri dialog in prekini prenos"
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Potrdi"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1717,6 +1729,28 @@ msgstr ""
msgid "Notes"
msgstr "Bankovci"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1726,6 +1760,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2310,134 +2347,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2477,6 +2386,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2492,12 +2407,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2534,7 +2443,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2546,6 +2460,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3889,7 +3806,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4535,6 +4452,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4593,6 +4513,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5983,9 +5906,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr "Potrdi"
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6854,8 +6774,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<različno>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr ""
@@ -6872,6 +6802,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr "<različno>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -7006,6 +6942,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7736,18 +7682,21 @@ msgstr "Predmet"
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7756,6 +7705,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8786,6 +8738,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10756,6 +10711,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11393,6 +11354,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14133,6 +14102,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14236,6 +14208,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14363,6 +14338,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14985,11 +14963,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15306,6 +15279,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -16009,15 +15987,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17265,6 +17262,12 @@ msgstr "Pot trajekta"
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr "Pomol"
@@ -17663,6 +17666,12 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Repair"
msgstr ""
@@ -17675,12 +17684,6 @@ msgstr ""
msgid "Rental"
msgstr "Izposojevalnica"
-msgid "Second hand"
-msgstr ""
-
-msgid "only"
-msgstr ""
-
msgid "Sharing"
msgstr ""
@@ -17890,6 +17893,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr "Vhod v podzemno"
+
msgid "Station or amenities"
msgstr ""
@@ -17945,9 +17951,6 @@ msgstr ""
msgid "Building"
msgstr "Zgradba"
-msgid "Subway Entrance"
-msgstr "Vhod v podzemno"
-
msgid "Ticket Machine"
msgstr ""
@@ -18074,7 +18077,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18719,9 +18722,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18895,6 +18895,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19642,9 +19654,6 @@ msgstr "Svetilnik"
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22200,6 +22209,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22366,36 +22385,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr "izbriši podatke po uvozu"
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23514,6 +23503,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23568,6 +23563,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24177,6 +24200,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24491,9 +24517,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr "izbriši podatke po uvozu"
+
msgid "Importing data from device."
msgstr ""
@@ -25534,6 +25575,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr "Izmerjene vrednosti"
@@ -27638,6 +27682,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/sq.po b/i18n/po/sq.po
index 7fa3335..eab7751 100644
--- a/i18n/po/sq.po
+++ b/i18n/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2011-11-04 19:43+0000\n"
"Last-Translator: StefanPrifti <Unknown>\n"
"Language-Team: FLOSS Kosova\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:31+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:31+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/sr.po b/i18n/po/sr.po
index 015e6b1..ed7549c 100644
--- a/i18n/po/sr.po
+++ b/i18n/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2015-02-01 15:30+0000\n"
"Last-Translator: Slobodan Simić <Unknown>\n"
"Language-Team: Serbian <sr at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:55+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:55+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: sr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -445,15 +445,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -468,6 +471,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -962,6 +968,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "У реду"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1706,6 +1718,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1715,6 +1749,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2297,134 +2334,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2464,6 +2373,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2479,12 +2394,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2521,7 +2430,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2533,6 +2447,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3866,7 +3783,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4506,6 +4423,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4564,6 +4484,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5954,9 +5877,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr "У реду"
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6825,9 +6745,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6843,6 +6773,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6973,6 +6909,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7699,18 +7645,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr "Скуп измена:"
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7720,6 +7669,9 @@ msgid ""
msgstr ""
"<html>Верзија <strong>{0}</strong> направљена <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8742,6 +8694,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10706,6 +10661,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11343,6 +11304,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14071,6 +14040,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14174,6 +14146,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14301,6 +14276,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14923,11 +14901,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15244,6 +15217,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15947,15 +15925,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17203,6 +17200,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17601,22 +17604,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17828,6 +17831,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17883,9 +17889,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18012,7 +18015,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18657,9 +18660,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18833,6 +18833,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19580,9 +19592,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22138,6 +22147,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22304,36 +22323,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23452,6 +23441,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23506,6 +23501,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24115,6 +24138,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24429,9 +24455,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25470,6 +25511,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27574,6 +27618,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/sv.po b/i18n/po/sv.po
index 9aad924..ee044f2 100644
--- a/i18n/po/sv.po
+++ b/i18n/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2015-03-12 23:01+0000\n"
"Last-Translator: Niklas Henriksson <fringillus92 at gmail.com>\n"
"Language-Team: Swedish <sv at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:58+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:57+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: sv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -461,15 +461,18 @@ msgstr "Växlar dialogpanelen"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Växlar dialogpanelen, maximerar kartvyn"
-msgid "Distribute Nodes"
-msgstr "Distribuera noder"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Distribuera de valda noderna på jämna avstånd längs en linje."
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Ignorerar {0} noder med null-koordinater"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Ladda ner från OSM..."
@@ -486,6 +489,9 @@ msgstr ""
msgid "Download data"
msgstr "Hämta data"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Ladda ner objekt..."
@@ -1020,6 +1026,12 @@ msgstr "Stäng dialogen och avbryt hämtning"
msgid "Download Data"
msgstr "Hämta data"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Ok"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1834,6 +1846,28 @@ msgstr "Hämtar anteckningar"
msgid "Notes"
msgstr "Anteckningar"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr "Ladda ner komprimerad OSM-förändring"
@@ -1843,6 +1877,9 @@ msgstr "Ladda ner OSM-förändring"
msgid "Download Compressed OSM"
msgstr "Ladda ner komprimerad OSM"
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "Hämta OSM"
@@ -2474,161 +2511,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Ogiltigt sökuttryck"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Baker Street</b> - \"Baker\" och \"Street\" i valfri nyckel"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Baker Street\"</b> - \"Baker Street\" i valfri nyckel"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Bak</b> - ''Bak'' var som helst i nyckeln \"key\""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Bak</b> - ''Bak'' ingenstans i nyckeln \"key\""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - nyckeln ''key'' det exakta värdet ''value''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - nyckeln ''key'' med valfritt värde. Prova även "
-"<b>*=value</b>, <b>key=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - nyckeln ''key'' satt till valfritt värde"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>key?</b> - nyckeln ''key'' med värdet ''yes'', ''true'', ''1'' eller "
-"''on''"
-
-msgid "Special targets"
-msgstr "Speciella mål"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - objekt av korresponderande typ (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "Copy text \t <b>user:</b>... - objekt ändrat av användare"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - objekt ändrade av anonyma användare"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - objekt med tilldelade ID (0 för nya objekt)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - objekt med tilldelade verisonsnummer (0 objekt utan "
-"tilldelade versionsnummer)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - objekt med givet changeset-ID (0 objekt utan angivet "
-"changeset)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - objekt med specifikt antal noder (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - objekt med specifikt antal taggar (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - objekt med en specifik roll i en relation"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - stängda vägar med given area specificerat i m² "
-"(<b>areasize:</b>min-max or <b>areasize:</b>max)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - alla ändrade objekt"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - alla valda objekt"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - alla ofullständiga objekt"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - alla otaggade objekt"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-"<b>closed</b> - alla stängda vägar (en nod räknas inte som stängd väg)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>uttryck</i></b> - alla barn till objekt matchande uttrycket"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>uttryck</i></b> - alla föräldrar till objekt matchande uttrycket"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - objekt (och alla dess noder / "
-"relationsmedlemmar) i nedladdat område"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - objekt (och alla dess noder / relationsmedlemmar) i "
-"aktuell vy"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Använd <b>|</b> eller <b>OR</b> för att kombinera med logiskt ELLER"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Använd <b>\"</b> för att citera operatorer (exempelvis om nyckeln innehåller "
-"<b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"I citerade strängar behöver <b>\"</b> och <b>\\</b> föregås av ett <b>\\"
-"</b>. (Dvs. <b>\\\"</b> och <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Använd <b>(</b> och <b>)</b> för att gruppera uttryck"
-
msgid "basic examples"
msgstr "grundläggande exempel"
@@ -2669,6 +2551,12 @@ msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
"matchar om \"nyckeln\" är större än \"värdet\" (jämfört med \"mindre än\")"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr "kombinerare"
@@ -2684,12 +2572,6 @@ msgstr "logisk inte"
msgid "use parenthesis to group expressions"
msgstr "använd parentes för att gruppera uttryck"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr "objekt"
@@ -2726,8 +2608,13 @@ msgstr "objekt med senaste ändring inom"
msgid "properties"
msgstr "egenskaper"
-msgid "objects with at least 20 nodes"
-msgstr "objekt med minst 20 noder"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "objekt med 5 till 10 taggar"
@@ -2738,6 +2625,9 @@ msgstr "objekt med given roll i en relation"
msgid "closed ways with an area of 100 m²"
msgstr "slutna sträckor med en area om 100 m²"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr "status"
@@ -4134,8 +4024,8 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
-msgstr "En name:*-översättning saknas."
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "Ett namn saknas, fast name:* finns."
@@ -4796,6 +4686,9 @@ msgstr "Visar JOSM-version och avslutar"
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4860,6 +4753,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -6266,9 +6162,6 @@ msgstr "Lat/Long"
msgid "East/North"
msgstr "Öst/Nord"
-msgid "Ok"
-msgstr "Ok"
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -7153,8 +7046,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<olika>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr "Välj objekt för vilka taggar ska ändras."
@@ -7171,6 +7074,12 @@ msgstr "Medlem av"
msgid "Position"
msgstr "Position"
+msgid "<different>"
+msgstr "<olika>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Taggar: {0} / Medlemskap: {1}"
@@ -7301,6 +7210,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr "Ange antalet nyligen använda taggar att visa"
@@ -8048,18 +7967,21 @@ msgstr "Objekt"
msgid "not present"
msgstr "inte tillgängligt"
-msgid "Changeset:"
-msgstr "Ändringsuppsättning:"
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr "<b>Källa</b>:"
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8071,6 +7993,9 @@ msgid ""
msgstr ""
"<html>Version <strong>{0}</strong> skapad <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -9142,6 +9067,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr "Bästa zoom: {0}"
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -11171,6 +11099,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11826,6 +11760,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14670,6 +14612,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14773,6 +14718,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14900,6 +14848,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -15522,11 +15473,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15855,6 +15801,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -16558,15 +16509,34 @@ msgstr ""
msgid "deciduous"
msgstr "lövskog"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahai"
@@ -17814,6 +17784,12 @@ msgstr "Färjelinje"
msgid "Marina"
msgstr "Småbåtshamn"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "offentlig"
+
msgid "Pier"
msgstr "Pir"
@@ -18212,6 +18188,12 @@ msgstr "Biltvätt"
msgid "Car Dealer"
msgstr "Bilhandlare"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr "endast"
+
msgid "Repair"
msgstr "Bilverkstad"
@@ -18224,12 +18206,6 @@ msgstr ""
msgid "Rental"
msgstr "Uthyrning"
-msgid "Second hand"
-msgstr ""
-
-msgid "only"
-msgstr "endast"
-
msgid "Sharing"
msgstr "Bilpool"
@@ -18439,6 +18415,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr "Tunnelbaneingång"
+
msgid "Station or amenities"
msgstr ""
@@ -18494,9 +18473,6 @@ msgstr "Järnvägsstation"
msgid "Building"
msgstr "Byggnad"
-msgid "Subway Entrance"
-msgstr "Tunnelbaneingång"
-
msgid "Ticket Machine"
msgstr "Biljettmaskin"
@@ -18623,7 +18599,7 @@ msgstr "Stjärnor"
msgid "Motel"
msgstr "Motell"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -19270,9 +19246,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr "offentlig"
-
msgid "seasonal"
msgstr ""
@@ -19446,6 +19419,18 @@ msgstr "Papperskorg"
msgid "Waste Disposal/Dumpster"
msgstr "Soptunna/Sopcontainer"
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr "Ryggstöd"
@@ -20193,9 +20178,6 @@ msgstr "Fyrtorn"
msgid "Street Lamp"
msgstr "Gatulampa"
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Mån-Fre 22:00-05:00"
@@ -22757,6 +22739,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22925,36 +22917,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "uppdatera portlistan"
-
-msgid "Configure"
-msgstr "Anpassa"
-
-msgid "Connection Error."
-msgstr "Anslutningsfel."
-
-msgid "configure the connected DG100"
-msgstr "anpassa den anslutna DG100"
-
-msgid "delete data after import"
-msgstr "ta bort data efter import"
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24073,6 +24035,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "Gatunamn:"
@@ -24127,6 +24095,34 @@ msgstr "Peka på byggnadens motsatta hörn"
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24744,6 +24740,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "Anpassa"
+
msgid "Configure conflation options"
msgstr ""
@@ -25060,9 +25059,24 @@ msgstr "Inaktivera dataloggning om avståndet blir kortare än"
msgid "Unknown logFormat"
msgstr "Okänt loggningsformat"
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "uppdatera portlistan"
+
msgid "Configure Device"
msgstr "Anpassa enheten"
+msgid "Connection Error."
+msgstr "Anslutningsfel."
+
+msgid "configure the connected DG100"
+msgstr "anpassa den anslutna DG100"
+
+msgid "delete data after import"
+msgstr "ta bort data efter import"
+
msgid "Importing data from device."
msgstr "Importerar data från enhet."
@@ -26120,6 +26134,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr "Uppmätta värden."
@@ -28234,6 +28251,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr "Spara LiveData automatiskt"
diff --git a/i18n/po/ta.po b/i18n/po/ta.po
index 734e4d2..5a43ff7 100644
--- a/i18n/po/ta.po
+++ b/i18n/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2012-10-03 22:36+0000\n"
"Last-Translator: நவீன் குமார்(கெம்ளின்) <naveenmtp at gmail.com>\n"
"Language-Team: Tamil <ta at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:58+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:58+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"X-Poedit-Country: INDIA\n"
"Language: ta\n"
"X-Poedit-Language: Tamil\n"
@@ -452,15 +452,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "புள்ளிகளை பங்கிடு"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "கோட்டின் வழியாக தேர்ந்தெடுக்கப்பட்ட புள்ளிகளை சம தூரத்தில் பங்கிடு"
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "OSMயில் இருந்து பதிவிறக்கு"
@@ -475,6 +478,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -980,6 +986,12 @@ msgstr "கேள்வி பெட்டியை மூடிவிட்ட
msgid "Download Data"
msgstr "விவரத்தை பதிவிறக்கு"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1739,6 +1751,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1748,6 +1782,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2330,134 +2367,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2497,6 +2406,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2512,12 +2427,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2554,7 +2463,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2566,6 +2480,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3899,7 +3816,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4539,6 +4456,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4597,6 +4517,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5987,9 +5910,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6859,9 +6779,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6877,6 +6807,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -7007,6 +6943,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7733,18 +7679,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7753,6 +7702,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8777,6 +8729,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10741,6 +10696,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11378,6 +11339,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14106,6 +14075,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14209,6 +14181,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14336,6 +14311,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14958,11 +14936,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15279,6 +15252,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15982,15 +15960,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17238,6 +17235,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17636,22 +17639,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17863,6 +17866,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17918,9 +17924,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18047,7 +18050,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18692,9 +18695,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18868,6 +18868,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19615,9 +19627,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22173,6 +22182,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22339,36 +22358,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23487,6 +23476,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23541,6 +23536,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24150,6 +24173,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24464,9 +24490,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25505,6 +25546,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27615,6 +27659,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/te.po b/i18n/po/te.po
index 195aa17..cc84bd1 100644
--- a/i18n/po/te.po
+++ b/i18n/po/te.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2011-05-13 08:50+0000\n"
"Last-Translator: Praveen Illa <mail2ipn at gmail.com>\n"
"Language-Team: Telugu <te at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:59+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:58+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: te\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/th.po b/i18n/po/th.po
index 1ae9ec1..144fa8c 100644
--- a/i18n/po/th.po
+++ b/i18n/po/th.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2009-03-23 02:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Thai <th at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:59+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:58+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: th\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/tr.po b/i18n/po/tr.po
index 18c62a5..1faaaa7 100644
--- a/i18n/po/tr.po
+++ b/i18n/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2014-05-16 05:31+0000\n"
"Last-Translator: katpatuka <email at katpatuka.org>\n"
"Language-Team: Türkçe <>\n"
@@ -17,8 +17,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 04:59+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:59+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -454,15 +454,18 @@ msgstr "Diyalog paneli"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Diyalog panelini aç/kapa, haritayı genişlet"
-msgid "Distribute Nodes"
-msgstr "Noktaları Dağıt"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Noktaları düz bir çüzgi olarak dağıt"
msgid "Ignoring {0} nodes with null coordinates"
msgstr "{0} adet koordinatsız nokta ihmal ediliyor"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "OSM sitesinden indir..."
@@ -479,6 +482,9 @@ msgstr ""
msgid "Download data"
msgstr "Veriyi indir"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Nesneyi indir..."
@@ -982,6 +988,12 @@ msgstr "Pencereyi kapat ve indirmeyi iptal et"
msgid "Download Data"
msgstr "Veriyi İndir"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Tamam"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1749,6 +1761,28 @@ msgstr ""
msgid "Notes"
msgstr "Notlar"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1758,6 +1792,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "OSM indir"
@@ -2346,140 +2383,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>İpek Yolu</b> - herhangi anahtarda ''İpek'' ve ''Yolu''"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"İpek Yolu\"</b> - herhangi anahtarda ''İpek Yolu''"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:İp</b> - \"key\" anahtarında bir bölümünde ''İp''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:İp</b> - \"key\" anahtarında ''İp'' olmayan"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - ''key'' anahtarının tamamen ''value'' değerinde"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - ''key'' anahtarın herhangi değer. Üstelik de <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b> dene"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - anahtarın ''key'' herhangi değer"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>key?</b> - ''key'' anahtarıb ''yes'', ''true'', ''1'' veya ''on'' "
-"değerinde"
-
-msgid "Special targets"
-msgstr "Özel deyimler"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - üç tür nesneler (<b>node</b>, <b>way</b>, <b>relation</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - kullanıcı tarafından değiştirmiş nesneler"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-"<b>user:anonymous</b> - anonim kullanıcı tarafından değiştirmiş nesneler"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - ID’li olan nesne (yeni nesnelerin ID’si 0)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2519,6 +2422,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2534,12 +2443,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2576,7 +2479,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2588,6 +2496,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3927,7 +3838,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4577,6 +4488,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4635,6 +4549,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -6023,9 +5940,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr "Tamam"
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6894,8 +6808,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<farklı>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr ""
@@ -6912,6 +6836,12 @@ msgstr "Üyesi"
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr "<farklı>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -7042,6 +6972,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7770,18 +7710,21 @@ msgstr "Obje"
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7790,6 +7733,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8812,6 +8758,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10802,6 +10751,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11439,6 +11394,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14181,6 +14144,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14284,6 +14250,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14411,6 +14380,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -15033,11 +15005,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15354,6 +15321,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -16057,15 +16029,34 @@ msgstr ""
msgid "deciduous"
msgstr "yaprak düken orman"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "bahai"
@@ -17313,6 +17304,12 @@ msgstr "feribot hat"
msgid "Marina"
msgstr "Marina"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr "Kemer"
@@ -17711,6 +17708,12 @@ msgstr "Yıkama"
msgid "Car Dealer"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Repair"
msgstr "tamirci"
@@ -17723,12 +17726,6 @@ msgstr ""
msgid "Rental"
msgstr "araç kiralam"
-msgid "Second hand"
-msgstr ""
-
-msgid "only"
-msgstr ""
-
msgid "Sharing"
msgstr "Paylaşım Alanı"
@@ -17938,6 +17935,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr "Metro Girişi"
+
msgid "Station or amenities"
msgstr ""
@@ -17993,9 +17993,6 @@ msgstr ""
msgid "Building"
msgstr "Bina"
-msgid "Subway Entrance"
-msgstr "Metro Girişi"
-
msgid "Ticket Machine"
msgstr ""
@@ -18122,7 +18119,7 @@ msgstr "Stars"
msgid "Motel"
msgstr "Motel"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18767,9 +18764,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18943,6 +18937,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19690,9 +19696,6 @@ msgstr "DenizFeneri"
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22248,6 +22251,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22414,36 +22427,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "port listesini güncelle"
-
-msgid "Configure"
-msgstr "konfigüre"
-
-msgid "Connection Error."
-msgstr "Bağlantı Hatası."
-
-msgid "configure the connected DG100"
-msgstr "Bağlı DG100 ü ayarla"
-
-msgid "delete data after import"
-msgstr "verinin içeri alınmasından sonra sil"
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23562,6 +23545,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23616,6 +23605,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24225,6 +24242,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "konfigüre"
+
msgid "Configure conflation options"
msgstr ""
@@ -24539,9 +24559,24 @@ msgstr "Mesafe bu değerin altına düşerşe veri loglamayı kapat"
msgid "Unknown logFormat"
msgstr "Bilinmeyen logFormat"
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "port listesini güncelle"
+
msgid "Configure Device"
msgstr "Aracı Konfigüre et"
+msgid "Connection Error."
+msgstr "Bağlantı Hatası."
+
+msgid "configure the connected DG100"
+msgstr "Bağlı DG100 ü ayarla"
+
+msgid "delete data after import"
+msgstr "verinin içeri alınmasından sonra sil"
+
msgid "Importing data from device."
msgstr "Aletten veri alınıyor."
@@ -25592,6 +25627,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr "ölçülen değerler"
@@ -27698,6 +27736,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr "SeaMap düzenleyici"
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr "Canlı veriyi otomatik sakla"
diff --git a/i18n/po/ug.po b/i18n/po/ug.po
index f5bc79b..8241b3d 100644
--- a/i18n/po/ug.po
+++ b/i18n/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2012-07-14 16:22+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Uyghur <ug at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-04-01 05:00+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 04:59+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/uk.po b/i18n/po/uk.po
index 7540cc2..d78d257 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: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-03-30 02:14+0000\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-24 17:27+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: 2015-04-01 05:00+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 05:00+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: uk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -475,15 +475,21 @@ msgstr "Панель діалогів"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "Приховує панель діалогів, для збільшення площі для редагування"
-msgid "Distribute Nodes"
-msgstr "Розташувати точки"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Розташувати точки на рівних відстанях вздовж лінії"
msgid "Ignoring {0} nodes with null coordinates"
msgstr "Поігноровано {0} точок із нульовими координатами"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+"Будь ласка виділіть :\n"
+"* Одну лінію без самоперетину з не більше ніж двома її точками;\n"
+"* Три точки."
+
msgid "Download from OSM..."
msgstr "Завантажити з OSM…"
@@ -500,6 +506,9 @@ msgstr ""
msgid "Download data"
msgstr "Отримати дані"
+msgid "Download notes in current view"
+msgstr "Завантажити нотатки для поточного виду"
+
msgid "Download object..."
msgstr "Завантажити об’єкт…"
@@ -1048,6 +1057,12 @@ msgstr "Закрити діалог та скасувати завантажен
msgid "Download Data"
msgstr "Завантажити дані"
+msgid "Which tasks to perform?"
+msgstr "Які завдання виконувати?"
+
+msgid "Ok"
+msgstr "Так"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1877,6 +1892,30 @@ msgstr "Завантаження нотаток"
msgid "Notes"
msgstr "Нотатки"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] "{0} нотатка завантажена."
+msgstr[1] "{0} нотатки завантажені."
+msgstr[2] "{0} нотаток завантажено."
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+"Оскільки ліміт завантаження був {0}, можуть бути ще нотатки для завантаження."
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr "Запитайте меншу площу, щоб переконатися, що всі нотатки завантажено."
+
+msgid "More notes to download"
+msgstr "Є ще нотатки для завантаження"
+
+msgid "Download OSM Notes within Bounds"
+msgstr "Завантажити Нотатки ОСМ для виділеної ділянки"
+
+msgid "Download OSM Note by ID"
+msgstr "Завантажити Нотатку ОСМ за ID"
+
msgid "Download Compressed OSM Change"
msgstr "Завантаження стиснених змін OSM"
@@ -1886,6 +1925,9 @@ msgstr "Завантаження змін OSM"
msgid "Download Compressed OSM"
msgstr "Завантаження стиснених даних OSM"
+msgid "Download OSM object by ID"
+msgstr "Завантажити об’єкт OS"
+
msgid "Download OSM"
msgstr "Завантажити OSM"
@@ -2540,161 +2582,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Помилковий вираз для пошуку"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Baker Street</b> - ''Baker'' та ''Street'' у будь-якому ключі"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' у будь-якому ключі"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Bak</b> - ''Bak'' будь-де у ключі ''key''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Bak</b> - ''Bak'' ніде в ключі ''key''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - ключ ''key'' зі значенням ''value''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - ключ ''key'' з будь-яким значенням. Спробуйте також "
-"<b>*=value</b>, <b>key=</b>, <b>*=*</b>, <b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - ключ ''key'' з будь-яким значенням"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-"<b>key?</b> - ключ ''key'' із значенням ''yes'', ''true'', ''1'' чи ''on''"
-
-msgid "Special targets"
-msgstr "Спеціальні цілі"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>… - об’єкти, які відповідають типу (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>… - об’єкти, які змінив учасник"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - об’єкти змінені анонімними учасниками"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>… - об’єкти зі вказаним ID (0 для нових об’єктів)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>… - об’єкти зі вказаною версією (0 - об’єкти без версії)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>… - об’єкти із набору змін з вказаним ID (0 - об’єкти, які "
-"ще не відправлені на сервер)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>… - об’єкти з заданою кількістю точок (<b>nodes:</b>число, "
-"<b>nodes:</b>мін-макс, <b>nodes:</b>мін- або <b>nodes:</b>-макс)"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>… - об’єкти із вказаною кількістю теґів (<b>nodes:</b>число, "
-"<b>nodes:</b>мін-макс, <b>nodes:</b>мін- або <b>nodes:</b>-макс)"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>… - об’єкти із вказаною роллю в зв’язку"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>час - об’єкти з останнім часом змін (2009-11-12T14:51:09Z, "
-"2009-11-12 або T14:51 …)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr "<b>timestamp:</b>min/max - об’єкти що були змінені в цьому діапазоні"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - замкнені лінії в зазначеній ділянці м² "
-"(<b>areasize:</b>мін-макс або <b>areasize:</b>макс)"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> — усі змінені об’єкти"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> — усі виділені об’єкти"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> — всі неповні об’єкти"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> — всі об’єкти без теґів"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr "<b>closed</b> — усі замкнені лінії (точка не вважається замкненою)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>вираз</i></b> — усі нащадки об’єктів, що відповідають виразу"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>вираз</i></b> — усі батьки об’єктів, що відповідають виразу"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-"<b>(all)indownloadedarea</b> - об’єкти (та всі точки ліній/члени зв’язків) у "
-"завантаженій ділянці"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-"<b>(all)inview</b> - об’єкти (та всі точки ліній/члени зв’язків) у поточному "
-"виді"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-"Використовуйте <b>|</b> або <b>OR</b>, щоб об’єднати вирази логічним «або»"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Використовуйте <b>\"</b> для написання операторів (наприклад, якщо ключ "
-"містить <b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Всередині рядків в лапках, перед символами <b>\"</b> та <b>\\</b> треба "
-"ставити додатковий зворотній слеш (ось так: <b>\\\"</b> и <b>\\\\</b>)."
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Використовуйте <b>(</b> та <b>)</b> для групування виразів"
-
msgid "basic examples"
msgstr "основні приклади"
@@ -2734,6 +2621,15 @@ msgstr "збігається, якщо ''key'' існує"
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr "виконується, якщо ''key'' більше ''value'' (аналогічно, якщо менше)"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"для цитування операторів.<br>У рядках цитування <b>\"</b> та <b>\\</b> "
+"символи повинні бути екрановані за допомогою <b>\\</b> (прикл. <b>\\\"</b> "
+"та <b>\\\\</b>)."
+
msgid "combinators"
msgstr "комбінатори"
@@ -2749,15 +2645,6 @@ msgstr "логічне «Ні»"
msgid "use parenthesis to group expressions"
msgstr "використовуйте дужки для групування виразів"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"для цитування операторів.<br>У рядках цитування <b>\"</b> та <b>\\</b> "
-"символи повинні бути екрановані за допомогою <b>\\</b> (прикл. <b>\\\"</b> "
-"та <b>\\\\</b>)."
-
msgid "objects"
msgstr "об’єкти"
@@ -2794,8 +2681,16 @@ msgstr "об’єкти із часом останньої модифікаці
msgid "properties"
msgstr "властивості"
-msgid "objects with at least 20 nodes"
-msgstr "об’єкти з щонайменше 20-ма точками"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+"лінії як мінімум з 20 точок або зв’язки, що містять не менше 20 точок"
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
+"точки, що входять до 3 або більше лінії, або зв’язки, що містять не менше 3 "
+"ліній"
msgid "objects having 5 to 10 tags"
msgstr "об’єкти, що мають від 5 до 10 теґів"
@@ -2806,6 +2701,9 @@ msgstr "об’єкти із зазначеною роллю у зв’язку"
msgid "closed ways with an area of 100 m²"
msgstr "полігон площею 100 м²"
+msgid "ways with a length of 200 m or more"
+msgstr "лінії довжиною 200 м та більше"
+
msgid "state"
msgstr "стан"
@@ -4231,12 +4129,9 @@ msgid ""
"Multipolygon relation should be tagged with area tags and not the outer way"
msgid_plural ""
"Multipolygon relation should be tagged with area tags and not the outer ways"
-msgstr[0] ""
-"Зв’язок мультиполігону повинен мати теґ ділянки, а не зовнішньої лінії"
-msgstr[1] ""
-"Зв’язок мультиполігону повинен мати теґ ділянки, а не зовнішніх ліній"
-msgstr[2] ""
-"Зв’язок мультиполігону повинен мати теґ ділянки, а не зовнішніх ліній"
+msgstr[0] "Мультиполігон повинен мати теґ ділянки, замість зовнішньої лінії"
+msgstr[1] "Мультиполігон повинен мати теґ ділянки, замість зовнішніх лінії"
+msgstr[2] "Мультиполігон повинен мати теґ ділянки, замість зовнішніх лінії"
msgid ""
"With the currently used mappaint style the style for inner way equals the "
@@ -4256,7 +4151,7 @@ msgstr ""
"стилю полігона"
msgid "Area style on outer way"
-msgstr "Стиль ділянки на зовнішній лінії"
+msgstr "Стиль полігону на зовнішній лінії"
msgid "Multipolygon is not closed"
msgstr "Мультиполігон не замкнений"
@@ -4285,8 +4180,8 @@ msgstr ""
"еквівалентним деяким ''name:*'' і не є поєднанням атрибутів ''name:*'', "
"наприклад: Italia - Italien - Italy."
-msgid "A name:* translation is missing."
-msgstr "Переклад name:* відсутній."
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr "Немає name:*={0}. Додайте теґ з віповідним ключем мови."
msgid "A name is missing, even though name:* exists."
msgstr "Відсутній теґ «name», при наявності «name:*»"
@@ -4952,6 +4847,9 @@ msgstr "Показати версію JOSM та вийти"
msgid "Print debugging messages to console"
msgstr "Виводити повідомлення для відлагодження в консоль"
+msgid "Skip loading plugins"
+msgstr "Пропустити завантаження втулків"
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr "Відключення доступу до вказаних ресурсів, розділених комою"
@@ -5021,6 +4919,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr "Виводити інформацію для відлагодження в консолі"
+msgid "Plugin loading skipped"
+msgstr "Заватаження втулків пропущено"
+
msgid "Enabled detailed debug level (trace)"
msgstr "Ввімкнути докладний рівень відлагодження (trace)"
@@ -5144,7 +5045,7 @@ msgid "GPS"
msgstr "GPS"
msgid "Windows"
-msgstr "Вікна"
+msgstr "Панелі"
msgid "Menu: {0}"
msgstr "Меню: {0}"
@@ -6575,9 +6476,6 @@ msgstr "Шир/Дов"
msgid "East/North"
msgstr "Схід/Північ"
-msgid "Ok"
-msgstr "Так"
-
msgid "Please enter a GPS coordinates"
msgstr "Будь ласка, введіть координати GPS"
@@ -6738,7 +6636,7 @@ msgid "Customize the style"
msgstr "Налаштувати стиль"
msgid "List of notes"
-msgstr "Преік нотаток"
+msgstr "Прелік нотаток"
msgid "Add comment"
msgstr "Додати коментар"
@@ -7518,8 +7416,20 @@ msgstr "Застарілий теґ: foreground"
msgid "Discardable key: background"
msgstr "Застарілий теґ: background"
-msgid "<different>"
-msgstr "<різні>"
+msgid "{0} ''{1}''"
+msgstr "{0} ''{1}''"
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] "{0} різний"
+msgstr[1] "{0} різних"
+msgstr[2] "{0} різний"
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ", {0} не встановлений"
+msgstr[1] ", {0} е встановлено"
+msgstr[2] ", {0} не встановлено"
msgid "Select objects for which to change tags."
msgstr "Виділіть об’єкти для яких потрібно змінити теґи."
@@ -7536,6 +7446,12 @@ msgstr "Член групи"
msgid "Position"
msgstr "Розташування"
+msgid "<different>"
+msgstr "<різні>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr "Об’єкти: {2} / Теґи: {0} / Члени: {1}"
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "Теґи: {0} / Членство: {1}"
@@ -7672,6 +7588,17 @@ msgstr "Встановити кількість нещодавно додани
msgid "Remember last used tags after a restart"
msgstr "Запам’ятати останні теґи після перезавантаження"
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr "<code>Ctrl-1</code> – застосувати першу пропозицію"
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr "<code>Shift-Enter</code> – додати без закриття діалогу"
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+"<code>Shift-Ctrl-1</code> – додати першу пропозицію без закриття діалогу"
+
msgid "Please enter the number of recently added tags to display"
msgstr "Введіть, будь ласка, кількість нещодавно доданих теґів для показу"
@@ -8183,7 +8110,7 @@ msgid "Select to download GPS traces in the selected download area."
msgstr "Позначте, щоб завантажити з сервера GPS-треки для виділеної ділянки"
msgid "Select to download notes in the selected download area."
-msgstr "Оберіть для завантаження нотаток з виділеної ділянки."
+msgstr "Позначте для завантаження нотаток з виділеної ділянки."
msgid "Download as new layer"
msgstr "Завантажити як новий шар"
@@ -8480,18 +8407,21 @@ msgstr "Об’єкт"
msgid "not present"
msgstr "відсутній"
-msgid "Changeset:"
-msgstr "Набір змін:"
-
msgid "Changeset comment"
msgstr "Коментар набору змін"
msgid "Changeset source"
msgstr "Джерело даних набору змін"
+msgid "Imagery used"
+msgstr "Фон, що вкиористовувася"
+
msgid "<b>Source</b>:"
msgstr "<b>Джерело</b>:"
+msgid "<b>Imagery</b>:"
+msgstr "<b>Фон</b>:"
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -8503,6 +8433,9 @@ msgid ""
msgstr ""
"<html>Версію <strong>{0}</strong> створено у <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr "Набір змін"
+
msgid "Changeset info"
msgstr "Інформація набору змін"
@@ -9559,10 +9492,10 @@ msgid "Save Layer"
msgstr "Зберегти шар"
msgid "Note"
-msgstr "Примітка"
+msgstr "Нотатка"
msgid "Notes layer"
-msgstr "Шар Нотатки"
+msgstr "Нотатки"
msgid "Total notes:"
msgstr "Всього нотаток:"
@@ -9710,6 +9643,9 @@ msgstr "Масштаб пікселів {0}"
msgid "Best zoom: {0}"
msgstr "Найкращий масштаб: {0}"
+msgid "Cache stats: {0}"
+msgstr "Статистика кеша: {0}"
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "Шар TMS ({0}), завантажується в масштабі {1}"
@@ -11898,6 +11834,12 @@ msgstr "Додавати до вибору у slippymap: "
msgid "Tile cache directory: "
msgstr "Тека кешу квадратів мапи: "
+msgid "Maximum concurrent downloads: "
+msgstr "Максимальна кількість одночасних завантажень: "
+
+msgid "Maximum elements in disk cache: "
+msgstr "Максимальна кількість елементів у дісковому кеші "
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -12462,7 +12404,7 @@ msgid ""
msgstr ""
"JOSM завжди прослуховує <b>порт {0}</b> (http) та <b>порт {1}</b> (https) на "
"localhost.<br>Ці порти неможливо змінити, оскільки вони використовуються "
-"зовнішніми застосунками, які звертаються до JOSM."
+"зовнішніми застосунками,<br>які звертаються до JOSM."
msgid "Enable remote control"
msgstr "Включити Дистанційне керування"
@@ -12602,6 +12544,15 @@ msgstr "Періодично перевіряти наявність нових
msgid "Check interval (minutes):"
msgstr "Інтервал перевірки (хв.):"
+msgid "Max age for closed notes (days):"
+msgstr "Максимальний термін показу закритих ноататок (днів):"
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+"Задеє кількість днів до того, як закрита нотатка не буде завантажуватсь"
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr "Не вдалось отримати Мітку доступу OAuth з менеджера облікових даних"
@@ -15758,6 +15709,9 @@ msgstr "Geoimage.at MaxRes"
msgid "basemap.at"
msgstr "basemap.at"
+msgid "basemap.at Orthofoto"
+msgstr "basemap.at ортофото"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Грац: Базова мапа"
@@ -15861,6 +15815,9 @@ msgstr "Естонія кадастр (Maaamet)"
msgid "Estonia Forestry (Maaamet)"
msgstr "Естонія ліси (Maaamet)"
+msgid "BANO"
+msgstr "BANO"
+
msgid "Bordeaux - 2012"
msgstr "Бордо - 2012"
@@ -15989,6 +15946,9 @@ msgstr "NRW-Atlas: Топографічна мапа 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Агломерація Рур: Аерофотозйомка (10 см)"
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr "SN аерофотознімки, дорожня мережа, адміністративні кордоні"
+
msgid "Drone Imagery (Haiti)"
msgstr "Знімки дронів (Гаїті)"
@@ -16612,13 +16572,6 @@ msgid "Landsat 233055"
msgstr "Landsat 233055"
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-"Дозволяє редагувати інформацію про трафік та експортувати її в мобільний "
-"симулятор міста SUMO"
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -17028,6 +16981,13 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr "Редагування об’єктів OpenSeaMap"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Дозволяє редагувати інформацію про трафік та експортувати її в мобільний "
+"симулятор міста SUMO"
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Дозволяє додавати мітки/точки в поточній позиції GPS."
@@ -17756,15 +17716,38 @@ msgstr "Сезонність"
msgid "deciduous"
msgstr "листяний"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr "Рослини, що скидають листя на певний період впродовж року."
+
msgid "evergreen"
msgstr "вічнозелені"
+msgid "Plants that are never entirely without green foliage."
+msgstr "Рослині, які ніколи не лишаються зовсім без зеленого лисття."
+
msgid "semi_deciduous"
msgstr "напівлистяні"
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+"Рослини, які скидають лисття на короткий період, коли старі осипались, а "
+"нові починають відростати."
+
msgid "semi_evergreen"
msgstr "напіввічнозелені"
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+"Рослини, які скидають більшість, але не все, лисття на певний період "
+"впродовж року."
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr "Місцевість з вічнозеленими та листяними рослінами."
+
msgid "bahai"
msgstr "бахаі"
@@ -19035,6 +19018,12 @@ msgstr "Поромна переправа"
msgid "Marina"
msgstr "Пристань для яхт"
+msgid "Dump Station"
+msgstr "Станція асенізації"
+
+msgid "public"
+msgstr "загальнодоступне"
+
msgid "Pier"
msgstr "Пірс"
@@ -19435,6 +19424,12 @@ msgstr "Мийка"
msgid "Car Dealer"
msgstr "Автомобільний дилер"
+msgid "Second hand"
+msgstr "Вживані"
+
+msgid "only"
+msgstr "лише"
+
msgid "Repair"
msgstr "Автомайстерня"
@@ -19447,12 +19442,6 @@ msgstr "Шини"
msgid "Rental"
msgstr "Прокат"
-msgid "Second hand"
-msgstr "Вживані"
-
-msgid "only"
-msgstr "лише"
-
msgid "Sharing"
msgstr "Спільне користування"
@@ -19662,6 +19651,9 @@ msgstr "Місце зупинки"
msgid "Platform"
msgstr "Платформа"
+msgid "Subway Entrance"
+msgstr "Вхід в метро"
+
msgid "Station or amenities"
msgstr "Станція чи т.і."
@@ -19717,9 +19709,6 @@ msgstr "Станція"
msgid "Building"
msgstr "Будівля"
-msgid "Subway Entrance"
-msgstr "Вхід в метро"
-
msgid "Ticket Machine"
msgstr "Автомат продажу квитків"
@@ -19846,8 +19835,8 @@ msgstr "Зірки"
msgid "Motel"
msgstr "Мотель"
-msgid "Guest House/Bed & Breakfast"
-msgstr "Гостьовий будинок/Ліжко та Сніданок (BB)"
+msgid "Guest House/Bed & Breakfast"
+msgstr "Гістьовий будинок/Ліжко та Сніданок"
msgid "Chalet"
msgstr "Дача/Шале"
@@ -20491,9 +20480,6 @@ msgstr "Туалет/Вбиральня"
msgid "Access rights"
msgstr "Права доступу"
-msgid "public"
-msgstr "загальнодоступне"
-
msgid "seasonal"
msgstr "періодично"
@@ -20667,6 +20653,18 @@ msgstr "Урна для сміття"
msgid "Waste Disposal/Dumpster"
msgstr "Утилізація відходів/Контейнер для сміття"
+msgid "Sanitary Dump Station"
+msgstr "Станція асенізації"
+
+msgid "Suction pumpout"
+msgstr "Висмоктування"
+
+msgid "Gravity dump station"
+msgstr "Злив самопливом"
+
+msgid "Operation times"
+msgstr "Час роботи"
+
msgid "Backrest"
msgstr "Спинка"
@@ -21414,9 +21412,6 @@ msgstr "Маяк"
msgid "Street Lamp"
msgstr "Вуличний ліхтар"
-msgid "Operation times"
-msgstr "Час роботи"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "Пн-Пт 22:00-05:00"
@@ -23942,7 +23937,7 @@ msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} повинен бути точкою перетину {1} і {2}"
msgid "alternative name without {0}"
-msgstr "алтернативна назва без {0}"
+msgstr "альтернативна назва без {0}"
msgid "incomplete usage of {0} on a way without {1}"
msgstr "неповне використання {0} на лінії без {1}"
@@ -24011,6 +24006,18 @@ msgstr "Незрозумілий теґ {0}"
msgid "Definition of {0} is unclear"
msgstr "Визначення {0} є неточним"
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+"{0} не рекомендується. Скористайтесь пунктом «Змініти напрямок» з меню "
+"«Інструменти»."
+
+msgid "key with uncommon character"
+msgstr "Ключ з незвичайним символом"
+
+msgid "uncommon short key"
+msgstr "незвично короткий ключ"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} на точці. Слід застосовувати до лінії."
@@ -24051,7 +24058,7 @@ msgid "{0} must be connected to a way"
msgstr "{0} має бути приєднаним до лінії"
msgid "node connects waterway and bridge"
-msgstr "точка є спільною для мосту та водного путі"
+msgstr "точка є спільною для мосту та водного шляху"
msgid "abbreviated street name"
msgstr "скорочене позначення вулиці"
@@ -24126,7 +24133,7 @@ msgid "{0} must be a numeric value"
msgstr "{0} має бути числовим значенням"
msgid "{0} must be a positive integer number"
-msgstr "{0} має бути цілим додатнім числом"
+msgstr "{0} має бути цілим позитивним числом"
msgid "relation without type"
msgstr "зв’язок без типу"
@@ -24185,36 +24192,6 @@ msgstr "Показувати назви вулиць (на великих мас
msgid "Use alternative turn restriction icon set"
msgstr "Використовувати альтернативний набір значків"
-msgid "OSM Export"
-msgstr "Експорт OSM"
-
-msgid "Export traffic data to SUMO network file."
-msgstr "Експорт даних трафіку в файл мережі SUMO."
-
-msgid "SUMO Export"
-msgstr "Експорт SUMO"
-
-msgid "Export"
-msgstr "Експорт"
-
-msgid "Port:"
-msgstr "Порт:"
-
-msgid "refresh the port list"
-msgstr "оновити список портів"
-
-msgid "Configure"
-msgstr "Налаштувати"
-
-msgid "Connection Error."
-msgstr "Помилка підключення."
-
-msgid "configure the connected DG100"
-msgstr "налаштування підключеного DG100"
-
-msgid "delete data after import"
-msgstr "вилучити дані після імпорту"
-
msgid "Columbus V-900 CSV Files"
msgstr "Файли Columbus V-900 CSV"
@@ -25478,6 +25455,12 @@ msgstr "Як часто слід застосовувати розрідженн
msgid "Thinning Iterations"
msgstr "Ітерації розрідження"
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr "Використовувати відтінок і насиченість замість RGB відмінності"
+
+msgid "use HSV based algorithm"
+msgstr "використовувати алгоритм, заснований на HSV"
+
msgid "Street Name:"
msgstr "Вулиця:"
@@ -25532,6 +25515,37 @@ msgstr "Вкажіть на протилежний кут будівлі"
msgid "Set width of the building"
msgstr "Встановіть ширину будівлі"
+msgid "Merge address points"
+msgstr "Об’єднати адресні точки"
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+"Перенести теґи з адресних точок в середині будівель на контур будівлі"
+
+msgid "Select both address nodes and building ways to merge"
+msgstr "Для злиття виділіть адресні точки і контури будівель"
+
+msgid "No address nodes found in the selection"
+msgstr "Жодної адресної точки не виділено"
+
+msgid "No building ways found in the selection"
+msgstr "Жодного конутру будівлі не виділено"
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] "{0} будівля з кількома адресними точками в середині"
+msgstr[1] "{0} будівлі з кількома адресними точками в середині"
+msgstr[2] "{0} будівель з кількома адресними точками в середині"
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] "{0} будівля з конфліктом адрес"
+msgstr[1] "{0} будівлі з конфліктом адрес"
+msgstr[2] "{0} будівель з конфліктом адрес"
+
+msgid "No address nodes inside buildings found"
+msgstr "Немає адресних точок в середині будівель"
+
msgid "on polygon"
msgstr "у багатокутнику"
@@ -26208,6 +26222,9 @@ msgstr "Тільки основні ({0})"
msgid "Subject only ({0})"
msgstr "Тільки підлеглі ({0})"
+msgid "Configure"
+msgstr "Налаштувати"
+
msgid "Configure conflation options"
msgstr "Налаштування параметрів злиття"
@@ -26421,7 +26438,7 @@ msgid "Install"
msgstr "Встановити"
msgid "Public"
-msgstr "Загальнодоступне"
+msgstr "Загальний чат"
msgid "Could not get server response, check logs"
msgstr "Не вдалося отримати відповідь сервера, перевірте журнали"
@@ -26528,9 +26545,24 @@ msgstr "Відключити реєстрацію даних, якщо відс
msgid "Unknown logFormat"
msgstr "Невідомий формат реєстрації даних"
+msgid "Port:"
+msgstr "Порт:"
+
+msgid "refresh the port list"
+msgstr "оновити список портів"
+
msgid "Configure Device"
msgstr "Налаштування пристрою"
+msgid "Connection Error."
+msgstr "Помилка підключення."
+
+msgid "configure the connected DG100"
+msgstr "налаштування підключеного DG100"
+
+msgid "delete data after import"
+msgstr "вилучити дані після імпорту"
+
msgid "Importing data from device."
msgstr "Імпортувати дані з пристрою"
@@ -27641,6 +27673,9 @@ msgstr "Mapillary"
msgid "Create Mapillary layer."
msgstr "Створити шар Mapillary."
+msgid "Export"
+msgstr "Експорт"
+
msgid "Measured values"
msgstr "Результати вимірювання"
@@ -29386,7 +29421,7 @@ msgid "Find a relation"
msgstr "Знайти зв’язок"
msgid "Reconstruct polygon"
-msgstr "Перероблення мультиполігону"
+msgstr "Перетворити на плігон"
msgid "Multipolygon must consist only of ways"
msgstr "Мультиполігон повинен складатись лише з ліній"
@@ -29868,6 +29903,15 @@ msgstr "Поріг злиття найближчих точок"
msgid "SeaMap Editor"
msgstr "Редактор морських мап"
+msgid "OSM Export"
+msgstr "Експорт OSM"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Експорт даних трафіку в файл мережі SUMO."
+
+msgid "SUMO Export"
+msgstr "Експорт SUMO"
+
msgid "AutoSave LiveData"
msgstr "Автозбереження редагованих даних"
@@ -31904,3 +31948,6 @@ msgstr "Кермувати"
msgid "Drive a race car on this layer"
msgstr "Керуйте гоночним автомобілем на цьому шарі"
+
+#~ msgid "Note comment background"
+#~ msgstr "Фон коментаря нотатки"
diff --git a/i18n/po/ur.po b/i18n/po/ur.po
index f28cf6c..70d3606 100644
--- a/i18n/po/ur.po
+++ b/i18n/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2010-05-13 04:15+0000\n"
"Last-Translator: Shoaib Mirza <Unknown>\n"
"Language-Team: Urdu <ur at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-04-01 05:01+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 05:00+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: ur\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -444,15 +444,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr ""
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
@@ -467,6 +470,9 @@ msgstr ""
msgid "Download data"
msgstr ""
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -961,6 +967,12 @@ msgstr ""
msgid "Download Data"
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1705,6 +1717,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1714,6 +1748,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2296,134 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr ""
-
-msgid "<b>selected</b> - all selected objects"
-msgstr ""
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -2463,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2478,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2520,7 +2429,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2532,6 +2446,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3865,7 +3782,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4505,6 +4422,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4563,6 +4483,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5953,9 +5876,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr ""
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6824,9 +6744,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6842,6 +6772,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6972,6 +6908,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7698,18 +7644,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7718,6 +7667,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8740,6 +8692,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10704,6 +10659,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11341,6 +11302,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14069,6 +14038,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14172,6 +14144,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14299,6 +14274,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14921,11 +14899,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15242,6 +15215,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15945,15 +15923,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17201,6 +17198,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17599,22 +17602,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17826,6 +17829,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17881,9 +17887,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18010,7 +18013,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18655,9 +18658,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18831,6 +18831,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19578,9 +19590,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22136,6 +22145,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22302,36 +22321,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23450,6 +23439,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23504,6 +23499,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24113,6 +24136,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24427,9 +24453,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25468,6 +25509,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27572,6 +27616,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/vi.po b/i18n/po/vi.po
index d269292..f5e31ff 100644
--- a/i18n/po/vi.po
+++ b/i18n/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
"PO-Revision-Date: 2013-03-13 05:33+0000\n"
"Last-Translator: Minh Nguyễn <mxn at 1ec5.org>\n"
"Language-Team: Vietnamese <vi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-04-01 05:01+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 05:01+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: vi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -447,15 +447,18 @@ msgstr ""
msgid "Toggle dialogs panel, maximize mapview"
msgstr ""
-msgid "Distribute Nodes"
-msgstr "Phân bố các nốt"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Phân bố các nốt đã chọn theo một khoảng bằng nhau dọc theo 1 đường"
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Tải về từ OSM"
@@ -470,6 +473,9 @@ msgstr ""
msgid "Download data"
msgstr "Tải dữ liệu"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "Tải về đối tượng…"
@@ -962,6 +968,12 @@ msgstr "Đóng hộp thoại và hủy tiến trình tải"
msgid "Download Data"
msgstr "Tải dữ liệu"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "OK"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1716,6 +1728,28 @@ msgstr ""
msgid "Notes"
msgstr ""
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1725,6 +1759,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr ""
@@ -2309,135 +2346,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr ""
-
-msgid "Special targets"
-msgstr ""
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr ""
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - các đối tượng bị thay đổi"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>Chọn</b> - tất cả các đối tượng được chọn"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - các đối tượng chưa hoàn thành"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr "<b>child <i>expr</i></b> - các đối tượng con khớp biểu thức"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - các đối tượng cha của đối tượng khớp biểu thức"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Dung <b>|</b> hoặc <b>OR</b> để gộp các truy vấn logic hoặc"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Dùng <b>(</b> và <b>)</b> để gộp các biể thức"
-
msgid "basic examples"
msgstr ""
@@ -2477,6 +2385,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2492,12 +2406,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr ""
@@ -2534,7 +2442,12 @@ msgstr ""
msgid "properties"
msgstr ""
-msgid "objects with at least 20 nodes"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
msgid "objects having 5 to 10 tags"
@@ -2546,6 +2459,9 @@ msgstr ""
msgid "closed ways with an area of 100 m²"
msgstr ""
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr ""
@@ -3878,7 +3794,7 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
+msgid "Missing name:*={0}. Add tag with correct language key."
msgstr ""
msgid "A name is missing, even though name:* exists."
@@ -4515,6 +4431,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4573,6 +4492,9 @@ msgstr ""
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5963,9 +5885,6 @@ msgstr ""
msgid "East/North"
msgstr ""
-msgid "Ok"
-msgstr "OK"
-
msgid "Please enter a GPS coordinates"
msgstr ""
@@ -6834,9 +6753,19 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
+msgid "{0} ''{1}''"
msgstr ""
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Select objects for which to change tags."
msgstr ""
@@ -6852,6 +6781,12 @@ msgstr ""
msgid "Position"
msgstr ""
+msgid "<different>"
+msgstr ""
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
@@ -6982,6 +6917,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7708,18 +7653,21 @@ msgstr ""
msgid "not present"
msgstr ""
-msgid "Changeset:"
-msgstr ""
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr ""
@@ -7728,6 +7676,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -8760,6 +8711,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10724,6 +10678,12 @@ msgstr ""
msgid "Tile cache directory: "
msgstr ""
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11361,6 +11321,14 @@ msgstr ""
msgid "Check interval (minutes):"
msgstr ""
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -14093,6 +14061,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14196,6 +14167,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14323,6 +14297,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14945,11 +14922,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -15266,6 +15238,11 @@ msgstr ""
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
@@ -15969,15 +15946,34 @@ msgstr ""
msgid "deciduous"
msgstr ""
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr ""
@@ -17225,6 +17221,12 @@ msgstr ""
msgid "Marina"
msgstr ""
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
msgid "Pier"
msgstr ""
@@ -17623,22 +17625,22 @@ msgstr ""
msgid "Car Dealer"
msgstr ""
-msgid "Repair"
+msgid "Second hand"
msgstr ""
-msgid "Parts"
+msgid "only"
msgstr ""
-msgid "Tires"
+msgid "Repair"
msgstr ""
-msgid "Rental"
+msgid "Parts"
msgstr ""
-msgid "Second hand"
+msgid "Tires"
msgstr ""
-msgid "only"
+msgid "Rental"
msgstr ""
msgid "Sharing"
@@ -17850,6 +17852,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr ""
+
msgid "Station or amenities"
msgstr ""
@@ -17905,9 +17910,6 @@ msgstr ""
msgid "Building"
msgstr ""
-msgid "Subway Entrance"
-msgstr ""
-
msgid "Ticket Machine"
msgstr ""
@@ -18034,7 +18036,7 @@ msgstr ""
msgid "Motel"
msgstr ""
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18679,9 +18681,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr ""
-
msgid "seasonal"
msgstr ""
@@ -18855,6 +18854,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
msgid "Backrest"
msgstr ""
@@ -19602,9 +19613,6 @@ msgstr ""
msgid "Street Lamp"
msgstr ""
-msgid "Operation times"
-msgstr ""
-
msgid "Mo-Fr 22:00-05:00"
msgstr ""
@@ -22160,6 +22168,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22326,36 +22344,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -23474,6 +23462,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr ""
@@ -23528,6 +23522,34 @@ msgstr ""
msgid "Set width of the building"
msgstr ""
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr ""
@@ -24137,6 +24159,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr ""
+
msgid "Configure conflation options"
msgstr ""
@@ -24451,9 +24476,24 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
msgid "Configure Device"
msgstr ""
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Importing data from device."
msgstr ""
@@ -25492,6 +25532,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr ""
@@ -27596,6 +27639,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr ""
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr ""
diff --git a/i18n/po/zh_CN.po b/i18n/po/zh_CN.po
index e674627..5e767e6 100644
--- a/i18n/po/zh_CN.po
+++ b/i18n/po/zh_CN.po
@@ -10,16 +10,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-03-10 12:54+0000\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-21 04:28+0000\n"
"Last-Translator: rc1028 <q371320247 at live.com>\n"
"Language-Team: 汉语 <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-04-01 05:04+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 05:04+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: zh_CN\n"
msgid "yard"
@@ -449,15 +449,18 @@ msgstr "切换对话框面板"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "切换对话框面板，最大化到地图视图"
-msgid "Distribute Nodes"
-msgstr "散布节点"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "依一条直线将选定的节点等距离散布。"
msgid "Ignoring {0} nodes with null coordinates"
msgstr "忽略 {0} 个空坐标节点"
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "从 OSM 下载..."
@@ -472,6 +475,9 @@ msgstr "<html>这个动作会发出 {0} 个<br>个别的下载要求。您是否
msgid "Download data"
msgstr "下载数据"
+msgid "Download notes in current view"
+msgstr "在当前视图中下载地图注释"
+
msgid "Download object..."
msgstr "下载对象..."
@@ -969,6 +975,12 @@ msgstr "关闭对话框，并取消下载"
msgid "Download Data"
msgstr "下载数据"
+msgid "Which tasks to perform?"
+msgstr "执行哪项任务？"
+
+msgid "Ok"
+msgstr "确定"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1709,7 +1721,28 @@ msgid "Downloading Notes"
msgstr "下载说明"
msgid "Notes"
-msgstr "纸币"
+msgstr "注释"
+
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] "已下载{0}条注释。"
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr "由于下载限制为{0}，可能有更多注释需要下载。"
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr "请选择更小的区域以便所有注释均被下载。"
+
+msgid "More notes to download"
+msgstr "需下载更多注释"
+
+msgid "Download OSM Notes within Bounds"
+msgstr "下载边界内的OSM注释"
+
+msgid "Download OSM Note by ID"
+msgstr "根据ID下载注释"
msgid "Download Compressed OSM Change"
msgstr "下载压缩 OSM 修改"
@@ -1720,6 +1753,9 @@ msgstr "下载 OSM 修改"
msgid "Download Compressed OSM"
msgstr "下载压缩 OSM"
+msgid "Download OSM object by ID"
+msgstr "根据ID下载OSM对象"
+
msgid "Download OSM"
msgstr "下载 OSM"
@@ -2301,147 +2337,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "无效的搜索表达式"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Baker Street</b> - 任意键中的“Baker”和“Street”"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Baker Street\"</b> - 任意键中的“Baker Street”"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Bak</b> - “Bak”在键“key”中的任意地方"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Bak</b> - “Bak”不出现在键“key”中"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - 有确切值“value”的键“key”"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - 有任意值的键“key”。也试试<b>*=value</b>，<b>key=</b>，<b>*=*</b>，<b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - 设置为任意值的键“key”"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr "<b>key?</b> - 有值“yes”、“true”、“1”或“on”的键“key”"
-
-msgid "Special targets"
-msgstr "特殊目标"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - 对应类型的对象[<b>node</b>(节点), <b>way</b>(路径), "
-"<b>relation</b>(关系)]"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - 由用户更改的对象"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - 由匿名用户更改的对象"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - 有给定 ID 的对象(0 为新对象)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr "<b>version:</b>... - 有给定版本的对象(0 为没有分配版本的对象)"
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr "<b>changeset:</b>... - 有给定修改集合 ID 的对象(0 为没有一个已分配修改集合的对象)"
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-"<b>nodes:</b>... - 有给定节点数目的对象[<b>nodes:</b>count(指定数目)，<b>nodes:</b>min-"
-"max(指定范围)，<b>nodes:</b>min-(指定下限)或 <b>nodes:</b>-max(指定上限)]"
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-"<b>tags:</b>... - 有给定标签数目的对象[<b>tags:</b>count(指定数目)，<b>tags:</b>min-"
-"max(指定范围)，<b>tags:</b>min-(指定下限)或 <b>tags:</b>-max(指定上限)]"
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - 有给定关系角色的对象"
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-"<b>timestamp:</b>时间戳记 - 有给定最近修改时间戳记的对象(2009-11-12T14:51:09Z, 2009-11-12 或 "
-"T14:51 ...)"
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr "<b>timestamp:</b>最小/最大 - 有给定范围的最近修改时间戳记的对象"
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-"<b>areasize:</b>... - 有给定面积的封闭路径(以 m² 计)(<b>areasize:</b>min-max(指定范围)或 "
-"<b>areasize:</b>max(指定上限)]"
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - 所有修改过的对象"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - 所有选定的对象"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - 所有不完整的对象"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - 所有无标签的对象"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr "<b>closed</b> - 所有封闭的路径(节点不被视为封闭的)"
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr "<b>child <i>正则表达式</i></b> - 所有对象的子项符合正则表达式的"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr "<b>parent <i>正则表达式</i></b> - 所有对象父项符合正则表达式的"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr "<b>(all)indownloadedarea</b> - 在已下载区域中的对象(和其所有的路径节点/关系成员)"
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr "<b>(all)inview</b> - 在当前视图中的对象(和其所有的路径节点/关系成员)"
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "使用 <b>|</b> 或 <b>OR</b> 做逻辑或运算"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr "使用 <b>\"</b> 将运算子包起来(例如：当键值包含 <b>:</b>)"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"有引号的字串 <b>\"</b> 和 <b>\\</b> 字节需要在前头加上 <b>\\</b>(例如 <b>\\\" </b> 和 <b>\\\\"
-"</b>)。"
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "使用 <b>(</b> 和 <b>)</b> 将正则表达式群组起来"
-
msgid "basic examples"
msgstr "基本示例"
@@ -2481,6 +2376,14 @@ msgstr "如果存在键“key”则匹配"
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr "如果键“key”大于值“value”(小于类似)则匹配"
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+"以引用运算符。被引用的字符串内，<b>\"</b>和<b>\\</b>字符需要由一个前<b>\\</b>转义(例如<b>\\\"</b>和<b>\\\\"
+"</b>)。"
+
msgid "combinators"
msgstr "组合"
@@ -2496,14 +2399,6 @@ msgstr "逻辑非"
msgid "use parenthesis to group expressions"
msgstr "用括号把表达式分组"
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-"以引用运算符。被引用的字符串内，<b>\"</b>和<b>\\</b>字符需要由一个前<b>\\</b>转义(例如<b>\\\"</b>和<b>\\\\"
-"</b>)。"
-
msgid "objects"
msgstr "对象"
@@ -2540,8 +2435,13 @@ msgstr "有给定范围的最近修改时间戳记的对象"
msgid "properties"
msgstr "属性"
-msgid "objects with at least 20 nodes"
-msgstr "有至少 20 个节点的对象"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "有 5 到 10 个标签的对象"
@@ -2552,6 +2452,9 @@ msgstr "有给定关系中角色的对象"
msgid "closed ways with an area of 100 m²"
msgstr "面积为 100 平方米的封闭路径"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr "状态"
@@ -3874,8 +3777,8 @@ msgstr ""
"这个测试会检查多语系对象的 \"name\" 属性不会等同于某些 \"name:*\" 属性，并且也不是由 \"name:*\" "
"属性组成。例如：Italia - Italien - Italy。"
-msgid "A name:* translation is missing."
-msgstr "缺少 name:* 翻译。"
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "缺少 name，但还有 name:* 存在。"
@@ -4513,6 +4416,9 @@ msgstr "显示 JOSM 版本并退出"
msgid "Print debugging messages to console"
msgstr "打印调试信息至控制台"
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr "禁止访问特定资源，以逗号分隔"
@@ -4573,6 +4479,9 @@ msgstr "如果您使用 --selection，请确定已加载了一些数据。"
msgid "Printing debugging messages to console"
msgstr "打印调试信息至控制台"
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr "启用详细调试级别(跟踪)"
@@ -5982,9 +5891,6 @@ msgstr "纬度/经度"
msgid "East/North"
msgstr "东移/北移"
-msgid "Ok"
-msgstr "确定"
-
msgid "Please enter a GPS coordinates"
msgstr "请输入 GPS 坐标"
@@ -6860,8 +6766,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<不同>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr "请选择要更改标签的对象。"
@@ -6878,6 +6794,12 @@ msgstr "成员"
msgid "Position"
msgstr "位置"
+msgid "<different>"
+msgstr "<不同>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr ""
+
msgid "Tags: {0} / Memberships: {1}"
msgstr "标签: {0} / 所在关系: {1}"
@@ -7004,6 +6926,16 @@ msgstr "设置最近添加的标签数"
msgid "Remember last used tags after a restart"
msgstr "重启后仍记住最近使用的标签"
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr "请输入应显示多少最近的新标签"
@@ -7742,18 +7674,21 @@ msgstr "对象"
msgid "not present"
msgstr "不存在"
-msgid "Changeset:"
-msgstr "修改集合："
-
msgid "Changeset comment"
msgstr "修改集注释"
msgid "Changeset source"
msgstr "修改集数据源"
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr "<b>来源</b>："
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr "<html>版本 <strong>{0}</strong> 目前在图层“{1}”中编辑</html>"
@@ -7762,6 +7697,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr "<html>版本 <strong>{0}</strong> 建立于 <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "修改集合信息"
@@ -8800,6 +8738,9 @@ msgstr "像素缩放等级：{0}"
msgid "Best zoom: {0}"
msgstr "最佳缩放等级：{0}"
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr "TMS图层({0})，以缩放等级{1}下载"
@@ -10809,6 +10750,12 @@ msgstr "添加到快速地图选择器： "
msgid "Tile cache directory: "
msgstr "瓦片缓存目录： "
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11463,6 +11410,14 @@ msgstr "定期检查新消息"
msgid "Check interval (minutes):"
msgstr "检查间隔（分钟）："
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr "无法从信任证管理器获取OAuth访问令牌"
@@ -14204,6 +14159,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14307,6 +14265,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14434,6 +14395,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -15056,11 +15020,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr "以单一对话框进行群组通用地址填写的输入，同时也可以选择自动从路径产生个别门牌号码节点。"
@@ -15379,6 +15338,11 @@ msgstr "由移除属于很钝的钝角的节点来简化区域。这可以使用
msgid "Edit features for OpenSeaMap"
msgstr "OpenSeaMap 的编辑功能"
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "允许在目前的 gps 位置添加标记/节点。"
@@ -16079,15 +16043,34 @@ msgstr ""
msgid "deciduous"
msgstr "落叶类"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "巴海大同教"
@@ -17335,6 +17318,12 @@ msgstr "渡轮路线"
msgid "Marina"
msgstr "码头"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "公共"
+
msgid "Pier"
msgstr "渡头"
@@ -17733,6 +17722,12 @@ msgstr "洗车"
msgid "Car Dealer"
msgstr "汽车经销商"
+msgid "Second hand"
+msgstr "二手"
+
+msgid "only"
+msgstr "只有"
+
msgid "Repair"
msgstr "修车场"
@@ -17745,12 +17740,6 @@ msgstr ""
msgid "Rental"
msgstr "租车"
-msgid "Second hand"
-msgstr "二手"
-
-msgid "only"
-msgstr "只有"
-
msgid "Sharing"
msgstr "共享"
@@ -17960,6 +17949,9 @@ msgstr ""
msgid "Platform"
msgstr "站台"
+msgid "Subway Entrance"
+msgstr "地铁入口"
+
msgid "Station or amenities"
msgstr ""
@@ -18015,9 +18007,6 @@ msgstr "车站"
msgid "Building"
msgstr "建筑物"
-msgid "Subway Entrance"
-msgstr "地铁入口"
-
msgid "Ticket Machine"
msgstr "自动售票机"
@@ -18144,7 +18133,7 @@ msgstr "星级"
msgid "Motel"
msgstr "汽车旅馆"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18789,9 +18778,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr "公共"
-
msgid "seasonal"
msgstr ""
@@ -18965,6 +18951,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr "工作时间"
+
msgid "Backrest"
msgstr "靠背"
@@ -19712,9 +19710,6 @@ msgstr "灯塔"
msgid "Street Lamp"
msgstr "路灯"
-msgid "Operation times"
-msgstr "工作时间"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "周一-周五 22：00-05：00"
@@ -22270,6 +22265,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22436,36 +22441,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr "导出"
-
-msgid "Port:"
-msgstr "端口："
-
-msgid "refresh the port list"
-msgstr "重新整理端口列表"
-
-msgid "Configure"
-msgstr "设定"
-
-msgid "Connection Error."
-msgstr "连接错误。"
-
-msgid "configure the connected DG100"
-msgstr "设定连接的 DG100"
-
-msgid "delete data after import"
-msgstr "输入后删除数据"
-
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV 文件"
@@ -23662,6 +23637,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "街道名称："
@@ -23716,6 +23697,34 @@ msgstr "点击建筑物的另一端"
msgid "Set width of the building"
msgstr "设置建筑物的宽度"
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr "在多边形上"
@@ -24354,6 +24363,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "设定"
+
msgid "Configure conflation options"
msgstr ""
@@ -24672,9 +24684,24 @@ msgstr "停用数据记录距离"
msgid "Unknown logFormat"
msgstr "不明的记录格式"
+msgid "Port:"
+msgstr "端口："
+
+msgid "refresh the port list"
+msgstr "重新整理端口列表"
+
msgid "Configure Device"
msgstr "设定装置"
+msgid "Connection Error."
+msgstr "连接错误。"
+
+msgid "configure the connected DG100"
+msgstr "设定连接的 DG100"
+
+msgid "delete data after import"
+msgstr "输入后删除数据"
+
msgid "Importing data from device."
msgstr "从装置输入数据"
@@ -25726,6 +25753,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr "导出"
+
msgid "Measured values"
msgstr "测量的数值"
@@ -27829,6 +27859,15 @@ msgstr "合并阈值附近的节点"
msgid "SeaMap Editor"
msgstr "海标编辑器"
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr "自动保存即时数据"
diff --git a/i18n/po/zh_TW.po b/i18n/po/zh_TW.po
index efb842b..945c3e6 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: 2015-04-01 03:33+0200\n"
-"PO-Revision-Date: 2015-01-30 10:41+0000\n"
-"Last-Translator: yellowsoar <Unknown>\n"
+"POT-Creation-Date: 2015-04-27 03:33+0200\n"
+"PO-Revision-Date: 2015-04-23 04:35+0000\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau at yahoo.com.tw>\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: 2015-04-01 05:04+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
+"X-Launchpad-Export-Date: 2015-04-27 05:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
"Language: zh_TW\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -445,15 +445,18 @@ msgstr "切換對話盒面板"
msgid "Toggle dialogs panel, maximize mapview"
msgstr "切換對話盒面板，最大化地圖檢視"
-msgid "Distribute Nodes"
-msgstr "散佈節點"
-
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "依一條直線將選取的節點等距離散佈。"
msgid "Ignoring {0} nodes with null coordinates"
msgstr ""
+msgid ""
+"Please select :\n"
+"* One no self-crossing way with at most two of its nodes;\n"
+"* Three nodes."
+msgstr ""
+
msgid "Download from OSM..."
msgstr "從 OSM 下載"
@@ -468,6 +471,9 @@ msgstr "<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否
msgid "Download data"
msgstr "下載資料"
+msgid "Download notes in current view"
+msgstr ""
+
msgid "Download object..."
msgstr "下載物件..."
@@ -962,6 +968,12 @@ msgstr "關閉對話盒並取消下載"
msgid "Download Data"
msgstr "下載資料"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "確定"
+
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1171,7 +1183,7 @@ msgid "Save the current data to a new file."
msgstr "將目前的資料儲存為新的檔案。"
msgid "Search Notes..."
-msgstr ""
+msgstr "搜尋筆記…"
msgid "Download notes from the note search API"
msgstr ""
@@ -1180,7 +1192,7 @@ msgid "Search the OSM API for notes containing words:"
msgstr ""
msgid "Search for notes"
-msgstr ""
+msgstr "搜尋筆記"
msgid "You must enter a search term"
msgstr ""
@@ -1706,6 +1718,28 @@ msgstr ""
msgid "Notes"
msgstr "備註"
+msgid "{0} note has been downloaded."
+msgid_plural "{0} notes have been downloaded."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Since the download limit was {0}, there might be more notes to download."
+msgstr ""
+
+msgid ""
+"Request a smaller area to make sure that all notes are being downloaded."
+msgstr ""
+
+msgid "More notes to download"
+msgstr ""
+
+msgid "Download OSM Notes within Bounds"
+msgstr ""
+
+msgid "Download OSM Note by ID"
+msgstr ""
+
msgid "Download Compressed OSM Change"
msgstr ""
@@ -1715,6 +1749,9 @@ msgstr ""
msgid "Download Compressed OSM"
msgstr ""
+msgid "Download OSM object by ID"
+msgstr ""
+
msgid "Download OSM"
msgstr "下載 OSM"
@@ -1939,7 +1976,7 @@ msgid "Switch angle snapping mode while drawing"
msgstr "繪製時切換角度貼齊模式"
msgid "Dual alignment"
-msgstr ""
+msgstr "雙向對齊"
msgid "Switch dual alignment mode while extruding"
msgstr ""
@@ -1960,7 +1997,7 @@ msgid ""
msgstr ""
msgid "Dual alignment active."
-msgstr ""
+msgstr "雙向對齊已生效。"
msgid "Segment collapsed due to its direction reversing."
msgstr ""
@@ -2296,139 +2333,6 @@ msgstr ""
msgid "Invalid search expression"
msgstr "無效的搜尋表示式"
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b>Baker Street</b> - 在任何設定鍵中有 ''Baker'' 和 ''Street''"
-
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Baker Street\"</b> - 在任何設定鍵中有 ''Baker Street''"
-
-msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Bak</b> - 在設定鍵 ''key'' 中有 ''Bak''"
-
-msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Bak</b> - 只要設定鍵 ''key'' 中有 ''Bak''"
-
-msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>key=value</b> - 設定鍵 ''key'' 中只含有數值 ''value''"
-
-msgid ""
-"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
-"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>key=*</b> - 設定鍵 ''key'' 含有任何數值。也可以試試 "
-"<b>*=value</b>、<b>key=</b>、<b>*=*</b>、<b>*=</b>"
-
-msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - 設定鍵 ''key'' 設為任何數值"
-
-msgid ""
-"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr "<b>key?</b> - 設定鍵 ''key'' 的數值為 ''yes''、''true''、''1'' 或 ''on''"
-
-msgid "Special targets"
-msgstr "特殊目標"
-
-msgid ""
-"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
-"<b>relation</b>)"
-msgstr ""
-"<b>type:</b>... - 物件的對應類型為 (<b>node</b>, <b>way</b>, <b>relation</b>)"
-
-msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - 由使用者改變的物件"
-
-msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - 由匿名使用者改變的物件"
-
-msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - 物件具有指定的 ID (0 指新的物件)"
-
-msgid ""
-"<b>version:</b>... - objects with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-
-msgid ""
-"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
-"assigned changeset)"
-msgstr ""
-
-msgid ""
-"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
-msgstr ""
-
-msgid ""
-"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
-"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
-msgstr ""
-
-msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
-"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
-msgstr ""
-
-msgid ""
-"<b>timestamp:</b>min/max - objects with last modification within range"
-msgstr ""
-
-msgid ""
-"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
-"max or <b>areasize:</b>max)"
-msgstr ""
-
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>修改過</b> - 所有改變過的物件"
-
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>選取的</b> - 所有選取的物件"
-
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>不完整</b> - 所有不完整的物件"
-
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>未標籤的</b> - 所有未標籤的物件"
-
-msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
-msgstr ""
-
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr "<b>child <i>expr</i></b> - 所有物件的子項符合正規表示式的"
-
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr "<b>parent <i>expr</i></b> - 所有物件父項符合正規表示式的"
-
-msgid ""
-"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
-"members) in downloaded area"
-msgstr ""
-
-msgid ""
-"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
-"current view"
-msgstr ""
-
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "使用 <b>|</b> 或 <b>OR</b> 做邏輯或運算"
-
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr "使用 <b>\"</b> 將運算子包起來（例如當鍵值包含 <b>:</b>）"
-
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"有引號的字串 <b>\"</b> 和 <b>\\</b> 字元需要在前頭加上 <b>\\</b> (例如 <b>\\\"</b> 和 <b>\\\\"
-"</b>)。"
-
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "使用 <b>(</b> 和 <b>)</b> 將正規表示式群組起來"
-
msgid "basic examples"
msgstr "基本範例"
@@ -2468,6 +2372,12 @@ msgstr ""
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
+msgid ""
+"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
+"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
+"<b>\\\\</b>)."
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2483,12 +2393,6 @@ msgstr ""
msgid "use parenthesis to group expressions"
msgstr ""
-msgid ""
-"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
-"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
-"<b>\\\\</b>)."
-msgstr ""
-
msgid "objects"
msgstr "物件"
@@ -2525,8 +2429,13 @@ msgstr ""
msgid "properties"
msgstr "屬性"
-msgid "objects with at least 20 nodes"
-msgstr "至少有 20 個節點的物件"
+msgid ""
+"ways with at least 20 nodes, or relations containing at least 20 nodes"
+msgstr ""
+
+msgid ""
+"nodes with at least 3 referring ways, or relations containing at least 3 ways"
+msgstr ""
msgid "objects having 5 to 10 tags"
msgstr "具有 5 到 10 個標籤的物件"
@@ -2537,6 +2446,9 @@ msgstr "具有指定關係中角色的物件"
msgid "closed ways with an area of 100 m²"
msgstr "區域面積為 100 m² 的封閉路徑"
+msgid "ways with a length of 200 m or more"
+msgstr ""
+
msgid "state"
msgstr "狀態"
@@ -3572,10 +3484,10 @@ msgid "House number too far from street"
msgstr ""
msgid "API Capabilities"
-msgstr ""
+msgstr "API 能力"
msgid "Checks for errors against API capabilities"
-msgstr ""
+msgstr "檢查違反 API 能力的錯誤"
msgid ""
"Way contains more than {0} nodes. It should be replaced by a multipolygon"
@@ -3585,10 +3497,10 @@ msgid "Way contains more than {0} nodes. It should be split or simplified"
msgstr ""
msgid "Barriers and entrances"
-msgstr ""
+msgstr "障礙物與入口"
msgid "Checks for errors in barriers and entrances."
-msgstr ""
+msgstr "檢查障礙物與入口的錯誤"
msgid "Barrier entrance not set on a barrier"
msgstr ""
@@ -3630,19 +3542,19 @@ msgid "Crossing ways"
msgstr "路徑交叉"
msgid "Crossing buildings"
-msgstr ""
+msgstr "跨越建築物"
msgid "Crossing waterways"
-msgstr ""
+msgstr "跨越水路"
msgid "Crossing waterway/highway"
msgstr "跨越水路/公路"
msgid "Crossing boundaries"
-msgstr ""
+msgstr "跨越邊界"
msgid "Crossing barriers"
-msgstr ""
+msgstr "跨越障礙物"
msgid ""
"This test checks if two roads, railways, waterways or buildings crosses in "
@@ -3865,8 +3777,8 @@ msgid ""
"e.g., Italia - Italien - Italy."
msgstr ""
-msgid "A name:* translation is missing."
-msgstr "缺少 name:* 翻譯。"
+msgid "Missing name:*={0}. Add tag with correct language key."
+msgstr ""
msgid "A name is missing, even though name:* exists."
msgstr "缺少 name，雖然還有 name:* 存在。"
@@ -4213,19 +4125,19 @@ msgid "area"
msgstr "區域"
msgid "Unconnected highways"
-msgstr ""
+msgstr "未連接的公路"
msgid "Unconnected railways"
-msgstr ""
+msgstr "未連接的鐵路"
msgid "Unconnected waterways"
-msgstr ""
+msgstr "未連接的水路"
msgid "Unconnected natural lands and landuses"
-msgstr ""
+msgstr "未連接的自然地與土地利用"
msgid "Unconnected power ways"
-msgstr ""
+msgstr "未連接的電力線"
msgid "This test checks if a way has an endpoint very near to another way."
msgstr "這個測試會檢查路徑的結束點是否非常靠近其他的路徑。"
@@ -4504,6 +4416,9 @@ msgstr ""
msgid "Print debugging messages to console"
msgstr ""
+msgid "Skip loading plugins"
+msgstr ""
+
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4564,6 +4479,9 @@ msgstr "如果您使用 --selection 請確定已載入某些資料。"
msgid "Printing debugging messages to console"
msgstr ""
+msgid "Plugin loading skipped"
+msgstr ""
+
msgid "Enabled detailed debug level (trace)"
msgstr ""
@@ -5952,9 +5870,6 @@ msgstr "緯/經"
msgid "East/North"
msgstr "東/北"
-msgid "Ok"
-msgstr "確定"
-
msgid "Please enter a GPS coordinates"
msgstr "請輸入 GPS 坐標"
@@ -6825,8 +6740,18 @@ msgstr ""
msgid "Discardable key: background"
msgstr ""
-msgid "<different>"
-msgstr "<不同>"
+msgid "{0} ''{1}''"
+msgstr ""
+
+msgid "{0} different"
+msgid_plural "{0} different"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ", {0} unset"
+msgid_plural ", {0} unset"
+msgstr[0] ""
+msgstr[1] ""
msgid "Select objects for which to change tags."
msgstr "選擇要改變標籤的物件。"
@@ -6843,8 +6768,14 @@ msgstr "成員"
msgid "Position"
msgstr "位置"
+msgid "<different>"
+msgstr "<不同>"
+
+msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
+msgstr "物件: {2} / 標籤: {0} / 成員: {1}"
+
msgid "Tags: {0} / Memberships: {1}"
-msgstr ""
+msgstr "標籤: {0} / 成員: {1}"
msgid "Tags / Memberships"
msgstr ""
@@ -6969,6 +6900,16 @@ msgstr ""
msgid "Remember last used tags after a restart"
msgstr ""
+msgid "<code>Ctrl-1</code> to apply first suggestion"
+msgstr ""
+
+msgid "<code>Shift-Enter</code> to add without closing the dialog"
+msgstr ""
+
+msgid ""
+"<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog"
+msgstr ""
+
msgid "Please enter the number of recently added tags to display"
msgstr ""
@@ -7700,18 +7641,21 @@ msgstr "物件"
msgid "not present"
msgstr "未顯現"
-msgid "Changeset:"
-msgstr "變更組合："
-
msgid "Changeset comment"
msgstr ""
msgid "Changeset source"
msgstr ""
+msgid "Imagery used"
+msgstr ""
+
msgid "<b>Source</b>:"
msgstr ""
+msgid "<b>Imagery</b>:"
+msgstr ""
+
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
msgstr "<html>版本 <strong>{0}</strong> 目前在圖層「{1}」中編輯</html>"
@@ -7720,6 +7664,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr "<html>版本 <strong>{0}</strong> 建立於 <strong>{1}</strong></html>"
+msgid "Changeset"
+msgstr ""
+
msgid "Changeset info"
msgstr "變更組合資訊"
@@ -8747,6 +8694,9 @@ msgstr ""
msgid "Best zoom: {0}"
msgstr ""
+msgid "Cache stats: {0}"
+msgstr ""
+
msgid "TMS layer ({0}), downloading in zoom {1}"
msgstr ""
@@ -10321,10 +10271,10 @@ msgid "Options that affect drawing performance"
msgstr "影響繪製效率的選項"
msgid "Segment drawing options"
-msgstr ""
+msgstr "區段繪製選項"
msgid "Select and draw mode options"
-msgstr ""
+msgstr "選擇與繪製模式選項"
msgid "Other options"
msgstr "其他選項"
@@ -10526,10 +10476,10 @@ msgid "Dynamic buttons in side menus"
msgstr "側邊選單中動態按鈕"
msgid "Display ISO dates"
-msgstr ""
+msgstr "顯示 ISO 日期"
msgid "Use native file choosers (nicer, but do not support file filters)"
-msgstr ""
+msgstr "使用原生檔案選擇器 (較佳，但不支援檔案過濾)"
msgid "Show localized name in selection lists, if available"
msgstr "如果可以，在選擇清單中顯示本地化的名稱"
@@ -10743,6 +10693,12 @@ msgstr "加入快速地圖選擇器： "
msgid "Tile cache directory: "
msgstr "拼貼快取目錄： "
+msgid "Maximum concurrent downloads: "
+msgstr ""
+
+msgid "Maximum elements in disk cache: "
+msgstr ""
+
msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
@@ -11396,6 +11352,14 @@ msgstr "定期檢查新訊息"
msgid "Check interval (minutes):"
msgstr "檢查間隔 (分鐘):"
+msgid "Max age for closed notes (days):"
+msgstr ""
+
+msgid ""
+"Specifies the number of days a note needs to be closed to no longer be "
+"downloaded"
+msgstr ""
+
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
@@ -11629,7 +11593,7 @@ msgid "Wikipedia"
msgstr "維基百科"
msgid "Checks for wrong wikipedia tags"
-msgstr ""
+msgstr "檢查錯誤的維基百科標籤"
msgid "Tag checker rules"
msgstr "標籤檢查器規則"
@@ -11699,7 +11663,7 @@ msgid "Elements of type {0} are supported."
msgstr "類型 {0} 的元件已支援。"
msgid "Edit also …"
-msgstr ""
+msgstr "同時編輯…"
msgid "Apply Preset"
msgstr "套用預設組合"
@@ -11817,7 +11781,7 @@ msgid "Search presets"
msgstr "搜尋預設組合"
msgid "Search for objects by preset"
-msgstr ""
+msgstr "依預設組合搜尋物件"
msgid "Show only applicable to selection"
msgstr "只顯示適合選擇區域"
@@ -14025,13 +13989,13 @@ msgid "Landsat"
msgstr ""
msgid "Bing aerial imagery"
-msgstr ""
+msgstr "Bing 航空圖片"
msgid "HDM (Humanitarian OpenStreetMap Team)"
msgstr ""
msgid "Mapbox Satellite"
-msgstr ""
+msgstr "Mapbox 衛星圖"
msgid "MapQuest Open Aerial"
msgstr ""
@@ -14061,7 +14025,7 @@ msgid "MapQuest OSM"
msgstr ""
msgid "Public Transport (ÖPNV)"
-msgstr ""
+msgstr "大眾運輸 (ÖPNV)"
msgid "OpenStreetMap (German Style)"
msgstr ""
@@ -14138,6 +14102,9 @@ msgstr ""
msgid "basemap.at"
msgstr ""
+msgid "basemap.at Orthofoto"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14241,6 +14208,9 @@ msgstr ""
msgid "Estonia Forestry (Maaamet)"
msgstr ""
+msgid "BANO"
+msgstr ""
+
msgid "Bordeaux - 2012"
msgstr ""
@@ -14368,6 +14338,9 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid "SN Luftbilder, Straßennetz, Administrative Grenzen"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
@@ -14990,11 +14963,6 @@ msgid "Landsat 233055"
msgstr ""
msgid ""
-"Allows to edit traffic information and export it to the urban mobility "
-"simulator SUMO"
-msgstr ""
-
-msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr "以單一對話盒進行群組通用地址填寫的輸入，同時也可以選擇自動從路徑產生個別門牌號碼節點。"
@@ -15313,13 +15281,18 @@ msgstr "藉由移除屬於很鈍的鈍角的節點來簡化區域。這可以使
msgid "Edit features for OpenSeaMap"
msgstr ""
+msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
msgid "Allow adding markers/nodes on current gps positions."
msgstr "允許在目前的 gps 位置加入標記/節點。"
msgid ""
"Launch browser to a Web resource about a selected object having known tags, "
"such as Wikipedia"
-msgstr ""
+msgstr "執行瀏覽器開啟關於選擇物件所具標籤的網路資源，像是維基百科等"
msgid "Provides a dialog for editing tags in a tabular grid."
msgstr "提供在表格線中編輯標籤的對話盒。"
@@ -15387,7 +15360,7 @@ msgid "Select a sequence of non-branching connected ways"
msgstr "選擇非分支連接的路徑次序"
msgid "Simplifies linking OSM objects to Wikipedia articles"
-msgstr ""
+msgstr "簡化連結 OSM 物件至維基百科文章"
msgid ""
"Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -15446,7 +15419,7 @@ msgid "sett"
msgstr ""
msgid "Smoothness"
-msgstr ""
+msgstr "平滑度"
msgid "excellent"
msgstr ""
@@ -15522,7 +15495,7 @@ msgid "fine_gravel"
msgstr ""
msgid "mud"
-msgstr ""
+msgstr "泥地"
msgid "Lanes"
msgstr "車道數"
@@ -15808,7 +15781,7 @@ msgstr ""
msgctxt "sport"
msgid "climbing"
-msgstr ""
+msgstr "攀岩"
msgctxt "sport"
msgid "cricket"
@@ -16016,15 +15989,34 @@ msgstr ""
msgid "deciduous"
msgstr "落葉類"
+msgid "Plants that are leafless for a certain period during the year."
+msgstr ""
+
msgid "evergreen"
msgstr ""
+msgid "Plants that are never entirely without green foliage."
+msgstr ""
+
msgid "semi_deciduous"
msgstr ""
+msgid ""
+"Plants that lose their foliage for a very short period, when old leaves fall "
+"off and new foliage growth is starting."
+msgstr ""
+
msgid "semi_evergreen"
msgstr ""
+msgid ""
+"Plants that lose most, but not all, of their foliage for a fraction of the "
+"year."
+msgstr ""
+
+msgid "Habitat with evergreen and deciduous vegetation."
+msgstr ""
+
msgid "bahai"
msgstr "巴海大同教"
@@ -16351,7 +16343,7 @@ msgid "Parking Aisle"
msgstr "停車場通道"
msgid "Escape"
-msgstr ""
+msgstr "逃生通道"
msgid ""
"Emergency lane beside long descending slopes for trucks and other vehicles "
@@ -16653,7 +16645,7 @@ msgid "Dedicated Bridleway"
msgstr "專用馬道"
msgid "Cycle Lane/Track"
-msgstr ""
+msgstr "自行車道/車道"
msgid "Cycleway"
msgstr ""
@@ -16839,7 +16831,7 @@ msgid "Give Way"
msgstr ""
msgid "Mini-Roundabout"
-msgstr ""
+msgstr "小圓環"
msgid "clockwise"
msgstr "順時針"
@@ -16893,7 +16885,7 @@ msgid "Speed Camera"
msgstr "測速照相"
msgid "Traffic Mirror"
-msgstr ""
+msgstr "交通鏡"
msgctxt "junction=yes"
msgid "Named Junction"
@@ -16905,7 +16897,7 @@ msgid ""
msgstr ""
msgid "Elevator"
-msgstr ""
+msgstr "電梯"
msgid "Grit Bin"
msgstr "沙箱"
@@ -17043,7 +17035,7 @@ msgid "Kissing Gate"
msgstr ""
msgid "Chain"
-msgstr ""
+msgstr "鎖鏈"
msgid "Stile"
msgstr "柵欄台階"
@@ -17064,7 +17056,7 @@ msgid "Sally Port"
msgstr "城門"
msgid "Passageways"
-msgstr ""
+msgstr "通道"
msgid "Building Passage"
msgstr ""
@@ -17205,10 +17197,10 @@ msgid "mangrove"
msgstr "紅樹林"
msgid "Mud"
-msgstr ""
+msgstr "泥地"
msgid "Large area covered with mud."
-msgstr ""
+msgstr "有泥巴覆蓋的大型區域"
msgid "Beach"
msgstr "海灘"
@@ -17272,6 +17264,12 @@ msgstr "渡輪路線"
msgid "Marina"
msgstr "碼頭"
+msgid "Dump Station"
+msgstr ""
+
+msgid "public"
+msgstr "公開"
+
msgid "Pier"
msgstr "渡頭"
@@ -17339,7 +17337,7 @@ msgid "Bus Guideway"
msgstr "導軌道巴士"
msgid "Disused Rail"
-msgstr ""
+msgstr "不使用的軌道"
msgid "Abandoned Rail"
msgstr "廢棄的軌道"
@@ -17422,7 +17420,7 @@ msgid "Number of people per gondola"
msgstr ""
msgid "Mixed Lift"
-msgstr ""
+msgstr "混合式纜車"
msgid "Number of people per gondola/chair"
msgstr ""
@@ -17451,14 +17449,14 @@ msgid "Magic Carpet"
msgstr ""
msgid "Goods"
-msgstr ""
+msgstr "貨物"
msgctxt "aerialway"
msgid "Station"
msgstr "纜車站"
msgid "Pylon"
-msgstr ""
+msgstr "塔柱"
msgid "Parking"
msgstr "停車場"
@@ -17497,7 +17495,7 @@ msgid "See the Wiki for other capacity:[types]=*."
msgstr "查閱 Wiki 上的其他容量:[types]=*。"
msgid "Parking Space"
-msgstr ""
+msgstr "停車格"
msgid "Capacity"
msgstr "容量"
@@ -17506,7 +17504,7 @@ msgid "Covered (with roof)"
msgstr "有覆蓋(具有屋頂)"
msgid "Parking Entrance"
-msgstr ""
+msgstr "停車場入口"
msgid "Fuel"
msgstr "加油站"
@@ -17670,24 +17668,24 @@ msgstr "洗車場"
msgid "Car Dealer"
msgstr "汽車經銷商"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Repair"
msgstr "修車場"
msgid "Parts"
-msgstr ""
+msgstr "零件"
msgid "Tires"
-msgstr ""
+msgstr "輪胎"
msgid "Rental"
msgstr "租車"
-msgid "Second hand"
-msgstr ""
-
-msgid "only"
-msgstr ""
-
msgid "Sharing"
msgstr "汽車分享"
@@ -17782,13 +17780,13 @@ msgid "Public Bicycle Repair Station"
msgstr ""
msgid "Chain tool"
-msgstr ""
+msgstr "車鏈工具"
msgid "Public Transport"
msgstr "大眾運輸"
msgid "Public Transport Route"
-msgstr ""
+msgstr "大眾運輸路線"
msgid "Route type"
msgstr "路線類型"
@@ -17897,6 +17895,9 @@ msgstr ""
msgid "Platform"
msgstr ""
+msgid "Subway Entrance"
+msgstr "地下鐵入口"
+
msgid "Station or amenities"
msgstr ""
@@ -17952,9 +17953,6 @@ msgstr "火車站"
msgid "Building"
msgstr "建築物"
-msgid "Subway Entrance"
-msgstr "地下鐵入口"
-
msgid "Ticket Machine"
msgstr "售票機"
@@ -17962,10 +17960,10 @@ msgid "Reference Number"
msgstr ""
msgid "Public Transport (Legacy)"
-msgstr ""
+msgstr "大眾運輸 (傳統)"
msgid "Public transport route (Legacy)"
-msgstr ""
+msgstr "大眾運輸路線 (傳統)"
msgid "forward segment"
msgstr "前進區段"
@@ -18040,7 +18038,7 @@ msgid "Apron"
msgstr "停機坪"
msgid "Plane Parking Position"
-msgstr ""
+msgstr "飛機停放位置"
msgid "Hangar"
msgstr "飛機庫"
@@ -18081,7 +18079,7 @@ msgstr "星級"
msgid "Motel"
msgstr "汽車旅館"
-msgid "Guest House/Bed & Breakfast"
+msgid "Guest House/Bed & Breakfast"
msgstr ""
msgid "Chalet"
@@ -18726,9 +18724,6 @@ msgstr ""
msgid "Access rights"
msgstr ""
-msgid "public"
-msgstr "公開"
-
msgid "seasonal"
msgstr ""
@@ -18902,6 +18897,18 @@ msgstr ""
msgid "Waste Disposal/Dumpster"
msgstr ""
+msgid "Sanitary Dump Station"
+msgstr ""
+
+msgid "Suction pumpout"
+msgstr ""
+
+msgid "Gravity dump station"
+msgstr ""
+
+msgid "Operation times"
+msgstr "運作時間"
+
msgid "Backrest"
msgstr ""
@@ -19649,9 +19656,6 @@ msgstr "燈塔"
msgid "Street Lamp"
msgstr "路燈"
-msgid "Operation times"
-msgstr "運作時間"
-
msgid "Mo-Fr 22:00-05:00"
msgstr "週一-週五 22:00-05:00"
@@ -21727,7 +21731,7 @@ msgstr ""
msgctxt "note=*, fixme=*, description=*"
msgid "Similar but different tags:"
-msgstr ""
+msgstr "類似但標籤不同者:"
msgctxt "the tag note=*"
msgid "Note"
@@ -22207,6 +22211,16 @@ msgstr ""
msgid "Definition of {0} is unclear"
msgstr ""
+msgid ""
+"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
+msgstr ""
+
+msgid "key with uncommon character"
+msgstr ""
+
+msgid "uncommon short key"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -22373,36 +22387,6 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
-msgid "OSM Export"
-msgstr ""
-
-msgid "Export traffic data to SUMO network file."
-msgstr ""
-
-msgid "SUMO Export"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-msgid "Port:"
-msgstr "連接埠："
-
-msgid "refresh the port list"
-msgstr "重新整理連接埠清單"
-
-msgid "Configure"
-msgstr "設定"
-
-msgid "Connection Error."
-msgstr "連線錯誤。"
-
-msgid "configure the connected DG100"
-msgstr "設定連接的 DG100"
-
-msgid "delete data after import"
-msgstr "匯入後删除資料"
-
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV 檔案"
@@ -23456,7 +23440,7 @@ msgid "Building:"
msgstr ""
msgid "Tags:"
-msgstr ""
+msgstr "標籤:"
msgid "Name:"
msgstr "名稱："
@@ -23554,6 +23538,12 @@ msgstr ""
msgid "Thinning Iterations"
msgstr ""
+msgid "Use hue and saturation instead of RGB distinction"
+msgstr ""
+
+msgid "use HSV based algorithm"
+msgstr ""
+
msgid "Street Name:"
msgstr "街道名稱："
@@ -23608,6 +23598,34 @@ msgstr "點選建築物相對的結束點"
msgid "Set width of the building"
msgstr "設定建築物的寬度"
+msgid "Merge address points"
+msgstr ""
+
+msgid "Move tags from address nodes inside buildings to building ways"
+msgstr ""
+
+msgid "Select both address nodes and building ways to merge"
+msgstr ""
+
+msgid "No address nodes found in the selection"
+msgstr ""
+
+msgid "No building ways found in the selection"
+msgstr ""
+
+msgid "There is {0} building with multiple address nodes inside"
+msgid_plural "There are {0} buildings with multiple address nodes inside"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "There is {0} building with address conflicts"
+msgid_plural "There are {0} buildings with address conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "No address nodes inside buildings found"
+msgstr ""
+
msgid "on polygon"
msgstr "於多邊形"
@@ -24246,6 +24264,9 @@ msgstr ""
msgid "Subject only ({0})"
msgstr ""
+msgid "Configure"
+msgstr "設定"
+
msgid "Configure conflation options"
msgstr ""
@@ -24565,9 +24586,24 @@ msgstr "停用資料記錄距離"
msgid "Unknown logFormat"
msgstr "不明的記錄格式"
+msgid "Port:"
+msgstr "連接埠："
+
+msgid "refresh the port list"
+msgstr "重新整理連接埠清單"
+
msgid "Configure Device"
msgstr "設定裝置"
+msgid "Connection Error."
+msgstr "連線錯誤。"
+
+msgid "configure the connected DG100"
+msgstr "設定連接的 DG100"
+
+msgid "delete data after import"
+msgstr "匯入後删除資料"
+
msgid "Importing data from device."
msgstr "從裝置匯入資料"
@@ -25341,7 +25377,7 @@ msgid "Search "
msgstr "搜尋 "
msgid "search for junctions in the channel subset"
-msgstr ""
+msgstr "在頻道子集中搜尋交流"
msgid ""
"The marked channels contains a junctioncandidate (white). To test this "
@@ -25613,6 +25649,9 @@ msgstr ""
msgid "Create Mapillary layer."
msgstr ""
+msgid "Export"
+msgstr ""
+
msgid "Measured values"
msgstr "測量的數值"
@@ -26924,16 +26963,16 @@ msgid "added"
msgstr ""
msgid "Public Transport: Enable GTFSStops"
-msgstr ""
+msgstr "大眾運輸：啟用 GTFSStops"
msgid "Public Transport: Catch GTFS stops"
-msgstr ""
+msgstr "大眾運輸：抓取 GTFS stops"
msgid "skipped"
msgstr ""
msgid "Public Transport: Disable GTFS"
-msgstr ""
+msgstr "大眾運輸：停用 GTFS"
msgid "Create Stops from GTFS ..."
msgstr "從 GTFS 建立停止點..."
@@ -27076,13 +27115,13 @@ msgid "Reflect"
msgstr ""
msgid "Required tags:"
-msgstr ""
+msgstr "需求的標籤:"
msgid "Common tags:"
-msgstr ""
+msgstr "一般標籤:"
msgid "Additional tags:"
-msgstr ""
+msgstr "額外的標籤:"
msgid "Add a new Tag"
msgstr ""
@@ -27717,6 +27756,15 @@ msgstr ""
msgid "SeaMap Editor"
msgstr "海圖編輯器"
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
msgid "AutoSave LiveData"
msgstr "自動儲存即時資料"
@@ -29457,7 +29505,7 @@ msgid "Way Select"
msgstr "路徑選擇"
msgid "Add names from Wikipedia"
-msgstr ""
+msgstr "從維基百科加入名稱"
msgid ""
"Fetches interwiki links from Wikipedia in order to add several name tags"
diff --git a/netbeans/nbproject/project.properties b/netbeans/nbproject/project.properties
index 81dc6c8..4f7f6bd 100644
--- a/netbeans/nbproject/project.properties
+++ b/netbeans/nbproject/project.properties
@@ -28,11 +28,11 @@ dist.dir=dist
dist.jar=${dist.dir}/josm.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
-excludes=org/apache/commons/compress/compressors/CompressorStreamFactory.java
+excludes=org/apache/commons/compress/compressors/CompressorStreamFactory.java,org/apache/commons/jcs/admin/servlet/**,org/apache/commons/jcs/auxiliary/disk/jdbc/**,org/apache/commons/jcs/auxiliary/remote/http/**,org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java,org/apache/commons/jcs/utils/servlet/**,org/apache/commons/logging/impl/AvalonLogger.java,org/apache/commons/logging/impl/Jdk13LumberjackLogger.java,org/apache/commons/logging/impl/Log4JLogger.java,org/ [...]
file.reference.core-src=../src
file.reference.core=..
file.reference.test-unit=../test/unit
-includes=org/apache/commons/compress/compressors/*.java,org/apache/commons/compress/compressors/bzip2/*.java,org/apache/commons/codec/**/*.java,org/glassfish/**/*.java,org/jdesktop/**/*.java,org/openstreetmap/**/*.java,org/w3/**/*.java,gnu/**/*.java,javax/**/*.java,oauth/**/*.java,com/**/*.java,images/**,org/openstreetmap/gui/**/*.png,data/**,styles/**,LICENSE,README,CONTRIBUTION,gpl-2.0.txt,gpl-3.0.txt
+includes=org/apache/commons/compress/compressors/*.java,org/apache/commons/compress/compressors/bzip2/*.java,org/apache/commons/codec/**/*.java,org/glassfish/**/*.java,org/jdesktop/**/*.java,org/openstreetmap/**/*.java,org/w3/**/*.java,gnu/**/*.java,javax/**/*.java,oauth/**/*.java,com/**/*.java,org/apache/commons/logging/**/*.java,org/apache/commons/jcs/**/*.java,images/**,org/openstreetmap/gui/**/*.png,data/**,styles/**,LICENSE,README,CONTRIBUTION,gpl-2.0.txt,gpl-3.0.txt
jar.archive.disabled=${jnlp.enabled}
jar.compress=false
jar.index=${jnlp.enabled}
diff --git a/src/org/openstreetmap/josm/Main.java b/src/org/openstreetmap/josm/Main.java
index a9686ff..2a14c05 100644
--- a/src/org/openstreetmap/josm/Main.java
+++ b/src/org/openstreetmap/josm/Main.java
@@ -67,6 +67,7 @@ import org.openstreetmap.josm.data.Preferences;
import org.openstreetmap.josm.data.ProjectionBounds;
import org.openstreetmap.josm.data.UndoRedoHandler;
import org.openstreetmap.josm.data.ViewportData;
+import org.openstreetmap.josm.data.cache.JCSCacheManager;
import org.openstreetmap.josm.data.coor.CoordinateFormat;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.DataSet;
@@ -1088,6 +1089,7 @@ public abstract class Main {
* @since 3378
*/
public static boolean exitJosm(boolean exit, int exitCode) {
+ JCSCacheManager.shutdown();
if (Main.saveUnsavedModifications()) {
geometry.remember("gui.geometry");
if (map != null) {
diff --git a/src/org/openstreetmap/josm/actions/AutoScaleAction.java b/src/org/openstreetmap/josm/actions/AutoScaleAction.java
index e1a4db5..7e0d94f 100644
--- a/src/org/openstreetmap/josm/actions/AutoScaleAction.java
+++ b/src/org/openstreetmap/josm/actions/AutoScaleAction.java
@@ -7,6 +7,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -21,7 +22,9 @@ import javax.swing.event.TreeSelectionListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.DataSource;
import org.openstreetmap.josm.data.conflict.Conflict;
+import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
import org.openstreetmap.josm.data.validation.TestError;
@@ -30,7 +33,6 @@ import org.openstreetmap.josm.gui.MapFrameListener;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
import org.openstreetmap.josm.gui.dialogs.ValidatorDialog.ValidatorBoundingXYVisitor;
-import org.openstreetmap.josm.gui.download.DownloadDialog;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.tools.Shortcut;
@@ -54,6 +56,10 @@ public class AutoScaleAction extends JosmAction {
protected ZoomChangeAdapter zoomChangeAdapter;
protected MapFrameAdapter mapFrameAdapter;
+ /** Time of last zoom to bounds action */
+ protected long lastZoomTime = -1;
+ /** Last zommed bounds */
+ protected int lastZoomArea = -1;
/**
* Zooms the current map view to the currently selected primitives.
@@ -62,15 +68,15 @@ public class AutoScaleAction extends JosmAction {
*
*/
public static void zoomToSelection() {
- if (Main.main == null || !Main.main.hasEditLayer()) return;
+ if (Main.main == null || !Main.main.hasEditLayer())
+ return;
Collection<OsmPrimitive> sel = Main.main.getEditLayer().data.getSelected();
if (sel.isEmpty()) {
JOptionPane.showMessageDialog(
Main.parent,
tr("Nothing selected to zoom to."),
tr("Information"),
- JOptionPane.INFORMATION_MESSAGE
- );
+ JOptionPane.INFORMATION_MESSAGE);
return;
}
zoomTo(sel);
@@ -125,8 +131,8 @@ public class AutoScaleAction extends JosmAction {
*/
public AutoScaleAction(final String mode) {
super(tr("Zoom to {0}", tr(mode)), "dialogs/autoscale/" + mode, tr("Zoom the view to {0}.", tr(mode)),
- Shortcut.registerShortcut("view:zoom"+mode, tr("View: {0}", tr("Zoom to {0}", tr(mode))), getModeShortcut(mode), Shortcut.DIRECT),
- true, null, false);
+ Shortcut.registerShortcut("view:zoom" + mode, tr("View: {0}", tr("Zoom to {0}", tr(mode))),
+ getModeShortcut(mode), Shortcut.DIRECT), true, null, false);
String modeHelp = Character.toUpperCase(mode.charAt(0)) + mode.substring(1);
putValue("help", "Action/AutoScale/" + modeHelp);
this.mode = mode;
@@ -156,14 +162,14 @@ public class AutoScaleAction extends JosmAction {
putValue("help", ht("/Action/ZoomToNext"));
break;
default:
- throw new IllegalArgumentException("Unknown mode: "+mode);
+ throw new IllegalArgumentException("Unknown mode: " + mode);
}
installAdapters();
}
- public void autoScale() {
+ public void autoScale() {
if (Main.isDisplayingMapView()) {
- switch(mode) {
+ switch (mode) {
case "previous":
Main.map.mapView.zoomPrevious();
break;
@@ -194,19 +200,22 @@ public class AutoScaleAction extends JosmAction {
*/
protected Layer getFirstSelectedLayer() {
List<Layer> layers = LayerListDialog.getInstance().getModel().getSelectedLayers();
- if (layers.isEmpty()) return null;
+ if (layers.isEmpty())
+ return null;
return layers.get(0);
}
private BoundingXYVisitor getBoundingBox() {
BoundingXYVisitor v = "problem".equals(mode) ? new ValidatorBoundingXYVisitor() : new BoundingXYVisitor();
- switch(mode) {
+ switch (mode) {
case "problem":
TestError error = Main.map.validatorDialog.getSelectedError();
- if (error == null) return null;
+ if (error == null)
+ return null;
((ValidatorBoundingXYVisitor) v).visit(error);
- if (v.getBounds() == null) return null;
+ if (v.getBounds() == null)
+ return null;
v.enlargeBoundingBox(Main.pref.getDouble("validator.zoom-enlarge-bbox", 0.0002));
break;
case "data":
@@ -219,7 +228,8 @@ public class AutoScaleAction extends JosmAction {
return null;
// try to zoom to the first selected layer
Layer l = getFirstSelectedLayer();
- if (l == null) return null;
+ if (l == null)
+ return null;
l.visitBoundingBox(v);
break;
case "selection":
@@ -240,8 +250,7 @@ public class AutoScaleAction extends JosmAction {
Main.parent,
("selection".equals(mode) ? tr("Nothing selected to zoom to.") : tr("No conflicts to zoom to")),
tr("Information"),
- JOptionPane.INFORMATION_MESSAGE
- );
+ JOptionPane.INFORMATION_MESSAGE);
return null;
}
for (OsmPrimitive osm : sel) {
@@ -255,12 +264,29 @@ public class AutoScaleAction extends JosmAction {
v.enlargeToMinSize(Main.pref.getDouble("zoom_to_selection_min_size_in_meter", 100));
break;
case "download":
- Bounds bounds = DownloadDialog.getSavedDownloadBounds();
- if (bounds != null) {
- try {
- v.visit(bounds);
- } catch (Exception e) {
- Main.warn(e);
+
+ if (lastZoomTime > 0 && System.currentTimeMillis() - lastZoomTime > Main.pref.getLong("zoom.bounds.reset.time", 10*1000)) {
+ lastZoomTime = -1;
+ }
+ DataSet dataset = Main.main.getCurrentDataSet();
+ if(dataset != null) {
+ ArrayList<DataSource> dataSources = new ArrayList<>(dataset.getDataSources());
+ int s = dataSources.size();
+ if(s > 0) {
+ if(lastZoomTime == -1 || lastZoomArea == -1 || lastZoomArea > s) {
+ lastZoomArea = s-1;
+ v.visit(dataSources.get(lastZoomArea).bounds);
+ } else if(lastZoomArea > 0) {
+ lastZoomArea -= 1;
+ v.visit(dataSources.get(lastZoomArea).bounds);
+ } else {
+ lastZoomArea = -1;
+ v.visit(new Bounds(Main.main.getCurrentDataSet().getDataSourceArea().getBounds2D()));
+ }
+ lastZoomTime = System.currentTimeMillis();
+ } else {
+ lastZoomTime = -1;
+ lastZoomArea = -1;
}
}
break;
@@ -270,9 +296,9 @@ public class AutoScaleAction extends JosmAction {
@Override
protected void updateEnabledState() {
- switch(mode) {
+ switch (mode) {
case "selection":
- setEnabled(getCurrentDataSet() != null && ! getCurrentDataSet().getSelected().isEmpty());
+ setEnabled(getCurrentDataSet() != null && !getCurrentDataSet().getSelected().isEmpty());
break;
case "layer":
if (!Main.isDisplayingMapView() || Main.map.mapView.getAllLayersAsList().isEmpty()) {
@@ -295,8 +321,7 @@ public class AutoScaleAction extends JosmAction {
setEnabled(Main.isDisplayingMapView() && Main.map.mapView.hasZoomRedoEntries());
break;
default:
- setEnabled(Main.isDisplayingMapView() && Main.map.mapView.hasLayers()
- );
+ setEnabled(Main.isDisplayingMapView() && Main.map.mapView.hasLayers());
}
}
@@ -337,20 +362,23 @@ public class AutoScaleAction extends JosmAction {
public MapFrameAdapter() {
if ("conflict".equals(mode)) {
conflictSelectionListener = new ListSelectionListener() {
- @Override public void valueChanged(ListSelectionEvent e) {
+ @Override
+ public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
};
} else if ("problem".equals(mode)) {
validatorSelectionListener = new TreeSelectionListener() {
- @Override public void valueChanged(TreeSelectionEvent e) {
+ @Override
+ public void valueChanged(TreeSelectionEvent e) {
updateEnabledState();
}
};
}
}
- @Override public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+ @Override
+ public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
if (conflictSelectionListener != null) {
if (newFrame != null) {
newFrame.conflictDialog.addListSelectionListener(conflictSelectionListener);
diff --git a/src/org/openstreetmap/josm/actions/CombineWayAction.java b/src/org/openstreetmap/josm/actions/CombineWayAction.java
index a8645be..929c72c 100644
--- a/src/org/openstreetmap/josm/actions/CombineWayAction.java
+++ b/src/org/openstreetmap/josm/actions/CombineWayAction.java
@@ -94,7 +94,8 @@ public class CombineWayAction extends JosmAction {
}
/**
- * @param ways
+ * Combine multiple ways into one.
+ * @param ways the way to combine to one way
* @return null if ways cannot be combined. Otherwise returns the combined
* ways and the commands to combine
* @throws UserCancelException
@@ -113,7 +114,7 @@ public class CombineWayAction extends JosmAction {
// try to build a new way which includes all the combined
// ways
//
- NodeGraph graph = NodeGraph.createUndirectedGraphFromNodeWays(ways);
+ NodeGraph graph = NodeGraph.createNearlyUndirectedGraphFromNodeWays(ways);
List<Node> path = graph.buildSpanningPath();
if (path == null) {
warnCombiningImpossible();
@@ -420,6 +421,11 @@ public class CombineWayAction extends JosmAction {
return graph;
}
+ /**
+ * Create an undirected graph from the given ways.
+ * @param ways Ways to build the graph from
+ * @return node graph structure
+ */
public static NodeGraph createUndirectedGraphFromNodeList(List<NodePair> pairs) {
NodeGraph graph = new NodeGraph();
for (NodePair pair: pairs) {
@@ -429,6 +435,13 @@ public class CombineWayAction extends JosmAction {
return graph;
}
+ /**
+ * Create an undirected graph from the given ways, but prevent reversing of all
+ * non-new ways by fix one direction.
+ * @param ways Ways to build the graph from
+ * @return node graph structure
+ * @since 8181
+ */
public static NodeGraph createUndirectedGraphFromNodeWays(Collection<Way> ways) {
NodeGraph graph = new NodeGraph();
for (Way w: ways) {
@@ -437,6 +450,21 @@ public class CombineWayAction extends JosmAction {
return graph;
}
+ public static NodeGraph createNearlyUndirectedGraphFromNodeWays(Collection<Way> ways) {
+ boolean dir = true;
+ NodeGraph graph = new NodeGraph();
+ for (Way w: ways) {
+ if(!w.isNew()) {
+ /* let the first non-new way give the direction (see #5880) */
+ graph.add(buildNodePairs(w, dir));
+ dir = false;
+ } else {
+ graph.add(buildNodePairs(w, false /* undirected */));
+ }
+ }
+ return graph;
+ }
+
private Set<NodePair> edges;
private int numUndirectedEges = 0;
private Map<Node, List<NodePair>> successors;
@@ -603,7 +631,7 @@ public class CombineWayAction extends JosmAction {
/**
* Tries to find a path through the graph which visits each edge (i.e.
- * the segment of a way) exactly one.
+ * the segment of a way) exactly once.
*
* @return the path; null, if no path was found
*/
diff --git a/src/org/openstreetmap/josm/actions/CopyAction.java b/src/org/openstreetmap/josm/actions/CopyAction.java
index 19ed59b..94f3cdc 100644
--- a/src/org/openstreetmap/josm/actions/CopyAction.java
+++ b/src/org/openstreetmap/josm/actions/CopyAction.java
@@ -56,16 +56,20 @@ public final class CopyAction extends JosmAction {
*/
public static void copy(OsmDataLayer source, Collection<OsmPrimitive> primitives) {
/* copy ids to the clipboard */
+ String ids = getCopyString(primitives);
+ Utils.copyToClipboard(ids);
+
+ Main.pasteBuffer.makeCopy(primitives);
+ Main.pasteSource = source;
+ }
+
+ public static String getCopyString(Collection<? extends OsmPrimitive> primitives) {
StringBuilder idsBuilder = new StringBuilder();
for (OsmPrimitive p : primitives) {
idsBuilder.append(OsmPrimitiveType.from(p).getAPIName()).append(" ");
idsBuilder.append(p.getId()).append(",");
}
- String ids = idsBuilder.substring(0, idsBuilder.length() - 1);
- Utils.copyToClipboard(ids);
-
- Main.pasteBuffer.makeCopy(primitives);
- Main.pasteSource = source;
+ return idsBuilder.substring(0, idsBuilder.length() - 1);
}
@Override
diff --git a/src/org/openstreetmap/josm/actions/DistributeAction.java b/src/org/openstreetmap/josm/actions/DistributeAction.java
index c6daf22..9afc5fb 100644
--- a/src/org/openstreetmap/josm/actions/DistributeAction.java
+++ b/src/org/openstreetmap/josm/actions/DistributeAction.java
@@ -10,6 +10,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
+import java.util.List;
import java.util.Set;
import javax.swing.JOptionPane;
@@ -31,59 +32,185 @@ import org.openstreetmap.josm.tools.Shortcut;
*/
public final class DistributeAction extends JosmAction {
+ private static final String ACTION_SHORT_NAME = "Distribute Nodes";
+
/**
* Constructs a new {@code DistributeAction}.
*/
public DistributeAction() {
- super(tr("Distribute Nodes"), "distribute", tr("Distribute the selected nodes to equal distances along a line."),
- Shortcut.registerShortcut("tools:distribute", tr("Tool: {0}", tr("Distribute Nodes")), KeyEvent.VK_B,
- Shortcut.SHIFT), true);
+ super(tr(ACTION_SHORT_NAME), "distribute",
+ tr("Distribute the selected nodes to equal distances along a line."),
+ Shortcut.registerShortcut("tools:distribute",
+ tr("Tool: {0}", tr(ACTION_SHORT_NAME)),
+ KeyEvent.VK_B, Shortcut.SHIFT),
+ true);
putValue("help", ht("/Action/DistributeNodes"));
}
/**
- * The general algorithm here is to find the two selected nodes
- * that are furthest apart, and then to distribute all other selected
- * nodes along the straight line between these nodes.
+ * Perform action.
+ * Select method according to user selection.
+ * Case 1: One Way (no self-crossing) and at most 2 nodes contains by this way:
+ * Distribute nodes keeping order along the way
+ * Case 2: Other
+ * Distribute nodes
*/
@Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
- Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
- Collection<Node> nodes = new LinkedList<>();
- Collection<Node> itnodes = new LinkedList<>();
- for (OsmPrimitive osm : sel)
- if (osm instanceof Node) {
- nodes.add((Node)osm);
- itnodes.add((Node)osm);
+
+ // Collect user selected objects
+ Collection<OsmPrimitive> selected = getCurrentDataSet().getSelected();
+ Collection<Way> ways = new LinkedList<>();
+ Collection<Node> nodes = new HashSet<>();
+ for(OsmPrimitive osm : selected) {
+ if(osm instanceof Node) {
+ nodes.add((Node) osm);
+ } else if(osm instanceof Way) {
+ ways.add((Way) osm);
}
- // special case if no single nodes are selected and exactly one way is:
- // then use the way's nodes
- if (nodes.isEmpty() && (sel.size() == 1)) {
- for (OsmPrimitive osm : sel)
- if (osm instanceof Way) {
- nodes.addAll(((Way)osm).getNodes());
- itnodes.addAll(((Way)osm).getNodes());
- }
}
Set<Node> ignoredNodes = removeNodesWithoutCoordinates(nodes);
- ignoredNodes.addAll(removeNodesWithoutCoordinates(itnodes));
if (!ignoredNodes.isEmpty()) {
Main.warn(tr("Ignoring {0} nodes with null coordinates", ignoredNodes.size()));
ignoredNodes.clear();
}
- if (nodes.size() < 3) {
+ // Switch between algorithms
+ Collection<Command> cmds;
+ if(checkDistributeWay(ways, nodes)) {
+ cmds = distributeWay(ways, nodes);
+ } else if(checkDistributeNodes(ways, nodes)) {
+ cmds = distributeNodes(nodes);
+ } else {
new Notification(
- tr("Please select at least three nodes."))
- .setIcon(JOptionPane.INFORMATION_MESSAGE)
- .setDuration(Notification.TIME_SHORT)
- .show();
+ tr("Please select :\n" +
+ "* One no self-crossing way with at most two of its nodes;\n" +
+ "* Three nodes."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .setDuration(Notification.TIME_SHORT)
+ .show();
+ return;
+ }
+
+ if(cmds.isEmpty()) {
return;
}
+ // Do it!
+ Main.main.undoRedo.add(new SequenceCommand(tr(ACTION_SHORT_NAME), cmds));
+ Main.map.repaint();
+ }
+
+ /**
+ * Test if one way, no self-crossing, is selected with at most two of its nodes.
+ * @param ways Selected ways
+ * @param nodes Selected nodes
+ * @return true in this case
+ */
+ private Boolean checkDistributeWay(Collection<Way> ways, Collection<Node> nodes) {
+ if(ways.size() == 1 && nodes.size() <= 2) {
+ Way w = ways.iterator().next();
+ Set<Node> unduplicated = new HashSet<>(w.getNodes());
+ if(unduplicated.size() != w.getNodesCount()) {
+ // No self crossing way
+ return false;
+ }
+ for(Node node: nodes) {
+ if(!w.containsNode(node)) {
+ return false;
+ }
+ }
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Distribute nodes contained by a way, keeping nodes order.
+ * If one or two nodes are selected, keep these nodes in place.
+ * @param ways Selected ways, must be collection of size 1.
+ * @param nodes Selected nodes, at most two nodes.
+ * @return Collection of command to be executed.
+ */
+ private Collection<Command> distributeWay(Collection<Way> ways,
+ Collection<Node> nodes) {
+ Way w = ways.iterator().next();
+ Collection<Command> cmds = new LinkedList<>();
+
+ if(w.getNodesCount() == nodes.size() || w.getNodesCount() <= 2) {
+ // Nothing to do
+ return cmds;
+ }
+
+ double xa, ya; // Start point
+ double dx, dy; // Segment increment
+ if(nodes.isEmpty()) {
+ Node na = w.firstNode();
+ nodes.add(na);
+ Node nb = w.lastNode();
+ nodes.add(nb);
+ xa = na.getEastNorth().east();
+ ya = na.getEastNorth().north();
+ dx = (nb.getEastNorth().east() - xa) / (w.getNodesCount() - 1);
+ dy = (nb.getEastNorth().north() - ya) / (w.getNodesCount() - 1);
+ } else if(nodes.size() == 1) {
+ Node n = nodes.iterator().next();
+ int nIdx = w.getNodes().indexOf(n);
+ Node na = w.firstNode();
+ Node nb = w.lastNode();
+ dx = (nb.getEastNorth().east() - na.getEastNorth().east()) /
+ (w.getNodesCount() - 1);
+ dy = (nb.getEastNorth().north() - na.getEastNorth().north()) /
+ (w.getNodesCount() - 1);
+ xa = n.getEastNorth().east() - dx * nIdx;
+ ya = n.getEastNorth().north() - dy * nIdx;
+ } else {
+ Iterator<Node> it = nodes.iterator();
+ Node na = it.next();
+ Node nb = it.next();
+ List<Node> wayNodes = w.getNodes();
+ int naIdx = wayNodes.indexOf(na);
+ int nbIdx = wayNodes.indexOf(nb);
+ dx = (nb.getEastNorth().east() - na.getEastNorth().east()) / (nbIdx - naIdx);
+ dy = (nb.getEastNorth().north() - na.getEastNorth().north()) / (nbIdx - naIdx);
+ xa = na.getEastNorth().east() - dx * naIdx;
+ ya = na.getEastNorth().north() - dy * naIdx;
+ }
+
+ for(int i = 0; i < w.getNodesCount(); i++) {
+ Node n = w.getNode(i);
+ if (!n.isLatLonKnown() || nodes.contains(n)) {
+ continue;
+ }
+ double x = xa + i * dx;
+ double y = ya + i * dy;
+ cmds.add(new MoveCommand(n, x - n.getEastNorth().east(),
+ y - n.getEastNorth().north()));
+ }
+ return cmds;
+ }
+
+ /**
+ * Test if nodes oriented algorithm applies to the selection.
+ * @param ways Selected ways
+ * @param nodes Selected nodes
+ * @return true in this case
+ */
+ private Boolean checkDistributeNodes(Collection<Way> ways, Collection<Node> nodes) {
+ return ways.isEmpty() && nodes.size() >= 3;
+ }
+
+ /**
+ * Distribute nodes when only nodes are selected.
+ * The general algorithm here is to find the two selected nodes
+ * that are furthest apart, and then to distribute all other selected
+ * nodes along the straight line between these nodes.
+ * @return Commands to execute to perform action
+ */
+ private Collection<Command> distributeNodes(Collection<Node> nodes) {
// Find from the selected nodes two that are the furthest apart.
// Let's call them A and B.
double distance = 0;
@@ -91,6 +218,7 @@ public final class DistributeAction extends JosmAction {
Node nodea = null;
Node nodeb = null;
+ Collection<Node> itnodes = new LinkedList<>(nodes);
for (Node n : nodes) {
itnodes.remove(n);
for (Node m : itnodes) {
@@ -145,11 +273,14 @@ public final class DistributeAction extends JosmAction {
nodes.remove(s);
}
- // Do it!
- Main.main.undoRedo.add(new SequenceCommand(tr("Distribute Nodes"), cmds));
- Main.map.repaint();
+ return cmds;
}
+ /**
+ * Remove nodes without knowned coordinates from a collection.
+ * @param col Collection of nodes to check
+ * @return Set of nodes without coordinates
+ */
private Set<Node> removeNodesWithoutCoordinates(Collection<Node> col) {
Set<Node> result = new HashSet<>();
for (Iterator<Node> it = col.iterator(); it.hasNext();) {
diff --git a/src/org/openstreetmap/josm/actions/DownloadNotesInViewAction.java b/src/org/openstreetmap/josm/actions/DownloadNotesInViewAction.java
new file mode 100644
index 0000000..324f8d9
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/DownloadNotesInViewAction.java
@@ -0,0 +1,46 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.util.concurrent.Future;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadNotesTask;
+import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.io.OnlineResource;
+
+/**
+ * Action that downloads the notes within the current view from the server.
+ *
+ * No interaction is required.
+ */
+public class DownloadNotesInViewAction extends JosmAction {
+
+ private DownloadNotesInViewAction(String iconName) {
+ super(tr("Download notes in current view"), iconName, tr("Download notes in current view"), null, false);
+ }
+
+ public static DownloadNotesInViewAction newActionWithNoteIcon() {
+ return new DownloadNotesInViewAction("dialogs/notes/note_open");
+ }
+
+ public static DownloadNotesInViewAction newActionWithDownloadIcon() {
+ return new DownloadNotesInViewAction("download");
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ final Bounds bounds = Main.map.mapView.getRealBounds();
+ DownloadNotesTask task = new DownloadNotesTask();
+ Future<?> future = task.download(false, bounds, null);
+ Main.worker.submit(new PostDownloadHandler(task, future));
+ }
+
+ @Override
+ protected void updateEnabledState() {
+ setEnabled(Main.map != null && Main.map.mapView != null && !Main.isOffline(OnlineResource.OSM_API));
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java b/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java
index 395d5e3..832d5fa 100644
--- a/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java
+++ b/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java
@@ -48,7 +48,7 @@ public class DownloadPrimitiveAction extends JosmAction {
*/
public static void processItems(boolean newLayer, final List<PrimitiveId> ids, boolean downloadReferrers, boolean full) {
final DownloadPrimitivesWithReferrersTask task =
- new DownloadPrimitivesWithReferrersTask(newLayer, ids, downloadReferrers, full, null);
+ new DownloadPrimitivesWithReferrersTask(newLayer, ids, downloadReferrers, full, null, null);
Main.worker.submit(task);
Main.worker.submit(new Runnable() {
@Override
diff --git a/src/org/openstreetmap/josm/actions/OpenFileAction.java b/src/org/openstreetmap/josm/actions/OpenFileAction.java
index 616597b..45b2809 100644
--- a/src/org/openstreetmap/josm/actions/OpenFileAction.java
+++ b/src/org/openstreetmap/josm/actions/OpenFileAction.java
@@ -9,6 +9,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.io.BufferedReader;
import java.io.File;
+import java.io.FilenameFilter;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -101,10 +102,30 @@ public class OpenFileAction extends DiskAccessAction {
private boolean canceled;
private boolean recordHistory = false;
- public OpenFileTask(List<File> files, FileFilter fileFilter, String title) {
+ public OpenFileTask(final List<File> files, final FileFilter fileFilter, final String title) {
super(title, false /* don't ignore exception */);
- this.files = new ArrayList<>(files);
this.fileFilter = fileFilter;
+ this.files = new ArrayList<>(files.size());
+ for (final File file : files) {
+ if (file.exists()) {
+ this.files.add(file);
+ } else {
+ // try to guess an extension using the specified fileFilter
+ final File[] matchingFiles = file.getParentFile().listFiles(new FilenameFilter() {
+ @Override
+ public boolean accept(File dir, String name) {
+ return name.startsWith(file.getName()) && fileFilter.accept(new File(dir, name));
+ }
+ });
+ if (matchingFiles.length == 1) {
+ // use the unique match as filename
+ this.files.add(matchingFiles[0]);
+ } else {
+ // add original filename for error reporting later on
+ this.files.add(file);
+ }
+ }
+ }
}
public OpenFileTask(List<File> files, FileFilter fileFilter) {
diff --git a/src/org/openstreetmap/josm/actions/OpenLocationAction.java b/src/org/openstreetmap/josm/actions/OpenLocationAction.java
index 0f48971..e037eb7 100644
--- a/src/org/openstreetmap/josm/actions/OpenLocationAction.java
+++ b/src/org/openstreetmap/josm/actions/OpenLocationAction.java
@@ -6,6 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
+import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
@@ -17,15 +18,19 @@ import java.util.concurrent.Future;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
+import javax.swing.JList;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadNotesTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadNotesUrlBoundsTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadNotesUrlIdTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmChangeCompressedTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmChangeTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmCompressedTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmIdTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmUrlTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadSessionTask;
@@ -63,9 +68,12 @@ public class OpenLocationAction extends JosmAction {
addDownloadTaskClass(DownloadNotesTask.class);
addDownloadTaskClass(DownloadOsmChangeTask.class);
addDownloadTaskClass(DownloadOsmUrlTask.class);
+ addDownloadTaskClass(DownloadOsmIdTask.class);
addDownloadTaskClass(DownloadOsmCompressedTask.class);
addDownloadTaskClass(DownloadOsmChangeCompressedTask.class);
addDownloadTaskClass(DownloadSessionTask.class);
+ addDownloadTaskClass(DownloadNotesUrlBoundsTask.class);
+ addDownloadTaskClass(DownloadNotesUrlIdTask.class);
}
/**
@@ -182,25 +190,53 @@ public class OpenLocationAction extends JosmAction {
public void openUrl(boolean newLayer, final String url) {
PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download Data"));
Collection<DownloadTask> tasks = findDownloadTasks(url, false);
- DownloadTask task = null;
- Future<?> future = null;
- if (!tasks.isEmpty()) {
- // TODO: handle multiple suitable tasks ?
+
+ if (tasks.size() > 1) {
+ tasks = askWhichTasksToLoad(tasks);
+ } else if (tasks.isEmpty()) {
+ warnNoSuitableTasks(url);
+ return;
+ }
+
+ for (final DownloadTask task : tasks) {
try {
- task = tasks.iterator().next();
- future = task.loadUrl(newLayer, url, monitor);
+ Future<?> future = task.loadUrl(newLayer, url, monitor);
+ Main.worker.submit(new PostDownloadHandler(task, future));
} catch (IllegalArgumentException e) {
Main.error(e);
}
}
- if (future != null) {
- Main.worker.submit(new PostDownloadHandler(task, future));
- } else {
- final String details = findSummaryDocumentation(); // Explain what patterns are supported
- HelpAwareOptionPane.showMessageDialogInEDT(Main.parent, "<html><p>" + tr(
- "Cannot open URL ''{0}''<br>The following download tasks accept the URL patterns shown:<br>{1}",
- url, details) + "</p></html>", tr("Download Location"), JOptionPane.ERROR_MESSAGE, HelpUtil.ht("/Action/OpenLocation"));
- }
+
+ }
+
+ /**
+ * Asks the user which of the possible tasks to perform.
+ * @param tasks a list of possible tasks
+ * @return the selected tasks from the user or an empty list if the dialog has been canceled
+ */
+ Collection<DownloadTask> askWhichTasksToLoad(final Collection<DownloadTask> tasks) {
+ final JList<DownloadTask> list = new JList<>(tasks.toArray(new DownloadTask[tasks.size()]));
+ list.addSelectionInterval(0, tasks.size() - 1);
+ final ExtendedDialog dialog = new ExtendedDialog(Main.parent, tr("Which tasks to perform?"), new String[]{tr("Ok"), tr("Cancel")}, true) {{
+ setButtonIcons(new String[]{"ok", "cancel"});
+ final JPanel pane = new JPanel(new GridLayout(2, 1));
+ pane.add(new JLabel(tr("Which tasks to perform?")));
+ pane.add(list);
+ setContent(pane);
+ }};
+ dialog.showDialog();
+ return dialog.getValue() == 1 ? list.getSelectedValuesList() : Collections.<DownloadTask>emptyList();
+ }
+
+ /**
+ * Displays an error message dialog that no suitable tasks have been found for the given url.
+ * @param url the given url
+ */
+ void warnNoSuitableTasks(final String url) {
+ final String details = findSummaryDocumentation(); // Explain what patterns are supported
+ HelpAwareOptionPane.showMessageDialogInEDT(Main.parent, "<html><p>" + tr(
+ "Cannot open URL ''{0}''<br>The following download tasks accept the URL patterns shown:<br>{1}",
+ url, details) + "</p></html>", tr("Download Location"), JOptionPane.ERROR_MESSAGE, HelpUtil.ht("/Action/OpenLocation"));
}
/**
diff --git a/src/org/openstreetmap/josm/actions/SaveActionBase.java b/src/org/openstreetmap/josm/actions/SaveActionBase.java
index c65572e..74cfa08 100644
--- a/src/org/openstreetmap/josm/actions/SaveActionBase.java
+++ b/src/org/openstreetmap/josm/actions/SaveActionBase.java
@@ -19,6 +19,7 @@ import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.widgets.AbstractFileChooser;
+import org.openstreetmap.josm.gui.widgets.FileChooserManager;
import org.openstreetmap.josm.io.FileExporter;
import org.openstreetmap.josm.tools.Shortcut;
@@ -175,7 +176,8 @@ public abstract class SaveActionBase extends DiskAccessAction {
fn += "." + extension;
}
file = new File(fn);
- if (!confirmOverwrite(file))
+ // Confirm overwrite, except for OSX native file dialogs which already ask for confirmation (see #11362)
+ if (!(Main.isPlatformOsx() && FileChooserManager.PROP_USE_NATIVE_FILE_DIALOG.get()) && !confirmOverwrite(file))
return null;
}
return file;
diff --git a/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java b/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java
index 125c3ad..bf6d0e5 100644
--- a/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java
+++ b/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java
@@ -72,7 +72,21 @@ public class SearchNotesDownloadAction extends JosmAction {
searchTermBox.addCurrentItemToHistory();
Main.pref.putCollection(HISTORY_KEY, searchTermBox.getHistory());
+ performSearch(searchTerm);
+
+ }
+
+ public void performSearch(String searchTerm) {
+
searchTerm = searchTerm.trim();
+
+ try {
+ final long id = Long.parseLong(searchTerm);
+ new DownloadNotesTask().download(false, id, null);
+ return;
+ } catch (NumberFormatException ignore) {
+ }
+
int noteLimit = Main.pref.getInteger("osm.notes.downloadLimit", 1000);
int closedLimit = Main.pref.getInteger("osm.notes.daysCloased", 7);
diff --git a/src/org/openstreetmap/josm/actions/SplitWayAction.java b/src/org/openstreetmap/josm/actions/SplitWayAction.java
index d431fd8..13a12e5 100644
--- a/src/org/openstreetmap/josm/actions/SplitWayAction.java
+++ b/src/org/openstreetmap/josm/actions/SplitWayAction.java
@@ -124,7 +124,8 @@ public class SplitWayAction extends JosmAction {
List<Node> selectedNodes = OsmPrimitive.getFilteredList(selection, Node.class);
List<Way> selectedWays = OsmPrimitive.getFilteredList(selection, Way.class);
- List<Relation> selectedRelations = OsmPrimitive.getFilteredList(selection, Relation.class);
+ List<Relation> selectedRelations =
+ OsmPrimitive.getFilteredList( selection, Relation.class);
List<Way> applicableWays = getApplicableWays(selectedWays, selectedNodes);
if (applicableWays == null) {
@@ -141,18 +142,18 @@ public class SplitWayAction extends JosmAction {
return;
}
- // If several ways have been found, remove ways that doesn't have selected node in the middle
+ // If several ways have been found, remove ways that doesn't have selected
+ // node in the middle
if (applicableWays.size() > 1) {
- WAY_LOOP:
- for (Iterator<Way> it = applicableWays.iterator(); it.hasNext();) {
- Way w = it.next();
- for (Node n : selectedNodes) {
- if (!w.isInnerNode(n)) {
- it.remove();
- continue WAY_LOOP;
- }
+ for (Iterator<Way> it = applicableWays.iterator(); it.hasNext();) {
+ Way w = it.next();
+ for (Node n : selectedNodes) {
+ if (!w.isInnerNode(n)) {
+ it.remove();
+ break;
}
}
+ }
}
if (applicableWays.isEmpty()) {
@@ -187,21 +188,27 @@ public class SplitWayAction extends JosmAction {
}
}
+ /**
+ * Determine witch ways to split.
+ * @param selectedWays List of user selected ways.
+ * @param selectedNodes List of user selected nodes.
+ * @return List of ways to split
+ */
private List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
if (selectedNodes.isEmpty())
return null;
- // Special case - one of the selected ways touches (not cross) way that we want to split
+ // Special case - one of the selected ways touches (not cross) way that we
+ // want to split
if (selectedNodes.size() == 1) {
Node n = selectedNodes.get(0);
- List<Way> referedWays = OsmPrimitive.getFilteredList(n.getReferrers(), Way.class);
+ List<Way> referedWays =
+ OsmPrimitive.getFilteredList(n.getReferrers(), Way.class);
Way inTheMiddle = null;
- boolean foundSelected = false;
for (Way w: referedWays) {
- if (selectedWays.contains(w)) {
- foundSelected = true;
- }
- if (w.getNode(0) != n && w.getNode(w.getNodesCount() - 1) != n) {
+ // Need to look at all nodes see #11184 for a case where node n is
+ // firstNode, lastNode and also in the middle
+ if (selectedWays.contains(w) && w.isInnerNode(n)) {
if (inTheMiddle == null) {
inTheMiddle = w;
} else {
@@ -210,12 +217,14 @@ public class SplitWayAction extends JosmAction {
}
}
}
- if (foundSelected && inTheMiddle != null)
+ if (inTheMiddle != null)
return Collections.singletonList(inTheMiddle);
}
// List of ways shared by all nodes
- List<Way> result = new ArrayList<>(OsmPrimitive.getFilteredList(selectedNodes.get(0).getReferrers(), Way.class));
+ List<Way> result =
+ new ArrayList<>(OsmPrimitive.getFilteredList(selectedNodes.get(0).getReferrers(),
+ Way.class));
for (int i=1; i<selectedNodes.size(); i++) {
List<OsmPrimitive> ref = selectedNodes.get(i).getReferrers();
for (Iterator<Way> it = result.iterator(); it.hasNext(); ) {
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
index 391145f..11d9e93 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
@@ -107,6 +107,11 @@ public abstract class AbstractDownloadTask implements DownloadTask {
return getClass().getName();
}
+ @Override
+ public String toString() {
+ return this.getTitle();
+ }
+
// Default pattern to keep old plugins compatible
@Override
public String[] getPatterns() {
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
index 53b5775..9f10e31 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
@@ -2,19 +2,24 @@
package org.openstreetmap.josm.actions.downloadtasks;
import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
import java.io.IOException;
import java.net.URL;
import java.util.List;
import java.util.concurrent.Future;
+import javax.swing.JOptionPane;
+
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.notes.Note;
+import org.openstreetmap.josm.data.preferences.IntegerProperty;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.layer.NoteLayer;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.io.BoundingBoxDownloader;
+import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.io.OsmServerLocationReader;
import org.openstreetmap.josm.io.OsmServerReader;
import org.openstreetmap.josm.io.OsmTransferException;
@@ -25,9 +30,19 @@ public class DownloadNotesTask extends AbstractDownloadTask {
private static final String PATTERN_API_URL = "https?://.*/api/0.6/notes.*";
private static final String PATTERN_DUMP_FILE = "https?://.*/(.*\\.osn(.bz2)?)";
+ /** Property defining the number of notes to be downloaded */
+ public static final IntegerProperty DOWNLOAD_LIMIT = new IntegerProperty("osm.notes.downloadLimit", 1000);
+ /** Property defining number of days a bug needs to be closed to no longer be downloaded */
+ public static final IntegerProperty DAYS_CLOSED = new IntegerProperty("osm.notes.daysClosed", 7);
private DownloadTask downloadTask;
+ public Future<?> download(boolean newLayer, long id, ProgressMonitor progressMonitor) {
+ final String url = OsmApi.getOsmApi().getBaseUrl() + "notes/" + id;
+ downloadTask = new DownloadRawUrlTask(new OsmServerLocationReader(url), progressMonitor);
+ return Main.worker.submit(downloadTask);
+ }
+
@Override
public Future<?> download(boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
downloadTask = new DownloadBoundingBoxTask(new BoundingBoxDownloader(downloadArea), progressMonitor);
@@ -132,7 +147,17 @@ public class DownloadNotesTask extends AbstractDownloadTask {
}
ProgressMonitor subMonitor = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
try {
- notesData = reader.parseNotes(null, null, subMonitor);
+ notesData = reader.parseNotes(DOWNLOAD_LIMIT.get(), DAYS_CLOSED.get(), subMonitor);
+ } catch (BoundingBoxDownloader.MoreNotesException e) {
+ notesData = e.notes;
+ JOptionPane.showMessageDialog(Main.parent, "<html>"
+ + trn("{0} note has been downloaded.", "{0} notes have been downloaded.", e.limit, e.limit)
+ + "<br>"
+ + tr("Since the download limit was {0}, there might be more notes to download.", e.limit)
+ + "<br>"
+ + tr("Request a smaller area to make sure that all notes are being downloaded.")
+ + "</html>",
+ tr("More notes to download"), JOptionPane.INFORMATION_MESSAGE);
} catch (Exception e) {
if (isCanceled())
return;
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesUrlBoundsTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesUrlBoundsTask.java
new file mode 100644
index 0000000..764ef76
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesUrlBoundsTask.java
@@ -0,0 +1,27 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.downloadtasks;
+
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.OsmUrlToBounds;
+
+import java.util.concurrent.Future;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+public class DownloadNotesUrlBoundsTask extends DownloadNotesTask {
+
+ @Override
+ public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
+ return download(newLayer, OsmUrlToBounds.parse(url), null);
+ }
+
+ @Override
+ public String[] getPatterns() {
+ return new String[]{
+ "https?://www\\.(osm|openstreetmap)\\.org/(.*)?#map=\\p{Digit}+/.*/.*&layers=[A-MO-Z]*N[A-MO-Z]*"};
+ }
+ @Override
+ public String getTitle() {
+ return tr("Download OSM Notes within Bounds");
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesUrlIdTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesUrlIdTask.java
new file mode 100644
index 0000000..d7f3f36
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesUrlIdTask.java
@@ -0,0 +1,39 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.downloadtasks;
+
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+
+import java.util.concurrent.Future;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+public class DownloadNotesUrlIdTask extends DownloadNotesTask {
+
+ private final String URL_ID_PATTERN = "https?://www\\.(osm|openstreetmap)\\.org/note/(\\p{Digit}+).*";
+
+ @Override
+ public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
+ final Matcher matcher = Pattern.compile(URL_ID_PATTERN).matcher(url);
+ if (matcher.matches()) {
+ return download(newLayer, Long.parseLong(matcher.group(2)), null);
+ } else {
+ throw new IllegalStateException("Failed to parse note id from " + url);
+ }
+ }
+
+ @Override
+ public String[] getPatterns() {
+ return new String[]{URL_ID_PATTERN};
+ }
+
+ public boolean acceptsUrl(String url) {
+ return super.acceptsUrl(url);
+ }
+
+ @Override
+ public String getTitle() {
+ return tr("Download OSM Note by ID");
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
index 491fb18..be84e00 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
@@ -9,6 +9,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Future;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
@@ -31,6 +33,7 @@ import org.openstreetmap.josm.data.osm.history.HistoryRelation;
import org.openstreetmap.josm.data.osm.history.HistoryWay;
import org.openstreetmap.josm.gui.history.HistoryLoadTask;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.io.OsmServerLocationReader;
import org.openstreetmap.josm.io.OsmServerReader;
import org.openstreetmap.josm.io.OsmTransferException;
@@ -41,9 +44,12 @@ import org.openstreetmap.josm.io.OsmTransferException;
*/
public class DownloadOsmChangeTask extends DownloadOsmTask {
+ private static final String OSM_WEBSITE_PATTERN = "https?://www\\.(osm|openstreetmap)\\.org/changeset/(\\p{Digit}+).*";
+
@Override
public String[] getPatterns() {
return new String[]{"https?://.*/api/0.6/changeset/\\p{Digit}+/download", // OSM API 0.6 changesets
+ OSM_WEBSITE_PATTERN, // OSM changesets
"https?://.*/.*\\.osc" // Remote .osc files
};
}
@@ -60,11 +66,12 @@ public class DownloadOsmChangeTask extends DownloadOsmTask {
}
@Override
- public Future<?> loadUrl(boolean new_layer, String url,
- ProgressMonitor progressMonitor) {
- downloadTask = new DownloadTask(new_layer,
- new OsmServerLocationReader(url),
- progressMonitor);
+ public Future<?> loadUrl(boolean new_layer, String url, ProgressMonitor progressMonitor) {
+ final Matcher matcher = Pattern.compile(OSM_WEBSITE_PATTERN).matcher(url);
+ if (matcher.matches()) {
+ url = OsmApi.getOsmApi().getBaseUrl() + "changeset/" + Long.parseLong(matcher.group(2)) + "/download";
+ }
+ downloadTask = new DownloadTask(new_layer, new OsmServerLocationReader(url), progressMonitor);
// Extract .osc filename from URL to set the new layer name
extractOsmFilename("https?://.*/(.*\\.osc)", url);
return Main.worker.submit(downloadTask);
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmIdTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmIdTask.java
new file mode 100644
index 0000000..61d4957
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmIdTask.java
@@ -0,0 +1,46 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.downloadtasks;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collections;
+import java.util.concurrent.Future;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.gui.io.DownloadPrimitivesWithReferrersTask;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+
+public class DownloadOsmIdTask extends DownloadOsmTask {
+
+ private static final String URL_ID_PATTERN = "https?://www\\.(osm|openstreetmap)\\.org/(node|way|relation)/(\\p{Digit}+).*";
+
+ @Override
+ public String[] getPatterns() {
+ return new String[]{URL_ID_PATTERN};
+ }
+
+ @Override
+ public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
+ final Matcher matcher = Pattern.compile(URL_ID_PATTERN).matcher(url);
+ if (matcher.matches()) {
+ final OsmPrimitiveType type = OsmPrimitiveType.from(matcher.group(2));
+ final long id = Long.parseLong(matcher.group(3));
+ final PrimitiveId primitiveId = new SimplePrimitiveId(id, type);
+ final DownloadPrimitivesWithReferrersTask downloadTask = new DownloadPrimitivesWithReferrersTask(
+ newLayer, Collections.singletonList(primitiveId), true, true, null, null);
+ return Main.worker.submit(downloadTask);
+ } else {
+ throw new IllegalStateException("Failed to parse id from " + url);
+ }
+ }
+
+ @Override
+ public String getTitle() {
+ return tr("Download OSM object by ID");
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java b/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java
index 1a2f839..442dffe 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java
@@ -3,9 +3,11 @@ package org.openstreetmap.josm.actions.mapmode;
import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.coor.LatLon;
@@ -14,6 +16,7 @@ import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.NoteInputDialog;
import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.gui.dialogs.NotesDialog;
+import org.openstreetmap.josm.gui.util.KeyPressReleaseListener;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -21,7 +24,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
* Map mode to add a new note. Listens for a mouse click and then
* prompts the user for text and adds a note to the note layer
*/
-public class AddNoteAction extends MapMode {
+public class AddNoteAction extends MapMode implements KeyPressReleaseListener {
private NoteData noteData;
@@ -47,16 +50,22 @@ public class AddNoteAction extends MapMode {
public void enterMode() {
super.enterMode();
Main.map.mapView.addMouseListener(this);
+ Main.map.keyDetector.addKeyListener(this);
}
@Override
public void exitMode() {
super.exitMode();
Main.map.mapView.removeMouseListener(this);
+ Main.map.keyDetector.removeKeyListener(this);
}
@Override
public void mouseClicked(MouseEvent e) {
+ if (!SwingUtilities.isLeftMouseButton(e)) {
+ // allow to pan without distraction
+ return;
+ }
Main.map.selectMapMode(Main.map.mapModeSelect);
LatLon latlon = Main.map.mapView.getLatLon(e.getPoint().x, e.getPoint().y);
@@ -76,4 +85,15 @@ public class AddNoteAction extends MapMode {
notification.show();
}
}
+
+ @Override
+ public void doKeyPressed(KeyEvent e) {
+ if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
+ Main.map.selectMapMode(Main.map.mapModeSelect);
+ }
+ }
+
+ @Override
+ public void doKeyReleased(KeyEvent e) {
+ }
}
diff --git a/src/org/openstreetmap/josm/actions/search/SearchAction.java b/src/org/openstreetmap/josm/actions/search/SearchAction.java
index d44bc46..a9e4266 100644
--- a/src/org/openstreetmap/josm/actions/search/SearchAction.java
+++ b/src/org/openstreetmap/josm/actions/search/SearchAction.java
@@ -268,13 +268,8 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
}
final JPanel right;
- if (Main.pref.getBoolean("dialog.search.new", true)) {
- right = new JPanel(new GridBagLayout());
- buildHintsNew(right, hcbSearchString);
- } else {
- right = new JPanel();
- buildHints(right);
- }
+ right = new JPanel(new GridBagLayout());
+ buildHints(right, hcbSearchString);
final JPanel p = new JPanel(new GridBagLayout());
p.add(top, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 5, 5, 0));
@@ -338,54 +333,7 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
return initialValues;
}
- private static void buildHints(JPanel right) {
- DescriptionTextBuilder descriptionText = new DescriptionTextBuilder();
- descriptionText.append("<html><style>li.header{font-size:110%; list-style-type:none; margin-top:5px;}</style><ul>");
- descriptionText.appendItem(tr("<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"));
- descriptionText.appendItem(tr("<b>\"Baker Street\"</b> - ''Baker Street'' in any key"));
- descriptionText.appendItem(tr("<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"));
- descriptionText.appendItem(tr("<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"));
- descriptionText.appendItem(tr("<b>key=value</b> - key ''key'' with value exactly ''value''"));
- descriptionText.appendItem(tr("<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, <b>key=</b>, <b>*=*</b>, <b>*=</b>"));
- descriptionText.appendItem(tr("<b>key:</b> - key ''key'' set to any value"));
- descriptionText.appendItem(tr("<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"));
- if(Main.pref.getBoolean("expert", false))
- {
- descriptionText.appendItemHeader(tr("Special targets"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, <b>relation</b>)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>user:</b>... - objects changed by user"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>user:anonymous</b> - objects changed by anonymous users"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>id:</b>... - objects with given ID (0 for new objects)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>version:</b>... - objects with given version (0 objects without an assigned version)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>changeset:</b>... - objects with given changeset ID (0 objects without an assigned changeset)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, <b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, <b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>role:</b>... - objects with given role in a relation"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>timestamp:</b>timestamp - objects with this last modification timestamp (2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>timestamp:</b>min/max - objects with last modification within range"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>areasize:</b>... - closed ways with given area in m\u00b2 (<b>areasize:</b>min-max or <b>areasize:</b>max)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>modified</b> - all changed objects"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>selected</b> - all selected objects"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>incomplete</b> - all incomplete objects"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>untagged</b> - all untagged objects"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>closed</b> - all closed ways (a node is not considered closed)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>child <i>expr</i></b> - all children of objects matching the expression"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>parent <i>expr</i></b> - all parents of objects matching the expression"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation members) in downloaded area"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>(all)inview</b> - objects (and all its way nodes / relation members) in current view"));
- }
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("Use <b>|</b> or <b>OR</b> to combine with logical or"));
- descriptionText.appendItem(tr("Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)")
- + "<br/>"
- + tr("Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."));
- descriptionText.appendItem(tr("Use <b>(</b> and <b>)</b> to group expressions"));
- descriptionText.append("</ul></html>");
- JLabel description = new JLabel(descriptionText.toString());
- description.setFont(description.getFont().deriveFont(Font.PLAIN));
- right.add(description);
- }
-
- private static void buildHintsNew(JPanel right, HistoryComboBox hcbSearchString) {
+ private static void buildHints(JPanel right, HistoryComboBox hcbSearchString) {
right.add(new SearchKeywordRow(hcbSearchString)
.addTitle(tr("basic examples"))
.addKeyword(tr("Baker Street"), null, tr("''Baker'' and ''Street'' in any key"))
@@ -400,6 +348,7 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
.addKeyword("*=<i>value</i>", null, tr("''value'' in any key"))
.addKeyword("<i>key</i>=", null, tr("matches if ''key'' exists"))
.addKeyword("<i>key</i>><i>value</i>", null, tr("matches if ''key'' is greater than ''value'' (analogously, less than)"))
+ .addKeyword("\"key\"=\"value\"", "\"\"=\"\"", tr("to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."), "\"addr:street\"")
, GBC.eol());
right.add(new SearchKeywordRow(hcbSearchString)
.addTitle(tr("combinators"))
@@ -408,7 +357,6 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
.addKeyword("<i>expr</i> OR <i>expr</i>", "OR ", tr("logical or (at least one expression has to be satisfied)"))
.addKeyword("-<i>expr</i>", null, tr("logical not"))
.addKeyword("(<i>expr</i>)", "()", tr("use parenthesis to group expressions"))
- .addKeyword("\"key\"=\"value\"", "\"\"=\"\"", tr("to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."), "\"addr:street\"")
, GBC.eol());
if (Main.pref.getBoolean("expert", false)) {
@@ -430,10 +378,12 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
, GBC.eol());
right.add(new SearchKeywordRow(hcbSearchString)
.addTitle(tr("properties"))
- .addKeyword("nodes:<i>20-</i>", "nodes:", tr("objects with at least 20 nodes"))
+ .addKeyword("nodes:<i>20-</i>", "nodes:", tr("ways with at least 20 nodes, or relations containing at least 20 nodes"))
+ .addKeyword("ways:<i>3-</i>", "ways:", tr("nodes with at least 3 referring ways, or relations containing at least 3 ways"))
.addKeyword("tags:<i>5-10</i>", "tags:", tr("objects having 5 to 10 tags"))
.addKeyword("role:", "role:", tr("objects with given role in a relation"))
.addKeyword("areasize:<i>-100</i>", "areasize:", tr("closed ways with an area of 100 m\u00b2"))
+ .addKeyword("waylength:<i>200-</i>", "waylength:", tr("ways with a length of 200 m or more"))
, GBC.eol());
right.add(new SearchKeywordRow(hcbSearchString)
.addTitle(tr("state"))
@@ -446,7 +396,7 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
.addTitle(tr("related objects"))
.addKeyword("child <i>expr</i>", "child ", tr("all children of objects matching the expression"), "child building")
.addKeyword("parent <i>expr</i>", "parent ", tr("all parents of objects matching the expression"), "parent bus_stop")
- .addKeyword("nth:<i>7</i>", "nth: ", tr("n-th member of relation and/or n-th node of way"), "nth:5 (child type:relation)")
+ .addKeyword("nth:<i>7</i>", "nth: ", tr("n-th member of relation and/or n-th node of way"), "nth:5 (child type:relation)", "nth:-1")
.addKeyword("nth%:<i>7</i>", "nth%: ", tr("every n-th member of relation and/or every n-th node of way"), "nth%:100 (child waterway)")
, GBC.eol());
right.add(new SearchKeywordRow(hcbSearchString)
diff --git a/src/org/openstreetmap/josm/actions/search/SearchCompiler.java b/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
index 767f86f..5e64226 100644
--- a/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
+++ b/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
@@ -28,6 +28,7 @@ import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.tools.Geometry;
import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.date.DateUtils;
/**
@@ -98,7 +99,7 @@ public class SearchCompiler {
public class CoreSimpleMatchFactory implements SimpleMatchFactory {
private Collection<String> keywords = Arrays.asList("id", "version",
- "changeset", "nodes", "tags", "areasize", "modified", "selected",
+ "changeset", "nodes", "ways", "tags", "areasize", "waylength", "modified", "selected",
"incomplete", "untagged", "closed", "new", "indownloadedarea",
"allindownloadedarea", "inview", "allinview", "timestamp", "nth", "nth%");
@@ -136,10 +137,14 @@ public class SearchCompiler {
return new ChangesetId(tokenizer);
case "nodes":
return new NodeCountRange(tokenizer);
+ case "ways":
+ return new WayCountRange(tokenizer);
case "tags":
return new TagCountRange(tokenizer);
case "areasize":
return new AreaSize(tokenizer);
+ case "waylength":
+ return new WayLength(tokenizer);
case "nth":
return new Nth(tokenizer, false);
case "nth%":
@@ -840,9 +845,6 @@ public class SearchCompiler {
}
private Nth(int nth, boolean modulo) throws ParseError {
- if (nth <= 0) {
- throw new ParseError(tr("Positive integer expected"));
- }
this.nth = nth;
this.modulo = modulo;
}
@@ -850,22 +852,31 @@ public class SearchCompiler {
@Override
public boolean match(OsmPrimitive osm) {
for (OsmPrimitive p : osm.getReferrers()) {
- Integer idx = null;
+ final int idx;
+ final int maxIndex;
if (p instanceof Way) {
Way w = (Way) p;
idx = w.getNodes().indexOf(osm);
+ maxIndex = w.getNodesCount();
} else if (p instanceof Relation) {
Relation r = (Relation) p;
idx = r.getMemberPrimitivesList().indexOf(osm);
+ maxIndex = r.getMembersCount();
+ } else {
+ continue;
}
- if (idx != null) {
- if (idx.intValue() == nth || (modulo && idx.intValue() % nth == 0)) {
- return true;
- }
- }
+ if (nth < 0 && idx - maxIndex == nth) {
+ return true;
+ } else if (idx == nth || (modulo && idx % nth == 0))
+ return true;
}
return false;
}
+
+ @Override
+ public String toString() {
+ return "Nth{nth=" + nth + ", modulo=" + modulo + '}';
+ }
}
/**
@@ -919,10 +930,13 @@ public class SearchCompiler {
@Override
protected Long getNumber(OsmPrimitive osm) {
- if (!(osm instanceof Way))
- return null;
- else
+ if (osm instanceof Way) {
return (long) ((Way) osm).getRealNodesCount();
+ } else if (osm instanceof Relation) {
+ return (long) ((Relation) osm).getMemberPrimitives(Node.class).size();
+ } else {
+ return null;
+ }
}
@Override
@@ -932,6 +946,35 @@ public class SearchCompiler {
}
/**
+ * Matches objects with the number of referring/contained ways in the given range
+ */
+ private static class WayCountRange extends RangeMatch {
+ public WayCountRange(Range range) {
+ super(range);
+ }
+
+ public WayCountRange(PushbackTokenizer tokenizer) throws ParseError {
+ this(tokenizer.readRange(tr("Range of numbers expected")));
+ }
+
+ @Override
+ protected Long getNumber(OsmPrimitive osm) {
+ if (osm instanceof Node) {
+ return (long) Utils.filteredCollection(osm.getReferrers(), Way.class).size();
+ } else if (osm instanceof Relation) {
+ return (long) ((Relation) osm).getMemberPrimitives(Way.class).size();
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ protected String getString() {
+ return "ways";
+ }
+ }
+
+ /**
* Matches objects with a number of tags in given range
*/
private static class TagCountRange extends RangeMatch {
@@ -1114,6 +1157,33 @@ public class SearchCompiler {
}
/**
+ * Matches if the length of a way is within the given range
+ */
+ private static class WayLength extends RangeMatch {
+
+ public WayLength(Range range) {
+ super(range);
+ }
+
+ public WayLength(PushbackTokenizer tokenizer) throws ParseError {
+ this(tokenizer.readRange(tr("Range of numbers expected")));
+ }
+
+ @Override
+ protected Long getNumber(OsmPrimitive osm) {
+ if (!(osm instanceof Way))
+ return null;
+ Way way = (Way) osm;
+ return (long) way.getLength();
+ }
+
+ @Override
+ protected String getString() {
+ return "waylength";
+ }
+ }
+
+ /**
* Matches objects within the given bounds.
*/
private abstract static class InArea extends Match {
diff --git a/src/org/openstreetmap/josm/actions/upload/FixDataHook.java b/src/org/openstreetmap/josm/actions/upload/FixDataHook.java
index b1de040..453ac6c 100644
--- a/src/org/openstreetmap/josm/actions/upload/FixDataHook.java
+++ b/src/org/openstreetmap/josm/actions/upload/FixDataHook.java
@@ -82,17 +82,14 @@ public class FixDataHook implements UploadHook {
boolean drop = k.isEmpty() || v.isEmpty();
if(!e.getKey().equals(k)) {
if(drop || !keys.containsKey(k)) {
- newKeys.remove(e.getKey());
+ newKeys.put(e.getKey(), null);
if(!drop)
newKeys.put(k, v);
}
} else if(!e.getValue().equals(v)) {
- if(v.isEmpty())
- newKeys.remove(k);
- else
- newKeys.put(k, v);
+ newKeys.put(k, v.isEmpty() ? null : v);
} else if (drop) {
- newKeys.remove(e.getKey());
+ newKeys.put(e.getKey(), null);
}
}
boolean changed = !keys.equals(newKeys);
@@ -128,7 +125,10 @@ public class FixDataHook implements UploadHook {
public boolean fixKeys(Map<String, String> keys, OsmPrimitive osm) {
if(keys.containsKey(oldKey) && !keys.containsKey(newKey)) {
keys.put(newKey, keys.get(oldKey));
- keys.remove(oldKey);
+ keys.put(oldKey, null);
+ return true;
+ } else if(keys.containsKey(oldKey) && keys.containsKey(newKey) && keys.get(oldKey).equals(keys.get(newKey))) {
+ keys.put(oldKey, null);
return true;
}
return false;
@@ -165,10 +165,11 @@ public class FixDataHook implements UploadHook {
@Override
public boolean fixKeys(Map<String, String> keys, OsmPrimitive osm) {
- if(oldValue.equals(keys.get(oldKey)) && (newKey.equals(oldKey) || !keys.containsKey(newKey))) {
+ if(oldValue.equals(keys.get(oldKey)) && (newKey.equals(oldKey)
+ || !keys.containsKey(newKey) || keys.get(newKey).equals(newValue))) {
keys.put(newKey, newValue);
if(!newKey.equals(oldKey))
- keys.remove(oldKey);
+ keys.put(oldKey, null);
return true;
}
return false;
@@ -188,7 +189,7 @@ public class FixDataHook implements UploadHook {
Collection<Command> cmds = new LinkedList<>();
for (OsmPrimitive osm : objectsToUpload) {
- Map<String, String> keys = osm.getKeys();
+ HashMap<String, String> keys = new HashMap<>(osm.getKeys());
if(!keys.isEmpty()) {
boolean modified = false;
for (FixData fix : deprecated) {
@@ -196,7 +197,7 @@ public class FixDataHook implements UploadHook {
modified = true;
}
if(modified)
- cmds.add(new ChangePropertyCommand(Collections.singleton(osm), new HashMap<>(keys)));
+ cmds.add(new ChangePropertyCommand(Collections.singleton(osm), keys));
}
}
diff --git a/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java b/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
index d4b61d7..e95f08b 100644
--- a/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
+++ b/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
@@ -122,6 +122,12 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
} else if (OsmUtils.isTrue(value)) {
newValue = OsmUtils.reverseval;
}
+ for (StringSwitcher prefixSuffixSwitcher : stringSwitchers) {
+ newKey = prefixSuffixSwitcher.apply(key);
+ if (!key.equals(newKey)) {
+ break;
+ }
+ }
} else if (key.startsWith("incline") || key.endsWith("incline")
|| key.startsWith("direction") || key.endsWith("direction")) {
newValue = UP_DOWN.apply(value);
@@ -131,7 +137,6 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
} else if (key.endsWith(":forward") || key.endsWith(":backward")) {
// Change key but not left/right value (fix #8518)
newKey = FORWARD_BACKWARD.apply(key);
-
} else if (!ignoreKeyForCorrection(key)) {
for (StringSwitcher prefixSuffixSwitcher : stringSwitchers) {
newKey = prefixSuffixSwitcher.apply(key);
diff --git a/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java b/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java
new file mode 100644
index 0000000..63a765f
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java
@@ -0,0 +1,91 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.cache;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+
+
+/**
+ * Cache Entry that has methods to get the BufferedImage, that will be cached along in memory
+ * but will be not serialized when saved to the disk (to avoid duplication of data)
+ * @author Wiktor Niesiobędzki
+ *
+ */
+public class BufferedImageCacheEntry extends CacheEntry {
+ private static final long serialVersionUID = 1L; //version
+ // transient to avoid serialization, volatile to avoid synchronization of whole getImage() method
+ private transient volatile BufferedImage img = null;
+ private transient volatile boolean writtenToDisk = false;
+
+ /**
+ *
+ * @param content byte array containing image
+ */
+ public BufferedImageCacheEntry(byte[] content) {
+ super(content);
+ }
+
+ /**
+ * Returns BufferedImage from for the content. Subsequent calls will return the same instance,
+ * to reduce overhead of ImageIO
+ *
+ * @return BufferedImage of cache entry content
+ * @throws IOException
+ */
+ public BufferedImage getImage() throws IOException {
+ if (img != null)
+ return img;
+ synchronized(this) {
+ if (img != null)
+ return img;
+ byte[] content = getContent();
+ if (content != null) {
+ img = ImageIO.read(new ByteArrayInputStream(content));
+
+ if (writtenToDisk)
+ content = null;
+ }
+
+ }
+ return img;
+ }
+
+
+ private void writeObject(java.io.ObjectOutputStream out) throws IOException {
+ /*
+ * This method below will be needed, if Apache Commons JCS (or any other caching system), will update
+ * disk representation of object from memory, once it is put into the cache (for example - at closing the cache)
+ *
+ * For now it is not the case, as we use DiskUsagePattern.UPDATE, which on JCS shutdown doesn't write again memory
+ * contents to file, so the fact, that we've cleared never gets saved to the disk
+ *
+ * This method is commented out, as it will convert all cache entries to PNG files regardless of what was returned.
+ * It might cause recompression/change of format which may result in decreased quality of imagery
+ */
+ /* synchronized (this) {
+ if (content == null && img != null) {
+ ByteArrayOutputStream restoredData = new ByteArrayOutputStream();
+ ImageIO.write(img, "png", restoredData);
+ content = restoredData.toByteArray();
+ }
+ out.writeObject(this);
+ }
+ */
+ synchronized (this) {
+ if (content == null && img != null) {
+ throw new AssertionError("Trying to serialize (save to disk?) an BufferedImageCacheEntry that was converted to BufferedImage and no raw data is present anymore");
+ }
+ out.writeObject(this);
+ // ugly hack to wait till element will get to disk to clean the memory
+ writtenToDisk = true;
+
+ if (img != null) {
+ content = null;
+ }
+
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/cache/CacheEntry.java b/src/org/openstreetmap/josm/data/cache/CacheEntry.java
new file mode 100644
index 0000000..afaad0f
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/cache/CacheEntry.java
@@ -0,0 +1,29 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.cache;
+
+import java.io.Serializable;
+
+/**
+ * @author Wiktor Niesiobędzki
+ *
+ * Class that will hold JCS cache entries
+ *
+ */
+public class CacheEntry implements Serializable {
+ private static final long serialVersionUID = 1L; //version
+ protected byte[] content;
+
+ /**
+ * @param content of the cache entry
+ */
+ public CacheEntry(byte[] content) {
+ this.content = content;
+ }
+
+ /**
+ * @return cache entry content
+ */
+ public byte[] getContent() {
+ return content;
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java b/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java
new file mode 100644
index 0000000..94e7b1b
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java
@@ -0,0 +1,66 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.cache;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.jcs.engine.ElementAttributes;
+
+/**
+ * Class that contains attirubtes for JCS cache entries. Parameters are used to properly handle HTTP caching
+ *
+ * @author Wiktor Niesiobędzki
+ *
+ */
+public class CacheEntryAttributes extends ElementAttributes {
+ private static final long serialVersionUID = 1L; //version
+ private Map<String, String> attrs = new HashMap<String, String>();
+ private final static String NO_TILE_AT_ZOOM = "noTileAtZoom";
+ private final static String ETAG = "Etag";
+ private final static String LAST_MODIFICATION = "lastModification";
+ private final static String EXPIRATION_TIME = "expirationTime";
+
+ public CacheEntryAttributes() {
+ super();
+ attrs.put(NO_TILE_AT_ZOOM, "false");
+ attrs.put(ETAG, null);
+ attrs.put(LAST_MODIFICATION, "0");
+ attrs.put(EXPIRATION_TIME, "0");
+ }
+
+ public boolean isNoTileAtZoom() {
+ return Boolean.toString(true).equals(attrs.get(NO_TILE_AT_ZOOM));
+ }
+ public void setNoTileAtZoom(boolean noTileAtZoom) {
+ attrs.put(NO_TILE_AT_ZOOM, Boolean.toString(noTileAtZoom));
+ }
+ public String getEtag() {
+ return attrs.get(ETAG);
+ }
+ public void setEtag(String etag) {
+ attrs.put(ETAG, etag);
+ }
+
+ private long getLongAttr(String key) {
+ try {
+ return Long.parseLong(attrs.get(key));
+ } catch (NumberFormatException e) {
+ attrs.put(key, "0");
+ return 0;
+ }
+ }
+
+ public long getLastModification() {
+ return getLongAttr(LAST_MODIFICATION);
+ }
+ public void setLastModification(long lastModification) {
+ attrs.put(LAST_MODIFICATION, Long.toString(lastModification));
+ }
+ public long getExpirationTime() {
+ return getLongAttr(EXPIRATION_TIME);
+ }
+ public void setExpirationTime(long expirationTime) {
+ attrs.put(EXPIRATION_TIME, Long.toString(expirationTime));
+ }
+
+}
diff --git a/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java b/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java
new file mode 100644
index 0000000..4fd24c4
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java
@@ -0,0 +1,47 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.cache;
+
+import java.net.URL;
+
+
+/**
+ *
+ * @author Wiktor Niesiobędzki
+ *
+ * @param <K> cache key type
+ */
+public interface ICachedLoaderJob<K> {
+ /**
+ * returns cache entry key
+ *
+ * @param tile
+ * @return cache key for tile
+ */
+ public K getCacheKey();
+
+ /**
+ * method to get download URL for Job
+ * @return URL that should be fetched
+ *
+ */
+ public URL getUrl();
+ /**
+ * implements the main algorithm for fetching
+ */
+ public void run();
+
+ /**
+ * fetches object from cache, or returns null when object is not found
+ *
+ * @return filled tile with data or null when no cache entry found
+ */
+ public CacheEntry get();
+
+ /**
+ * Submit job for background fetch, and listener will be
+ * fed with value object
+ *
+ * @param listener
+ */
+ public void submit(ICachedLoaderListener listener);
+}
diff --git a/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java b/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java
new file mode 100644
index 0000000..fe26c09
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java
@@ -0,0 +1,26 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.cache;
+
+public interface ICachedLoaderListener {
+
+ /**
+ * Result of download
+ *
+ */
+ enum LoadResult {
+ SUCCESS,
+ FAILURE,
+ REJECTED
+ }
+ /**
+ * Will be called when K object processed. The result might be:
+ * LoadResult.SUCCESS when object was fetched
+ * LoadResult.FAILURE when there was a failure during download
+ * LoadResult.REJECTED when job was rejected because of full queue
+ *
+ * @param data
+ * @param result
+ */
+ public void loadingFinished(CacheEntry data, LoadResult result);
+
+}
diff --git a/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java b/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
new file mode 100644
index 0000000..8f3f70d
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
@@ -0,0 +1,194 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.cache;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.channels.FileLock;
+import java.text.MessageFormat;
+import java.util.Properties;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+
+import org.apache.commons.jcs.access.CacheAccess;
+import org.apache.commons.jcs.auxiliary.AuxiliaryCache;
+import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCache;
+import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes;
+import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory;
+import org.apache.commons.jcs.engine.CompositeCacheAttributes;
+import org.apache.commons.jcs.engine.behavior.ICompositeCacheAttributes.DiskUsagePattern;
+import org.apache.commons.jcs.engine.control.CompositeCache;
+import org.apache.commons.jcs.engine.control.CompositeCacheManager;
+import org.apache.commons.jcs.utils.serialization.StandardSerializer;
+import org.openstreetmap.gui.jmapviewer.FeatureAdapter;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.preferences.IntegerProperty;
+
+
+/**
+ * @author Wiktor Niesiobędzki
+ *
+ * Wrapper class for JCS Cache. Sets some sane environment and returns instances of cache objects.
+ * Static configuration for now assumes some small LRU cache in memory and larger LRU cache on disk
+ *
+ */
+public class JCSCacheManager {
+ private static final Logger log = FeatureAdapter.getLogger(JCSCacheManager.class.getCanonicalName());
+
+ private static volatile CompositeCacheManager cacheManager = null;
+ private static long maxObjectTTL = Long.MAX_VALUE;
+ private final static String PREFERENCE_PREFIX = "jcs.cache";
+ private final static IndexedDiskCacheFactory diskCacheFactory = new IndexedDiskCacheFactory();
+ private static FileLock cacheDirLock = null;
+
+ /**
+ * default objects to be held in memory by JCS caches (per region)
+ */
+ public static final IntegerProperty DEFAULT_MAX_OBJECTS_IN_MEMORY = new IntegerProperty(PREFERENCE_PREFIX + ".max_objects_in_memory", 1000);
+
+ @SuppressWarnings("resource")
+ private static void initialize() throws IOException {
+ File cacheDir = new File(Main.pref.getCacheDirectory(), "jcs");
+
+ if ((!cacheDir.exists() && !cacheDir.mkdirs()))
+ throw new IOException("Cannot access cache directory");
+
+ File cacheDirLockPath = new File(cacheDir, ".lock");
+ if (!cacheDirLockPath.exists())
+ cacheDirLockPath.createNewFile();
+ cacheDirLock = new FileOutputStream(cacheDirLockPath).getChannel().tryLock();
+
+ if (cacheDirLock == null)
+ log.log(Level.WARNING, "Cannot lock cache directory. Will not use disk cache");
+
+ // raising logging level gives ~500x performance gain
+ // http://westsworld.dk/blog/2008/01/jcs-and-performance/
+ Logger jcsLog = Logger.getLogger("org.apache.commons.jcs");
+ jcsLog.setLevel(Level.INFO);
+ jcsLog.setUseParentHandlers(false);
+ //Logger.getLogger("org.apache.common").setUseParentHandlers(false);
+ // we need a separate handler from Main's, as we downgrade LEVEL.INFO to DEBUG level
+ jcsLog.addHandler(new Handler() {
+ @Override
+ public void publish(LogRecord record) {
+ String msg = MessageFormat.format(record.getMessage(), record.getParameters());
+ if (record.getLevel().intValue() >= Level.SEVERE.intValue()) {
+ Main.error(msg);
+ } else if (record.getLevel().intValue() >= Level.WARNING.intValue()) {
+ Main.warn(msg);
+ // downgrade INFO level to debug, as JCS is too verbose at INFO level
+ } else if (record.getLevel().intValue() >= Level.INFO.intValue()) {
+ Main.debug(msg);
+ } else {
+ Main.trace(msg);
+ }
+ }
+
+ @Override
+ public void flush() {
+ }
+
+ @Override
+ public void close() throws SecurityException {
+ }
+ });
+
+
+ CompositeCacheManager cm = CompositeCacheManager.getUnconfiguredInstance();
+ // this could be moved to external file
+ Properties props = new Properties();
+ // these are default common to all cache regions
+ // use of auxiliary cache and sizing of the caches is done with giving proper geCache(...) params
+ props.setProperty("jcs.default.cacheattributes", org.apache.commons.jcs.engine.CompositeCacheAttributes.class.getCanonicalName());
+ props.setProperty("jcs.default.cacheattributes.MaxObjects", DEFAULT_MAX_OBJECTS_IN_MEMORY.get().toString());
+ props.setProperty("jcs.default.cacheattributes.UseMemoryShrinker", "true");
+ props.setProperty("jcs.default.cacheattributes.DiskUsagePatternName", "UPDATE"); // store elements on disk on put
+ props.setProperty("jcs.default.elementattributes", CacheEntryAttributes.class.getCanonicalName());
+ props.setProperty("jcs.default.elementattributes.IsEternal", "false");
+ props.setProperty("jcs.default.elementattributes.MaxLife", Long.toString(maxObjectTTL));
+ props.setProperty("jcs.default.elementattributes.IdleTime", Long.toString(maxObjectTTL));
+ props.setProperty("jcs.default.elementattributes.IsSpool", "true");
+ cm.configure(props);
+ cacheManager = cm;
+
+ }
+
+ /**
+ * Returns configured cache object for named cache region
+ * @param cacheName region name
+ * @return cache access object
+ * @throws IOException if directory is not found
+ */
+ public static <K,V> CacheAccess<K, V> getCache(String cacheName) throws IOException {
+ return getCache(cacheName, DEFAULT_MAX_OBJECTS_IN_MEMORY.get().intValue(), 0, null);
+ }
+
+ /**
+ * Returns configured cache object with defined limits of memory cache and disk cache
+ * @param cacheName region name
+ * @param maxMemoryObjects number of objects to keep in memory
+ * @param maxDiskObjects number of objects to keep on disk (if cachePath provided)
+ * @param cachePath path to disk cache. if null, no disk cache will be created
+ * @return cache access object
+ * @throws IOException if directory is not found
+ */
+ public static <K,V> CacheAccess<K, V> getCache(String cacheName, int maxMemoryObjects, int maxDiskObjects, String cachePath) throws IOException {
+ if (cacheManager != null)
+ return getCacheInner(cacheName, maxMemoryObjects, maxDiskObjects, cachePath);
+
+ synchronized (JCSCacheManager.class) {
+ if (cacheManager == null)
+ initialize();
+ return getCacheInner(cacheName, maxMemoryObjects, maxDiskObjects, cachePath);
+ }
+ }
+
+
+ @SuppressWarnings("unchecked")
+ private static <K,V> CacheAccess<K, V> getCacheInner(String cacheName, int maxMemoryObjects, int maxDiskObjects, String cachePath) {
+ CompositeCache<K, V> cc = cacheManager.getCache(cacheName, getCacheAttributes(maxMemoryObjects));
+
+ if (cachePath != null && cacheDirLock != null) {
+ IndexedDiskCacheAttributes diskAttributes = getDiskCacheAttributes(maxDiskObjects, cachePath);
+ diskAttributes.setCacheName(cacheName);
+ IndexedDiskCache<K, V> diskCache = diskCacheFactory.createCache(diskAttributes, cacheManager, null, new StandardSerializer());
+
+ cc.setAuxCaches(new AuxiliaryCache[]{diskCache});
+ }
+ return new CacheAccess<K, V>(cc);
+ }
+
+ /**
+ * Close all files to ensure, that all indexes and data are properly written
+ */
+ public static void shutdown() {
+ // use volatile semantics to get consistent object
+ CompositeCacheManager localCacheManager = cacheManager;
+ if (localCacheManager != null) {
+ localCacheManager.shutDown();
+ }
+ }
+
+ private static IndexedDiskCacheAttributes getDiskCacheAttributes(int maxDiskObjects, String cachePath) {
+ IndexedDiskCacheAttributes ret = new IndexedDiskCacheAttributes();
+ ret.setMaxKeySize(maxDiskObjects);
+ if (cachePath != null) {
+ File path = new File(cachePath);
+ if (!path.exists() && !path.mkdirs()) {
+ log.log(Level.WARNING, "Failed to create cache path: {0}", cachePath);
+ } else {
+ ret.setDiskPath(path);
+ }
+ }
+ return ret;
+ }
+
+ private static CompositeCacheAttributes getCacheAttributes(int maxMemoryElements) {
+ CompositeCacheAttributes ret = new CompositeCacheAttributes();
+ ret.setMaxObjects(maxMemoryElements);
+ ret.setDiskUsagePattern(DiskUsagePattern.UPDATE);
+ return ret;
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java b/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
new file mode 100644
index 0000000..478004b
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
@@ -0,0 +1,422 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.cache;
+
+import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.commons.jcs.access.behavior.ICacheAccess;
+import org.apache.commons.jcs.engine.behavior.ICacheElement;
+import org.openstreetmap.gui.jmapviewer.FeatureAdapter;
+import org.openstreetmap.josm.data.cache.ICachedLoaderListener.LoadResult;
+import org.openstreetmap.josm.data.preferences.IntegerProperty;
+
+/**
+ * @author Wiktor Niesiobędzki
+ *
+ * @param <K> cache entry key type
+ *
+ * Generic loader for HTTP based tiles. Uses custom attribute, to check, if entry has expired
+ * according to HTTP headers sent with tile. If so, it tries to verify using Etags
+ * or If-Modified-Since / Last-Modified.
+ *
+ * If the tile is not valid, it will try to download it from remote service and put it
+ * to cache. If remote server will fail it will try to use stale entry.
+ *
+ * This class will keep only one Job running for specified tile. All others will just finish, but
+ * listeners will be gathered and notified, once download job will be finished
+ */
+public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements ICachedLoaderJob<K>, Runnable {
+ private static final Logger log = FeatureAdapter.getLogger(JCSCachedTileLoaderJob.class.getCanonicalName());
+ protected static final long DEFAULT_EXPIRE_TIME = 1000L * 60 * 60 * 24 * 7; // 7 days
+ // Limit for the max-age value send by the server.
+ protected static final long EXPIRE_TIME_SERVER_LIMIT = 1000L * 60 * 60 * 24 * 28; // 4 weeks
+ // Absolute expire time limit. Cached tiles that are older will not be used,
+ // even if the refresh from the server fails.
+ protected static final long ABSOLUTE_EXPIRE_TIME_LIMIT = Long.MAX_VALUE; // unlimited
+
+ /**
+ * maximum download threads that will be started
+ */
+ public static IntegerProperty THREAD_LIMIT = new IntegerProperty("cache.jcs.max_threads", 10);
+ private static Executor DOWNLOAD_JOB_DISPATCHER = new ThreadPoolExecutor(
+ 2, // we have a small queue, so threads will be quickly started (threads are started only, when queue is full)
+ THREAD_LIMIT.get().intValue(), // do not this number of threads
+ 30, // keepalive for thread
+ TimeUnit.SECONDS,
+ // make queue of LIFO type - so recently requested tiles will be loaded first (assuming that these are which user is waiting to see)
+ new LinkedBlockingDeque<Runnable>(5) {
+ /* keep the queue size fairly small, we do not want to
+ download a lot of tiles, that user is not seeing anyway */
+ @Override
+ public boolean offer(Runnable t) {
+ return super.offerFirst(t);
+ }
+
+ @Override
+ public Runnable remove() {
+ return super.removeFirst();
+ }
+ }
+ );
+ private static ConcurrentMap<String,Set<ICachedLoaderListener>> inProgress = new ConcurrentHashMap<>();
+ private static ConcurrentMap<String, Boolean> useHead = new ConcurrentHashMap<>();
+
+ private long now; // when the job started
+
+ private ICacheAccess<K, V> cache;
+ private ICacheElement<K, V> cacheElement;
+ protected V cacheData = null;
+ protected CacheEntryAttributes attributes = null;
+
+ // HTTP connection parameters
+ private int connectTimeout;
+ private int readTimeout;
+ private Map<String, String> headers;
+
+ /**
+ * @param cache cache instance that we will work on
+ * @param headers
+ * @param readTimeout
+ * @param connectTimeout
+ */
+ public JCSCachedTileLoaderJob(ICacheAccess<K,V> cache,
+ int connectTimeout, int readTimeout,
+ Map<String, String> headers) {
+
+ this.cache = cache;
+ this.now = System.currentTimeMillis();
+ this.connectTimeout = connectTimeout;
+ this.readTimeout = readTimeout;
+ this.headers = headers;
+ }
+
+ private void ensureCacheElement() {
+ if (cacheElement == null && getCacheKey() != null) {
+ cacheElement = cache.getCacheElement(getCacheKey());
+ if (cacheElement != null) {
+ attributes = (CacheEntryAttributes) cacheElement.getElementAttributes();
+ cacheData = cacheElement.getVal();
+ }
+ }
+ }
+
+ public V get() {
+ ensureCacheElement();
+ return cacheData;
+ }
+
+ @Override
+ public void submit(ICachedLoaderListener listener) {
+ boolean first = false;
+ URL url = getUrl();
+ String deduplicationKey = null;
+ if (url != null) {
+ // url might be null, for example when Bing Attribution is not loaded yet
+ deduplicationKey = url.toString();
+ }
+ if (deduplicationKey == null) {
+ log.log(Level.WARNING, "No url returned for: {0}, skipping", getCacheKey());
+ return;
+ }
+ synchronized (inProgress) {
+ Set<ICachedLoaderListener> newListeners = inProgress.get(deduplicationKey);
+ if (newListeners == null) {
+ newListeners = new HashSet<>();
+ inProgress.put(deduplicationKey, newListeners);
+ first = true;
+ }
+ newListeners.add(listener);
+ }
+
+ if (first) {
+ ensureCacheElement();
+ if (cacheElement != null && isCacheElementValid() && (isObjectLoadable())) {
+ // we got something in cache, and it's valid, so lets return it
+ log.log(Level.FINE, "JCS - Returning object from cache: {0}", getCacheKey());
+ finishLoading(LoadResult.SUCCESS);
+ return;
+ }
+ // object not in cache, so submit work to separate thread
+ try {
+ // use getter method, so subclasses may override executors, to get separate thread pool
+ getDownloadExecutor().execute(JCSCachedTileLoaderJob.this);
+ } catch (RejectedExecutionException e) {
+ // queue was full, try again later
+ log.log(Level.FINE, "JCS - rejected job for: {0}", getCacheKey());
+ finishLoading(LoadResult.REJECTED);
+ }
+ }
+ }
+
+ /**
+ *
+ * @return checks if object from cache has sufficient data to be returned
+ */
+ protected boolean isObjectLoadable() {
+ byte[] content = cacheData.getContent();
+ return content != null && content.length > 0;
+ }
+
+ /**
+ *
+ * @return cache object as empty, regardless of what remote resource has returned (ex. based on headers)
+ */
+ protected boolean cacheAsEmpty() {
+ return false;
+ }
+
+ /**
+ * @return key under which discovered server settings will be kept
+ */
+ protected String getServerKey() {
+ return getUrl().getHost();
+ }
+
+ /**
+ * this needs to be non-static, so it can be overridden by subclasses
+ */
+ protected Executor getDownloadExecutor() {
+ return DOWNLOAD_JOB_DISPATCHER;
+ }
+
+
+ public void run() {
+ final Thread currentThread = Thread.currentThread();
+ final String oldName = currentThread.getName();
+ currentThread.setName("JCS Downloading: " + getUrl());
+ try {
+ // try to load object from remote resource
+ if (loadObject()) {
+ finishLoading(LoadResult.SUCCESS);
+ } else {
+ // if loading failed - check if we can return stale entry
+ if (isObjectLoadable()) {
+ // try to get stale entry in cache
+ finishLoading(LoadResult.SUCCESS);
+ log.log(Level.FINE, "JCS - found stale object in cache: {0}", getUrl());
+ } else {
+ // failed completely
+ finishLoading(LoadResult.FAILURE);
+ }
+ }
+ } finally {
+ currentThread.setName(oldName);
+ }
+ }
+
+
+ private void finishLoading(LoadResult result) {
+ Set<ICachedLoaderListener> listeners = null;
+ synchronized (inProgress) {
+ listeners = inProgress.remove(getUrl().toString());
+ }
+ if (listeners == null) {
+ log.log(Level.WARNING, "Listener not found for URL: {0}. Listener not notified!", getUrl());
+ return;
+ }
+ try {
+ for (ICachedLoaderListener l: listeners) {
+ l.loadingFinished(cacheData, result);
+ }
+ } catch (Exception e) {
+ log.log(Level.WARNING, "JCS - Error while loading object from cache: {0}; {1}", new Object[]{e.getMessage(), getUrl()});
+ log.log(Level.FINE, "Stacktrace", e);
+ for (ICachedLoaderListener l: listeners) {
+ l.loadingFinished(cacheData, LoadResult.FAILURE);
+ }
+
+ }
+
+ }
+
+ private boolean isCacheElementValid() {
+ long expires = attributes.getExpirationTime();
+
+ // check by expire date set by server
+ if (expires != 0L) {
+ // put a limit to the expire time (some servers send a value
+ // that is too large)
+ expires = Math.min(expires, attributes.getCreateTime() + EXPIRE_TIME_SERVER_LIMIT);
+ if (now > expires) {
+ log.log(Level.FINE, "JCS - Object {0} has expired -> valid to {1}, now is: {2}", new Object[]{getUrl(), Long.toString(expires), Long.toString(now)});
+ return false;
+ }
+ } else {
+ // check by file modification date
+ if (now - attributes.getLastModification() > DEFAULT_EXPIRE_TIME) {
+ log.log(Level.FINE, "JCS - Object has expired, maximum file age reached {0}", getUrl());
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * @return true if object was successfully downloaded, false, if there was a loading failure
+ */
+
+ private boolean loadObject() {
+ try {
+ // if we have object in cache, and host doesn't support If-Modified-Since nor If-None-Match
+ // then just use HEAD request and check returned values
+ if (isObjectLoadable() &&
+ Boolean.TRUE.equals(useHead.get(getServerKey())) &&
+ isCacheValidUsingHead()) {
+ log.log(Level.FINE, "JCS - cache entry verified using HEAD request: {0}", getUrl());
+ return true;
+ }
+ URLConnection urlConn = getURLConnection();
+
+ if (isObjectLoadable() &&
+ (now - attributes.getLastModification()) <= ABSOLUTE_EXPIRE_TIME_LIMIT) {
+ urlConn.setIfModifiedSince(attributes.getLastModification());
+ }
+ if (isObjectLoadable() && attributes.getEtag() != null) {
+ urlConn.addRequestProperty("If-None-Match", attributes.getEtag());
+ }
+ if (urlConn instanceof HttpURLConnection && ((HttpURLConnection)urlConn).getResponseCode() == 304) {
+ // If isModifiedSince or If-None-Match has been set
+ // and the server answers with a HTTP 304 = "Not Modified"
+ log.log(Level.FINE, "JCS - IfModifiedSince/Etag test: local version is up to date: {0}", getUrl());
+ return true;
+ } else if (isObjectLoadable()) {
+ // we have an object in cache, but we haven't received 304 resposne code
+ // check if we should use HEAD request to verify
+ if((attributes.getEtag() != null && attributes.getEtag().equals(urlConn.getRequestProperty("ETag"))) ||
+ attributes.getLastModification() == urlConn.getLastModified()) {
+ // we sent ETag or If-Modified-Since, but didn't get 304 response code
+ // for further requests - use HEAD
+ String serverKey = getServerKey();
+ log.log(Level.INFO, "JCS - Host: {0} found not to return 304 codes for If-Modifed-Since or If-None-Match headers", serverKey);
+ useHead.put(serverKey, Boolean.TRUE);
+ }
+ }
+
+ attributes = parseHeaders(urlConn);
+
+ for (int i = 0; i < 5; ++i) {
+ if (urlConn instanceof HttpURLConnection && ((HttpURLConnection)urlConn).getResponseCode() == 503) {
+ Thread.sleep(5000+(new Random()).nextInt(5000));
+ continue;
+ }
+ byte[] raw = read(urlConn);
+
+ if (!cacheAsEmpty() && raw != null && raw.length > 0) {
+ cacheData = createCacheEntry(raw);
+ cache.put(getCacheKey(), cacheData, attributes);
+ log.log(Level.FINE, "JCS - downloaded key: {0}, length: {1}, url: {2}",
+ new Object[] {getCacheKey(), raw.length, getUrl()});
+ return true;
+ } else {
+ cacheData = createCacheEntry(new byte[]{});
+ cache.put(getCacheKey(), cacheData, attributes);
+ log.log(Level.FINE, "JCS - Caching empty object {0}", getUrl());
+ return true;
+ }
+ }
+ } catch (FileNotFoundException e) {
+ log.log(Level.FINE, "JCS - Caching empty object as server returned 404 for: {0}", getUrl());
+ cache.put(getCacheKey(), createCacheEntry(new byte[]{}), attributes);
+ return handleNotFound();
+ } catch (Exception e) {
+ log.log(Level.WARNING, "JCS - Exception during download " + getUrl(), e);
+ }
+ log.log(Level.WARNING, "JCS - Silent failure during download: {0}", getUrl());
+ return false;
+
+ }
+
+ /**
+ * @return if we should treat this object as properly loaded
+ */
+ protected abstract boolean handleNotFound();
+
+ protected abstract V createCacheEntry(byte[] content);
+
+ private CacheEntryAttributes parseHeaders(URLConnection urlConn) {
+ CacheEntryAttributes ret = new CacheEntryAttributes();
+ ret.setNoTileAtZoom("no-tile".equals(urlConn.getHeaderField("X-VE-Tile-Info")));
+
+ Long lng = urlConn.getExpiration();
+ if (lng.equals(0L)) {
+ try {
+ String str = urlConn.getHeaderField("Cache-Control");
+ if (str != null) {
+ for (String token: str.split(",")) {
+ if (token.startsWith("max-age=")) {
+ lng = Long.parseLong(token.substring(8)) * 1000 +
+ System.currentTimeMillis();
+ }
+ }
+ }
+ } catch (NumberFormatException e) {} //ignore malformed Cache-Control headers
+ }
+
+ ret.setExpirationTime(lng);
+ ret.setLastModification(now);
+ ret.setEtag(urlConn.getHeaderField("ETag"));
+ return ret;
+ }
+
+ private HttpURLConnection getURLConnection() throws IOException, MalformedURLException {
+ HttpURLConnection urlConn = (HttpURLConnection) getUrl().openConnection();
+ urlConn.setRequestProperty("Accept", "text/html, image/png, image/jpeg, image/gif, */*");
+ urlConn.setReadTimeout(readTimeout); // 30 seconds read timeout
+ urlConn.setConnectTimeout(connectTimeout);
+ for(Map.Entry<String, String> e: headers.entrySet()) {
+ urlConn.setRequestProperty(e.getKey(), e.getValue());
+ }
+ return urlConn;
+ }
+
+ private boolean isCacheValidUsingHead() throws IOException {
+ HttpURLConnection urlConn = (HttpURLConnection) getUrl().openConnection();
+ urlConn.setRequestMethod("HEAD");
+ long lastModified = urlConn.getLastModified();
+ return (
+ (attributes.getEtag() != null && attributes.getEtag().equals(urlConn.getRequestProperty("ETag"))) ||
+ (lastModified != 0 && lastModified <= attributes.getLastModification())
+ );
+ }
+
+ private static byte[] read(URLConnection urlConn) throws IOException {
+ InputStream input = urlConn.getInputStream();
+ try {
+ ByteArrayOutputStream bout = new ByteArrayOutputStream(input.available());
+ byte[] buffer = new byte[2048];
+ boolean finished = false;
+ do {
+ int read = input.read(buffer);
+ if (read >= 0) {
+ bout.write(buffer, 0, read);
+ } else {
+ finished = true;
+ }
+ } while (!finished);
+ if (bout.size() == 0)
+ return null;
+ return bout.toByteArray();
+ } finally {
+ input.close();
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java b/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java
new file mode 100644
index 0000000..6b612e9
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java
@@ -0,0 +1,91 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.imagery;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.apache.commons.jcs.access.behavior.ICacheAccess;
+import org.openstreetmap.gui.jmapviewer.Tile;
+import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileJob;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
+import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
+import org.openstreetmap.josm.data.cache.JCSCacheManager;
+import org.openstreetmap.josm.data.preferences.IntegerProperty;
+
+/**
+ * @author Wiktor Niesiobędzki
+ *
+ * Wrapper class that bridges between JCS cache and Tile Loaders
+ *
+ */
+public class TMSCachedTileLoader implements TileLoader, CachedTileLoader, TileCache {
+
+ private ICacheAccess<String, BufferedImageCacheEntry> cache;
+ private int connectTimeout;
+ private int readTimeout;
+ private Map<String, String> headers;
+ private TileLoaderListener listener;
+ public static final String PREFERENCE_PREFIX = "imagery.tms.cache.";
+ // average tile size is about 20kb
+ public static IntegerProperty MAX_OBJECTS_ON_DISK = new IntegerProperty(PREFERENCE_PREFIX + "max_objects_disk", 25000); // 25000 is around 500MB under this assumptions
+
+
+ /**
+ * Constructor
+ * @param listener called when tile loading has finished
+ * @param name of the cache
+ * @param connectTimeout to remote resource
+ * @param readTimeout to remote resource
+ * @param headers to be sent along with request
+ * @param cacheDir where cache file shall reside
+ * @throws IOException when cache initialization fails
+ */
+ public TMSCachedTileLoader(TileLoaderListener listener, String name, int connectTimeout, int readTimeout, Map<String, String> headers, String cacheDir) throws IOException {
+ this.cache = JCSCacheManager.getCache(name,
+ 1000, // use JCS memory cache instead of MemoryTileCache
+ MAX_OBJECTS_ON_DISK.get(),
+ cacheDir);
+ this.connectTimeout = connectTimeout;
+ this.readTimeout = readTimeout;
+ this.headers = headers;
+ this.listener = listener;
+ }
+
+ @Override
+ public TileJob createTileLoaderJob(Tile tile) {
+ return new TMSCachedTileLoaderJob(listener, tile, cache, connectTimeout, readTimeout, headers);
+ }
+
+ @Override
+ public void clearCache(TileSource source) {
+ this.cache.clear();
+ }
+
+ @Override
+ public Tile getTile(TileSource source, int x, int y, int z) {
+ return createTileLoaderJob(new Tile(source,x, y, z)).getTile();
+ }
+
+ @Override
+ public void addTile(Tile tile) {
+ createTileLoaderJob(tile).getTile();
+ }
+
+ @Override
+ public int getTileCount() {
+ return 0;
+ }
+
+ @Override
+ public void clear() {
+ cache.clear();
+ }
+
+ public String getStats() {
+ return cache.getStats();
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java b/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
new file mode 100644
index 0000000..44e8467
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
@@ -0,0 +1,247 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.imagery;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Map;
+import java.util.concurrent.Executor;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.commons.jcs.access.behavior.ICacheAccess;
+import org.openstreetmap.gui.jmapviewer.FeatureAdapter;
+import org.openstreetmap.gui.jmapviewer.Tile;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileJob;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
+import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTMSTileSource;
+import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
+import org.openstreetmap.josm.data.cache.CacheEntry;
+import org.openstreetmap.josm.data.cache.ICachedLoaderListener;
+import org.openstreetmap.josm.data.cache.JCSCachedTileLoaderJob;
+import org.openstreetmap.josm.data.preferences.IntegerProperty;
+
+/**
+ * @author Wiktor Niesiobędzki
+ *
+ * Class bridging TMS requests to JCS cache requests
+ *
+ */
+public class TMSCachedTileLoaderJob extends JCSCachedTileLoaderJob<String, BufferedImageCacheEntry> implements TileJob, ICachedLoaderListener {
+ private static final Logger log = FeatureAdapter.getLogger(TMSCachedTileLoaderJob.class.getCanonicalName());
+ private Tile tile;
+ private TileLoaderListener listener;
+ private volatile URL url;
+
+ /**
+ * overrides the THREAD_LIMIT in superclass, as we want to have separate limit and pool for TMS
+ */
+ public static IntegerProperty THREAD_LIMIT = new IntegerProperty("imagery.tms.tmsloader.maxjobs", 25);
+ /**
+ * separate from JCS thread pool for TMS loader, so we can have different thread pools for default JCS
+ * and for TMS imagery
+ */
+ private static ThreadPoolExecutor DOWNLOAD_JOB_DISPATCHER = new ThreadPoolExecutor(
+ THREAD_LIMIT.get().intValue(), // keep the thread number constant
+ THREAD_LIMIT.get().intValue(), // do not this number of threads
+ 30, // keepalive for thread
+ TimeUnit.SECONDS,
+ // make queue of LIFO type - so recently requested tiles will be loaded first (assuming that these are which user is waiting to see)
+ new LinkedBlockingDeque<Runnable>(5) {
+ /* keep the queue size fairly small, we do not want to
+ download a lot of tiles, that user is not seeing anyway */
+ @Override
+ public boolean offer(Runnable t) {
+ return super.offerFirst(t);
+ }
+
+ @Override
+ public Runnable remove() {
+ return super.removeFirst();
+ }
+ }
+ );
+
+ /**
+ * Constructor for creating a job, to get a specific tile from cache
+ * @param listener
+ * @param tile to be fetched from cache
+ * @param cache object
+ * @param connectTimeout when connecting to remote resource
+ * @param readTimeout when connecting to remote resource
+ * @param headers to be sent together with request
+ */
+ public TMSCachedTileLoaderJob(TileLoaderListener listener, Tile tile, ICacheAccess<String, BufferedImageCacheEntry> cache, int connectTimeout, int readTimeout,
+ Map<String, String> headers) {
+ super(cache, connectTimeout, readTimeout, headers);
+ this.tile = tile;
+ this.listener = listener;
+ }
+
+ @Override
+ public Tile getTile() {
+ return getCachedTile();
+ }
+
+ @Override
+ public String getCacheKey() {
+ if (tile != null)
+ return tile.getKey();
+ return null;
+ }
+
+ /*
+ * this doesn't needs to be synchronized, as it's not that costly to keep only one execution
+ * in parallel, but URL creation and Tile.getUrl() are costly and are not needed when fetching
+ * data from cache
+ *
+ * We need to have static url value for TileLoaderJob, as for some TileSources we might get different
+ * URL's each call we made (servers switching), and URL's are used below as a key for duplicate detection
+ *
+ */
+ @Override
+ public URL getUrl() {
+ if (url == null) {
+ try {
+ synchronized (this) {
+ if (url == null)
+ url = new URL(tile.getUrl());
+ }
+ } catch (IOException e) {
+ log.log(Level.WARNING, "JCS TMS Cache - error creating URL for tile {0}: {1}", new Object[] {tile.getKey(), e.getMessage()});
+ log.log(Level.INFO, "Exception: ", e);
+ }
+ }
+ return url;
+ }
+
+ @Override
+ public boolean isObjectLoadable() {
+ if (cacheData != null) {
+ byte[] content = cacheData.getContent();
+ try {
+ return content != null || cacheData.getImage() != null || cacheAsEmpty();
+ } catch (IOException e) {
+ log.log(Level.WARNING, "JCS TMS - error loading from cache for tile {0}: {1}", new Object[] {tile.getKey(), e.getMessage()});
+ }
+ }
+ return false;
+ }
+
+ private boolean isNoTileAtZoom() {
+ return attributes != null && attributes.isNoTileAtZoom();
+ }
+
+ @Override
+ protected boolean cacheAsEmpty() {
+ return isNoTileAtZoom();
+ }
+
+ private boolean handleNoTileAtZoom() {
+ if (isNoTileAtZoom()) {
+ log.log(Level.FINE, "JCS TMS - Tile valid, but no file, as no tiles at this level {0}", tile);
+ tile.setError("No tile at this zoom level");
+ tile.putValue("tile-info", "no-tile");
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ protected Executor getDownloadExecutor() {
+ return DOWNLOAD_JOB_DISPATCHER;
+ }
+
+ public void submit() {
+ tile.initLoading();
+ super.submit(this);
+ }
+
+ @Override
+ public void loadingFinished(CacheEntry object, LoadResult result) {
+ try {
+ tile.finishLoading(); // whatever happened set that loading has finished
+ switch(result){
+ case FAILURE:
+ tile.setError("Problem loading tile");
+ case SUCCESS:
+ handleNoTileAtZoom();
+ if (object != null) {
+ byte[] content = object.getContent();
+ if (content != null && content.length > 0) {
+ tile.loadImage(new ByteArrayInputStream(content));
+ }
+ }
+ case REJECTED:
+ // do not set anything here, leave waiting sign
+ }
+ if (listener != null) {
+ listener.tileLoadingFinished(tile, result.equals(LoadResult.SUCCESS));
+ }
+ } catch (IOException e) {
+ log.log(Level.WARNING, "JCS TMS - error loading object for tile {0}: {1}", new Object[] {tile.getKey(), e.getMessage()});
+ tile.setError(e.getMessage());
+ tile.setLoaded(false);
+ if (listener != null) {
+ listener.tileLoadingFinished(tile, false);
+ }
+ }
+ }
+
+ /**
+ * Method for getting the tile from cache only, without trying to reach remote resource
+ * @return tile or null, if nothing (useful) was found in cache
+ */
+ public Tile getCachedTile() {
+ BufferedImageCacheEntry data = get();
+ if (isObjectLoadable()) {
+ try {
+ if (data != null && data.getImage() != null) {
+ tile.setImage(data.getImage());
+ tile.finishLoading();
+ }
+ if (isNoTileAtZoom()) {
+ handleNoTileAtZoom();
+ tile.finishLoading();
+ }
+ return tile;
+ } catch (IOException e) {
+ log.log(Level.WARNING, "JCS TMS - error loading object for tile {0}: {1}", new Object[] {tile.getKey(), e.getMessage()});
+ return null;
+ }
+
+ } else {
+ return tile;
+ }
+ }
+
+ @Override
+ protected boolean handleNotFound() {
+ tile.setError("No tile at this zoom level");
+ tile.putValue("tile-info", "no-tile");
+ return true;
+ }
+
+ /**
+ * For TMS use BaseURL as settings discovery, so for different paths, we will have different settings (useful for developer servers)
+ *
+ * @return base URL of TMS or server url as defined in super class
+ */
+ @Override
+ protected String getServerKey() {
+ TileSource ts = tile.getSource();
+ if (ts instanceof AbstractTMSTileSource) {
+ return ((AbstractTMSTileSource) ts).getBaseUrl();
+ }
+ return super.getServerKey();
+ }
+
+ @Override
+ protected BufferedImageCacheEntry createCacheEntry(byte[] content) {
+ return new BufferedImageCacheEntry(content);
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/osm/NoteData.java b/src/org/openstreetmap/josm/data/osm/NoteData.java
index d991d08..31e1e6f 100644
--- a/src/org/openstreetmap/josm/data/osm/NoteData.java
+++ b/src/org/openstreetmap/josm/data/osm/NoteData.java
@@ -2,10 +2,10 @@
package org.openstreetmap.josm.data.osm;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
-import java.util.List;
import java.util.Map;
import org.openstreetmap.josm.Main;
@@ -14,6 +14,8 @@ import org.openstreetmap.josm.data.notes.Note;
import org.openstreetmap.josm.data.notes.Note.State;
import org.openstreetmap.josm.data.notes.NoteComment;
import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Utils;
/**
* Class to hold and perform operations on a set of notes
@@ -22,7 +24,7 @@ public class NoteData {
private long newNoteId = -1;
- private final List<Note> noteList;
+ private final Storage<Note> noteList;
private Note selectedNote = null;
private Comparator<Note> comparator = DEFAULT_COMPARATOR;
@@ -84,20 +86,13 @@ public class NoteData {
};
/**
- * Construct a new note container with an empty note list
- */
- public NoteData() {
- noteList = new ArrayList<>();
- }
-
- /**
* Construct a new note container with a given list of notes
* @param notes The list of notes to populate the container with
*/
- public NoteData(List<Note> notes) {
- noteList = notes;
- Collections.sort(notes, comparator);
+ public NoteData(Collection<Note> notes) {
+ noteList = new Storage<>();
for (Note note : notes) {
+ noteList.add(note);
if (note.getId() <= newNoteId) {
newNoteId = note.getId() - 1;
}
@@ -106,10 +101,20 @@ public class NoteData {
/**
* Returns the notes stored in this layer
- * @return List of Note objects
+ * @return collection of notes
*/
- public List<Note> getNotes() {
- return noteList;
+ public Collection<Note> getNotes() {
+ return Collections.unmodifiableCollection(noteList);
+ }
+
+ /**
+ * Returns the notes stored in this layer sorted according to {@link #comparator}
+ * @return sorted collection of notes
+ */
+ public Collection<Note> getSortedNotes() {
+ final ArrayList<Note> list = new ArrayList<>(noteList);
+ Collections.sort(list, comparator);
+ return list;
}
/** Returns the currently selected note
@@ -154,19 +159,30 @@ public class NoteData {
* Add notes to the data set. It only adds a note if the ID is not already present
* @param newNotes A list of notes to add
*/
- public synchronized void addNotes(List<Note> newNotes) {
+ public synchronized void addNotes(Collection<Note> newNotes) {
for (Note newNote : newNotes) {
if (!noteList.contains(newNote)) {
noteList.add(newNote);
+ } else {
+ final Note existingNote = noteList.get(newNote);
+ final boolean isDirty = Utils.exists(existingNote.getComments(), new Predicate<NoteComment>() {
+ @Override
+ public boolean evaluate(NoteComment object) {
+ return object.getIsNew();
+ }
+ });
+ if (!isDirty) {
+ noteList.put(newNote);
+ } else {
+ // TODO merge comments?
+ Main.info("Keeping existing note id={0} with uncommitted changes", String.valueOf(newNote.getId()));
+ }
}
if (newNote.getId() <= newNoteId) {
newNoteId = newNote.getId() - 1;
}
}
dataUpdated();
- if (Main.isDebugEnabled()) {
- Main.debug("notes in current set: " + noteList.size());
- }
}
/**
@@ -255,8 +271,7 @@ public class NoteData {
}
private void dataUpdated() {
- Collections.sort(noteList, comparator);
- Main.map.noteDialog.setNoteList(noteList);
+ Main.map.noteDialog.setNotes(getSortedNotes());
Main.map.mapView.repaint();
}
diff --git a/src/org/openstreetmap/josm/data/osm/OsmUtils.java b/src/org/openstreetmap/josm/data/osm/OsmUtils.java
index fe9da98..71f3b39 100644
--- a/src/org/openstreetmap/josm/data/osm/OsmUtils.java
+++ b/src/org/openstreetmap/josm/data/osm/OsmUtils.java
@@ -66,13 +66,13 @@ public final class OsmUtils {
final String[] x = assertion.split("\\s+", 2);
final OsmPrimitive p = "n".equals(x[0]) || "node".equals(x[0])
? new Node(LatLon.ZERO)
- : "w".equals(x[0]) || "way".equals(x[0])
+ : "w".equals(x[0]) || "way".equals(x[0]) || /*for MapCSS related usage*/ "area".equals(x[0])
? new Way()
: "r".equals(x[0]) || "relation".equals(x[0])
? new Relation()
: null;
if (p == null) {
- throw new IllegalArgumentException("Expecting n/node/w/way/r/relation, but got " + x[0]);
+ throw new IllegalArgumentException("Expecting n/node/w/way/r/relation/area, but got '" + x[0] + "'");
}
for (final Map.Entry<String, String> i : TextTagParser.readTagsFromText(x[1]).entrySet()) {
p.put(i.getKey(), i.getValue());
diff --git a/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java b/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java
index c737e75..4a6d833 100644
--- a/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java
+++ b/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java
@@ -11,7 +11,7 @@ public class SimplePrimitiveId implements PrimitiveId, Serializable {
private final long id;
private final OsmPrimitiveType type;
- public static final Pattern ID_PATTERN = Pattern.compile("((n(ode)?|w(ay)?|r(el(ation)?)?)/?)(\\d+)");
+ public static final Pattern ID_PATTERN = Pattern.compile("((n(ode)?|w(ay)?|r(el(ation)?)?)[ /]?)(\\d+)");
public SimplePrimitiveId(long id, OsmPrimitiveType type) {
this.id = id;
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 ee9bbf6..d77a9da 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
@@ -733,7 +733,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
}
}
- public void drawNodeIcon(Node n, MapImage img, boolean disabled, boolean selected, boolean member) {
+ public void drawNodeIcon(Node n, MapImage img, boolean disabled, boolean selected, boolean member, double theta) {
Point p = nc.getPoint(n);
final int w = img.getWidth(), h = img.getHeight();
@@ -746,7 +746,9 @@ public class StyledMapRenderer extends AbstractMapRenderer {
if (alpha != 1f) {
g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha));
}
+ g.rotate(theta, p.x, p.y);
g.drawImage(img.getImage(disabled), p.x - w/2 + img.offsetX, p.y - h/2 + img.offsetY, nc);
+ g.rotate(-theta, p.x, p.y);
g.setPaintMode();
if (selected || member)
{
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
index d338709..0423dcf 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
@@ -287,6 +287,10 @@ public class Multipolygon {
return wayIds;
}
+ public List<Node> getNodes() {
+ return nodes;
+ }
+
private void resetNodes(DataSet dataSet) {
if (!nodes.isEmpty()) {
DataSet ds = dataSet;
@@ -354,9 +358,8 @@ public class Multipolygon {
private final List<Way> innerWays = new ArrayList<>();
private final List<Way> outerWays = new ArrayList<>();
- private final List<PolyData> innerPolygons = new ArrayList<>();
- private final List<PolyData> outerPolygons = new ArrayList<>();
private final List<PolyData> combinedPolygons = new ArrayList<>();
+ private final List<Node> openEnds = new ArrayList<>();
private boolean incomplete;
@@ -390,10 +393,12 @@ public class Multipolygon {
}
}
+ final List<PolyData> innerPolygons = new ArrayList<>();
+ final List<PolyData> outerPolygons = new ArrayList<>();
createPolygons(innerWays, innerPolygons);
createPolygons(outerWays, outerPolygons);
if (!outerPolygons.isEmpty()) {
- addInnerToOuters();
+ addInnerToOuters(innerPolygons, outerPolygons);
}
}
@@ -413,6 +418,10 @@ public class Multipolygon {
for (JoinedWay jw: joinWays(waysToJoin)) {
result.add(new PolyData(jw));
+ if (!jw.isClosed()) {
+ openEnds.add(jw.getNodes().get(0));
+ openEnds.add(jw.getNodes().get(jw.getNodes().size() - 1));
+ }
}
}
@@ -544,7 +553,7 @@ public class Multipolygon {
return result;
}
- private final void addInnerToOuters() {
+ private final void addInnerToOuters(List<PolyData> innerPolygons, List<PolyData> outerPolygons) {
if (innerPolygons.isEmpty()) {
combinedPolygons.addAll(outerPolygons);
@@ -567,10 +576,6 @@ public class Multipolygon {
o.addInner(pdInner);
}
}
-
- // Clear inner and outer polygons to reduce memory footprint
- innerPolygons.clear();
- outerPolygons.clear();
}
/**
@@ -592,4 +597,24 @@ public class Multipolygon {
public List<PolyData> getCombinedPolygons() {
return combinedPolygons;
}
+
+ public List<PolyData> getInnerPolygons() {
+ final List<PolyData> innerPolygons = new ArrayList<>();
+ createPolygons(innerWays, innerPolygons);
+ return innerPolygons;
+ }
+
+ public List<PolyData> getOuterPolygons() {
+ final List<PolyData> outerPolygons = new ArrayList<>();
+ createPolygons(outerWays, outerPolygons);
+ return outerPolygons;
+ }
+
+ /**
+ * Returns the start and end node of non-closed rings.
+ * @return the start and end node of non-closed rings.
+ */
+ public List<Node> getOpenEnds() {
+ return openEnds;
+ }
}
diff --git a/src/org/openstreetmap/josm/data/projection/Ellipsoid.java b/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
index c84eaa9..7cca737 100644
--- a/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
+++ b/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
@@ -15,6 +15,11 @@ import org.openstreetmap.josm.data.coor.LatLon;
public final class Ellipsoid {
/**
+ * Clarke 1866 ellipsoid
+ */
+ public static final Ellipsoid clarke1866 = Ellipsoid.create_a_b(6378206.4, 6356583.8);
+
+ /**
* Clarke 1880 IGN (French national geographic institute)
*/
public static final Ellipsoid clarkeIGN = Ellipsoid.create_a_b(6378249.2, 6356515.0);
diff --git a/src/org/openstreetmap/josm/data/projection/Projections.java b/src/org/openstreetmap/josm/data/projection/Projections.java
index ef0d447..bcbc513 100644
--- a/src/org/openstreetmap/josm/data/projection/Projections.java
+++ b/src/org/openstreetmap/josm/data/projection/Projections.java
@@ -73,6 +73,7 @@ public final class Projections {
registerBaseProjection("somerc", SwissObliqueMercator.class, "core");
registerBaseProjection("tmerc", TransverseMercator.class, "core");
+ ellipsoids.put("clrk66", Ellipsoid.clarke1866);
ellipsoids.put("clarkeIGN", Ellipsoid.clarkeIGN);
ellipsoids.put("intl", Ellipsoid.hayford);
ellipsoids.put("GRS67", Ellipsoid.GRS67);
diff --git a/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java b/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
index df5cb47..491f2d7 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
@@ -61,7 +61,7 @@ public abstract class CrossingWays extends Test {
public boolean isPrimitiveUsable(OsmPrimitive w) {
return super.isPrimitiveUsable(w)
&& !isProposedOrAbandoned(w)
- && (w.hasKey(HIGHWAY)
+ && ((w.hasKey(HIGHWAY) && !w.hasTag(HIGHWAY, "rest_area", "services"))
|| w.hasKey(WATERWAY)
|| (w.hasKey(RAILWAY) && !isSubwayOrTram(w))
|| isCoastline(w)
diff --git a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
index 9d8ed65..29b36c6 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
@@ -140,12 +140,97 @@ public class MapCSSTagChecker extends Test.TagTest {
super(tr("Tag checker (MapCSS based)"), tr("This test checks for errors in tag keys and values."));
}
+ /**
+ * Represents a fix to a validation test. The fixing {@link Command} can be obtained by {@link #createCommand(OsmPrimitive, Selector)}.
+ */
+ static abstract class FixCommand {
+ /**
+ * Creates the fixing {@link Command} for the given primitive. The {@code matchingSelector} is used to
+ * evaluate placeholders (cf. {@link org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.TagCheck#insertArguments(Selector, String, OsmPrimitive)}).
+ */
+ abstract Command createCommand(final OsmPrimitive p, final Selector matchingSelector);
+
+ private static void checkObject(final Object obj) {
+ CheckParameterUtil.ensureThat(obj instanceof Expression || obj instanceof String, "instance of Exception or String expected, but got " + obj);
+ }
+
+ /**
+ * Evaluates given object as {@link Expression} or {@link String} on the matched {@link OsmPrimitive} and {@code matchingSelector}.
+ */
+ private static String evaluateObject(final Object obj, final OsmPrimitive p, final Selector matchingSelector) {
+ final String s;
+ if (obj instanceof Expression) {
+ s = (String) ((Expression) obj).evaluate(new Environment().withPrimitive(p));
+ } else if (obj instanceof String) {
+ s = (String) obj;
+ } else {
+ return null;
+ }
+ return TagCheck.insertArguments(matchingSelector, s, p);
+ }
+
+ /**
+ * Creates a fixing command which executes a {@link ChangePropertyCommand} on the specified tag.
+ */
+ static FixCommand fixAdd(final Object obj) {
+ checkObject(obj);
+ return new FixCommand() {
+ @Override
+ Command createCommand(OsmPrimitive p, Selector matchingSelector) {
+ final Tag tag = Tag.ofString(evaluateObject(obj, p, matchingSelector));
+ return new ChangePropertyCommand(p, tag.getKey(), tag.getValue());
+ }
+
+ @Override
+ public String toString() {
+ return "fixAdd: " + obj;
+ }
+ };
+
+ }
+
+ /**
+ * Creates a fixing command which executes a {@link ChangePropertyCommand} to delete the specified key.
+ */
+ static FixCommand fixRemove(final Object obj) {
+ checkObject(obj);
+ return new FixCommand() {
+ @Override
+ Command createCommand(OsmPrimitive p, Selector matchingSelector) {
+ final String key = evaluateObject(obj, p, matchingSelector);
+ return new ChangePropertyCommand(p, key, "");
+ }
+
+ @Override
+ public String toString() {
+ return "fixRemove: " + obj;
+ }
+ };
+ }
+
+ /**
+ * Creates a fixing command which executes a {@link ChangePropertyKeyCommand} on the specified keys.
+ */
+ static FixCommand fixChangeKey(final String oldKey, final String newKey) {
+ return new FixCommand() {
+ @Override
+ Command createCommand(OsmPrimitive p, Selector matchingSelector) {
+ return new ChangePropertyKeyCommand(p, oldKey, newKey);
+ }
+
+ @Override
+ public String toString() {
+ return "fixChangeKey: " + oldKey + " => " + newKey;
+ }
+ };
+ }
+ }
+
final MultiMap<String, TagCheck> checks = new MultiMap<>();
static class TagCheck implements Predicate<OsmPrimitive> {
protected final GroupedMapCSSRule rule;
- protected final List<PrimitiveToTag> change = new ArrayList<>();
- protected final Map<String, String> keyChange = new LinkedHashMap<>();
+ protected final List<FixCommand> fixCommands = new ArrayList<>();
protected final List<String> alternatives = new ArrayList<>();
protected final Map<Instruction.AssignmentInstruction, Severity> errors = new HashMap<>();
protected final Map<String, Boolean> assertions = new HashMap<>();
@@ -156,43 +241,6 @@ public class MapCSSTagChecker extends Test.TagTest {
this.rule = rule;
}
- /**
- * A function mapping the matched {@link OsmPrimitive} to a {@link Tag}.
- */
- abstract static class PrimitiveToTag implements Utils.Function<OsmPrimitive, Tag> {
-
- private PrimitiveToTag() {
- // Hide implicit public constructor for utility class
- }
-
- /**
- * Creates a new mapping from an {@code MapCSS} object.
- * In case of an {@link Expression}, that is evaluated on the matched {@link OsmPrimitive}.
- * In case of a {@link String}, that is "compiled" to a {@link Tag} instance.
- */
- static PrimitiveToTag ofMapCSSObject(final Object obj, final boolean keyOnly) {
- if (obj instanceof Expression) {
- return new PrimitiveToTag() {
- @Override
- public Tag apply(OsmPrimitive p) {
- final String s = (String) ((Expression) obj).evaluate(new Environment().withPrimitive(p));
- return keyOnly? new Tag(s) : Tag.ofString(s);
- }
- };
- } else if (obj instanceof String) {
- final Tag tag = keyOnly ? new Tag((String) obj) : Tag.ofString((String) obj);
- return new PrimitiveToTag() {
- @Override
- public Tag apply(OsmPrimitive ignore) {
- return tag;
- }
- };
- } else {
- return null;
- }
- }
- }
-
static final String POSSIBLE_THROWS = possibleThrows();
static final String possibleThrows() {
@@ -232,25 +280,15 @@ public class MapCSSTagChecker extends Test.TagTest {
Main.warn("Unsupported "+ai.key+" instruction. Allowed instructions are "+POSSIBLE_THROWS);
}
} else if ("fixAdd".equals(ai.key)) {
- final PrimitiveToTag toTag = PrimitiveToTag.ofMapCSSObject(ai.val, false);
- if (toTag != null) {
- check.change.add(toTag);
- } else {
- Main.warn("Invalid value for "+ai.key+": "+ai.val);
- }
+ check.fixCommands.add(FixCommand.fixAdd(ai.val));
} else if ("fixRemove".equals(ai.key)) {
CheckParameterUtil.ensureThat(!(ai.val instanceof String) || !(val != null && val.contains("=")),
"Unexpected '='. Please only specify the key to remove!");
- final PrimitiveToTag toTag = PrimitiveToTag.ofMapCSSObject(ai.val, true);
- if (toTag != null) {
- check.change.add(toTag);
- } else {
- Main.warn("Invalid value for "+ai.key+": "+ai.val);
- }
+ check.fixCommands.add(FixCommand.fixRemove(ai.val));
} else if ("fixChangeKey".equals(ai.key) && val != null) {
CheckParameterUtil.ensureThat(val.contains("=>"), "Separate old from new key by '=>'!");
final String[] x = val.split("=>", 2);
- check.keyChange.put(Tag.removeWhiteSpaces(x[0]), Tag.removeWhiteSpaces(x[1]));
+ check.fixCommands.add(FixCommand.fixChangeKey(Tag.removeWhiteSpaces(x[0]), Tag.removeWhiteSpaces(x[1])));
} else if ("fixDeleteObject".equals(ai.key) && val != null) {
CheckParameterUtil.ensureThat(val.equals("this"), "fixDeleteObject must be followed by 'this'");
check.deletion = true;
@@ -347,11 +385,11 @@ public class MapCSSTagChecker extends Test.TagTest {
* Determines the {@code index}-th key/value/tag (depending on {@code type}) of the
* {@link org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector}.
*/
- static String determineArgument(Selector.GeneralSelector matchingSelector, int index, String type) {
+ static String determineArgument(Selector.GeneralSelector matchingSelector, int index, String type, OsmPrimitive p) {
try {
final Condition c = matchingSelector.getConditions().get(index);
final Tag tag = c instanceof Condition.KeyCondition
- ? ((Condition.KeyCondition) c).asTag()
+ ? ((Condition.KeyCondition) c).asTag(p)
: c instanceof Condition.SimpleKeyValueCondition
? ((Condition.SimpleKeyValueCondition) c).asTag()
: c instanceof Condition.KeyValueCondition
@@ -378,16 +416,16 @@ public class MapCSSTagChecker extends Test.TagTest {
* Replaces occurrences of <code>{i.key}</code>, <code>{i.value}</code>, <code>{i.tag}</code> in {@code s} by the corresponding
* key/value/tag of the {@code index}-th {@link Condition} of {@code matchingSelector}.
*/
- static String insertArguments(Selector matchingSelector, String s) {
+ static String insertArguments(Selector matchingSelector, String s, OsmPrimitive p) {
if (s != null && matchingSelector instanceof Selector.ChildOrParentSelector) {
- return insertArguments(((Selector.ChildOrParentSelector)matchingSelector).right, s);
+ return insertArguments(((Selector.ChildOrParentSelector)matchingSelector).right, s, p);
} else if (s == null || !(matchingSelector instanceof GeneralSelector)) {
return s;
}
final Matcher m = Pattern.compile("\\{(\\d+)\\.(key|value|tag)\\}").matcher(s);
final StringBuffer sb = new StringBuffer();
while (m.find()) {
- final String argument = determineArgument((Selector.GeneralSelector) matchingSelector, Integer.parseInt(m.group(1)), m.group(2));
+ final String argument = determineArgument((Selector.GeneralSelector) matchingSelector, Integer.parseInt(m.group(1)), m.group(2), p);
try {
// Perform replacement with null-safe + regex-safe handling
m.appendReplacement(sb, String.valueOf(argument).replace("^(", "").replace(")$", ""));
@@ -407,21 +445,13 @@ public class MapCSSTagChecker extends Test.TagTest {
* @return the fix or {@code null}
*/
Command fixPrimitive(OsmPrimitive p) {
- if (change.isEmpty() && keyChange.isEmpty() && !deletion) {
+ if (fixCommands.isEmpty() && !deletion) {
return null;
}
final Selector matchingSelector = whichSelectorMatchesPrimitive(p);
Collection<Command> cmds = new LinkedList<>();
- for (PrimitiveToTag toTag : change) {
- final Tag tag = toTag.apply(p);
- final String key = insertArguments(matchingSelector, tag.getKey());
- final String value = insertArguments(matchingSelector, tag.getValue());
- cmds.add(new ChangePropertyCommand(p, key, value));
- }
- for (Map.Entry<String, String> i : keyChange.entrySet()) {
- final String oldKey = insertArguments(matchingSelector, i.getKey());
- final String newKey = insertArguments(matchingSelector, i.getValue());
- cmds.add(new ChangePropertyKeyCommand(p, oldKey, newKey));
+ for (FixCommand fixCommand : fixCommands) {
+ cmds.add(fixCommand.createCommand(p, matchingSelector));
}
if (deletion) {
cmds.add(new DeleteCommand(p));
@@ -470,7 +500,7 @@ public class MapCSSTagChecker extends Test.TagTest {
* @return a description (possibly with alternative suggestions)
*/
String getDescriptionForMatchingSelector(OsmPrimitive p, Selector matchingSelector) {
- return insertArguments(matchingSelector, getDescription(p));
+ return insertArguments(matchingSelector, getDescription(p), p);
}
Severity getSeverity() {
diff --git a/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java b/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
index 10cf415..961f3c8 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
@@ -23,7 +23,6 @@ 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.paint.relations.Multipolygon;
-import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.JoinedWay;
import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData.Intersection;
import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
import org.openstreetmap.josm.data.validation.OsmValidator;
@@ -58,7 +57,6 @@ public class MultipolygonTest extends Test {
private static volatile ElemStyles styles;
- private final List<List<Node>> nonClosedWays = new ArrayList<>();
private final Set<String> keysCheckedByAnotherTest = new HashSet<>();
/**
@@ -92,27 +90,6 @@ public class MultipolygonTest extends Test {
super.endTest();
}
- private List<List<Node>> joinWays(Collection<Way> ways) {
- List<List<Node>> result = new ArrayList<>();
- List<Way> waysToJoin = new ArrayList<>();
- for (Way way : ways) {
- if (way.isClosed()) {
- result.add(way.getNodes());
- } else {
- waysToJoin.add(way);
- }
- }
-
- for (JoinedWay jw : Multipolygon.joinWays(waysToJoin)) {
- if (!jw.isClosed()) {
- nonClosedWays.add(jw.getNodes());
- } else {
- result.add(jw.getNodes());
- }
- }
- return result;
- }
-
private GeneralPath createPath(List<Node> nodes) {
GeneralPath result = new GeneralPath();
result.moveTo((float) nodes.get(0).getCoor().lat(), (float) nodes.get(0).getCoor().lon());
@@ -123,10 +100,10 @@ public class MultipolygonTest extends Test {
return result;
}
- private List<GeneralPath> createPolygons(List<List<Node>> joinedWays) {
+ private List<GeneralPath> createPolygons(List<Multipolygon.PolyData> joinedWays) {
List<GeneralPath> result = new ArrayList<>();
- for (List<Node> way : joinedWays) {
- result.add(createPath(way));
+ for (Multipolygon.PolyData way : joinedWays) {
+ result.add(createPath(way.getNodes()));
}
return result;
}
@@ -164,7 +141,6 @@ public class MultipolygonTest extends Test {
@Override
public void visit(Relation r) {
- nonClosedWays.clear();
if (r.isMultipolygon()) {
checkMembersAndRoles(r);
@@ -204,8 +180,6 @@ public class MultipolygonTest extends Test {
}
}
- List<List<Node>> innerWays = joinWays(polygon.getInnerWays()); // Side effect - sets nonClosedWays
- List<List<Node>> outerWays = joinWays(polygon.getOuterWays());
if (styles != null && !"boundary".equals(r.get("type"))) {
AreaElemStyle area = ElemStyles.getAreaElemStyle(r, false);
boolean areaStyle = area != null;
@@ -259,12 +233,7 @@ public class MultipolygonTest extends Test {
}
}
- List<Node> openNodes = new LinkedList<>();
- for (List<Node> w : nonClosedWays) {
- if (w.size()<1) continue;
- openNodes.add(w.get(0));
- openNodes.add(w.get(w.size() - 1));
- }
+ List<Node> openNodes = polygon.getOpenEnds();
if (!openNodes.isEmpty()) {
List<OsmPrimitive> primitives = new LinkedList<>();
primitives.add(r);
@@ -275,27 +244,27 @@ public class MultipolygonTest extends Test {
}
// For painting is used Polygon class which works with ints only. For validation we need more precision
- List<GeneralPath> outerPolygons = createPolygons(outerWays);
- for (List<Node> pdInner : innerWays) {
+ List<GeneralPath> outerPolygons = createPolygons(polygon.getOuterPolygons());
+ for (Multipolygon.PolyData pdInner : polygon.getInnerPolygons()) {
boolean outside = true;
boolean crossing = false;
- List<Node> outerWay = null;
- for (int i=0; i<outerWays.size(); i++) {
+ Multipolygon.PolyData outerWay = null;
+ for (int i = 0; i < polygon.getOuterPolygons().size(); i++) {
GeneralPath outer = outerPolygons.get(i);
- Intersection intersection = getPolygonIntersection(outer, pdInner);
+ Intersection intersection = getPolygonIntersection(outer, pdInner.getNodes());
outside = outside & intersection == Intersection.OUTSIDE;
if (intersection == Intersection.CROSSING) {
crossing = true;
- outerWay = outerWays.get(i);
+ outerWay = polygon.getOuterPolygons().get(i);
}
}
if (outside || crossing) {
List<List<Node>> highlights = new ArrayList<>();
- highlights.add(pdInner);
+ highlights.add(pdInner.getNodes());
if (outside) {
addError(r, new TestError(this, Severity.WARNING, tr("Multipolygon inner way is outside"), INNER_WAY_OUTSIDE, Collections.singletonList(r), highlights));
- } else if (crossing) {
- highlights.add(outerWay);
+ } else {
+ highlights.add(outerWay.getNodes());
addError(r, new TestError(this, Severity.WARNING, tr("Intersection between multipolygon ways"), CROSSING_WAYS, Collections.singletonList(r), highlights));
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java b/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java
index 19b27fa..9363187 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java
@@ -45,11 +45,11 @@ public class NameMismatch extends Test.TagTest {
* Report a missing translation.
*
* @param p The primitive whose translation is missing
+ * @param name The name whose translation is missing
*/
- private void missingTranslation(OsmPrimitive p) {
+ private void missingTranslation(OsmPrimitive p, String name) {
errors.add(new TestError(this, Severity.OTHER,
- tr("A name:* translation is missing."),
- NAME_TRANSLATION_MISSING, p));
+ tr("Missing name:*={0}. Add tag with correct language key.", name), NAME_TRANSLATION_MISSING, p));
}
/**
@@ -89,15 +89,14 @@ public class NameMismatch extends Test.TagTest {
String[] splitNames = NAME_SPLIT_PATTERN.split(name);
if (splitNames.length == 1) {
/* The name is not composed of multiple parts. Complain. */
- missingTranslation(p);
+ missingTranslation(p, splitNames[0]);
return;
}
/* Check that each part corresponds to a translated name:*. */
for (String n : splitNames) {
if (!names.contains(n)) {
- missingTranslation(p);
- return;
+ missingTranslation(p, n);
}
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java b/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
index 80c9fb5..aeede47 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
@@ -129,7 +129,7 @@ public class OpeningHourTest extends Test.TagTest {
* @return The real test error given to JOSM validator. Can be fixable or not if a prettified values has been determined.
*/
public TestError getTestError(final OsmPrimitive p, final String key) {
- if (prettifiedValue == null) {
+ if (prettifiedValue == null || prettifiedValue.equals(p.get(key))) {
return new TestError(OpeningHourTest.this, severity, message, 2901, p);
} else {
return new FixableTestError(OpeningHourTest.this, severity, message, 2901, p,
diff --git a/src/org/openstreetmap/josm/gui/MainApplication.java b/src/org/openstreetmap/josm/gui/MainApplication.java
index f713f92..8568f7e 100644
--- a/src/org/openstreetmap/josm/gui/MainApplication.java
+++ b/src/org/openstreetmap/josm/gui/MainApplication.java
@@ -132,6 +132,7 @@ public class MainApplication extends Main {
"\t--language=<language> "+tr("Set the language")+"\n\n"+
"\t--version "+tr("Displays the JOSM version and exits")+"\n\n"+
"\t--debug "+tr("Print debugging messages to console")+"\n\n"+
+ "\t--skip-plugins "+tr("Skip loading plugins")+"\n\n"+
"\t--offline=<osm_api|josm_website|all> "+tr("Disable access to the given resource(s), separated by comma")+"\n\n"+
tr("options provided as Java system properties")+":\n"+
"\t-Djosm.pref=" +tr("/PATH/TO/JOSM/PREF ")+tr("Set the preferences directory")+"\n\n"+
@@ -194,7 +195,10 @@ public class MainApplication extends Main {
/** --selection=<searchstring> Select with the given search */
SELECTION(true),
/** --offline=<osm_api|josm_website|all> Disable access to the given resource(s), delimited by comma */
- OFFLINE(true);
+ OFFLINE(true),
+ /* --skip-plugins */
+ SKIP_PLUGINS(false),
+ ;
private String name;
private boolean requiresArgument;
@@ -343,6 +347,12 @@ public class MainApplication extends Main {
Main.info(tr("Printing debugging messages to console"));
}
+ Boolean skipLoadingPlugins = false;
+ if (args.containsKey(Option.SKIP_PLUGINS)) {
+ skipLoadingPlugins = true;
+ Main.info(tr("Plugin loading skipped"));
+ }
+
if (args.containsKey(Option.TRACE)) {
// Enable JOSM debug level
logLevel = 5;
@@ -412,17 +422,22 @@ public class MainApplication extends Main {
}
});
- Collection<PluginInformation> pluginsToLoad = PluginHandler.buildListOfPluginsToLoad(splash, monitor.createSubTaskMonitor(1, false));
- if (!pluginsToLoad.isEmpty() && PluginHandler.checkAndConfirmPluginUpdate(splash)) {
- monitor.subTask(tr("Updating plugins"));
- pluginsToLoad = PluginHandler.updatePlugins(splash, null, monitor.createSubTaskMonitor(1, false), false);
- }
+ Collection<PluginInformation> pluginsToLoad = null;
+
- monitor.indeterminateSubTask(tr("Installing updated plugins"));
- PluginHandler.installDownloadedPlugins(true);
+ if (!skipLoadingPlugins) {
+ pluginsToLoad = PluginHandler.buildListOfPluginsToLoad(splash, monitor.createSubTaskMonitor(1, false));
+ if (!pluginsToLoad.isEmpty() && PluginHandler.checkAndConfirmPluginUpdate(splash)) {
+ monitor.subTask(tr("Updating plugins"));
+ pluginsToLoad = PluginHandler.updatePlugins(splash, null, monitor.createSubTaskMonitor(1, false), false);
+ }
+
+ monitor.indeterminateSubTask(tr("Installing updated plugins"));
+ PluginHandler.installDownloadedPlugins(true);
- monitor.indeterminateSubTask(tr("Loading early plugins"));
- PluginHandler.loadEarlyPlugins(splash, pluginsToLoad, monitor.createSubTaskMonitor(1, false));
+ monitor.indeterminateSubTask(tr("Loading early plugins"));
+ PluginHandler.loadEarlyPlugins(splash, pluginsToLoad, monitor.createSubTaskMonitor(1, false));
+ }
monitor.indeterminateSubTask(tr("Setting defaults"));
preConstructorInit(args);
@@ -430,9 +445,11 @@ public class MainApplication extends Main {
monitor.indeterminateSubTask(tr("Creating main GUI"));
final Main main = new MainApplication(mainFrame);
- monitor.indeterminateSubTask(tr("Loading plugins"));
- PluginHandler.loadLatePlugins(splash, pluginsToLoad, monitor.createSubTaskMonitor(1, false));
- toolbar.refreshToolbarControl();
+ if (!skipLoadingPlugins) {
+ monitor.indeterminateSubTask(tr("Loading plugins"));
+ PluginHandler.loadLatePlugins(splash, pluginsToLoad, monitor.createSubTaskMonitor(1, false));
+ toolbar.refreshToolbarControl();
+ }
// Wait for splash disappearance (fix #9714)
GuiHelper.runInEDTAndWait(new Runnable() {
diff --git a/src/org/openstreetmap/josm/gui/MainMenu.java b/src/org/openstreetmap/josm/gui/MainMenu.java
index bc6cfc6..fdbd914 100644
--- a/src/org/openstreetmap/josm/gui/MainMenu.java
+++ b/src/org/openstreetmap/josm/gui/MainMenu.java
@@ -51,6 +51,7 @@ import org.openstreetmap.josm.actions.DeleteAction;
import org.openstreetmap.josm.actions.DialogsToggleAction;
import org.openstreetmap.josm.actions.DistributeAction;
import org.openstreetmap.josm.actions.DownloadAction;
+import org.openstreetmap.josm.actions.DownloadNotesInViewAction;
import org.openstreetmap.josm.actions.DownloadPrimitiveAction;
import org.openstreetmap.josm.actions.DownloadReferrersAction;
import org.openstreetmap.josm.actions.DuplicateAction;
@@ -166,6 +167,8 @@ public class MainMenu extends JMenuBar {
public final DownloadAction download = new DownloadAction();
/** File / Download object... **/
public final DownloadPrimitiveAction downloadPrimitive = new DownloadPrimitiveAction();
+ /** File / Download notes in current view **/
+ public final DownloadNotesInViewAction downloadNotesInView = DownloadNotesInViewAction.newActionWithNoteIcon();
/** File / Search Notes... **/
public final SearchNotesDownloadAction searchNotes = new SearchNotesDownloadAction();
/** File / Download parent ways/relations... **/
@@ -637,6 +640,7 @@ public class MainMenu extends JMenuBar {
add(fileMenu, download);
add(fileMenu, downloadPrimitive);
add(fileMenu, searchNotes);
+ add(fileMenu, downloadNotesInView);
add(fileMenu, downloadReferrers);
add(fileMenu, update);
add(fileMenu, updateSelection);
diff --git a/src/org/openstreetmap/josm/gui/MapFrame.java b/src/org/openstreetmap/josm/gui/MapFrame.java
index 38d10e4..64dba35 100644
--- a/src/org/openstreetmap/josm/gui/MapFrame.java
+++ b/src/org/openstreetmap/josm/gui/MapFrame.java
@@ -28,6 +28,7 @@ import javax.swing.Action;
import javax.swing.BorderFactory;
import javax.swing.BoxLayout;
import javax.swing.ButtonGroup;
+import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JComponent;
@@ -76,6 +77,7 @@ import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.util.AdvancedKeyPressDetector;
import org.openstreetmap.josm.tools.Destroyable;
import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Shortcut;
@@ -540,11 +542,13 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
public ListAllButtonsAction(Collection<? extends HideableButton> buttons) {
this.buttons = buttons;
- putValue(NAME, ">>");
}
public void setButton(JButton button) {
this.button = button;
+ final ImageIcon icon = ImageProvider.get("audio-fwd");
+ putValue(SMALL_ICON, icon);
+ button.setPreferredSize(new Dimension(icon.getIconWidth(), icon.getIconHeight() + 64));
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/NoteInputDialog.java b/src/org/openstreetmap/josm/gui/NoteInputDialog.java
index e68f0c8..4f8a075 100644
--- a/src/org/openstreetmap/josm/gui/NoteInputDialog.java
+++ b/src/org/openstreetmap/josm/gui/NoteInputDialog.java
@@ -10,8 +10,8 @@ import javax.swing.Icon;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.tools.ImageProvider;
/**
@@ -21,7 +21,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
*/
public class NoteInputDialog extends ExtendedDialog {
- private JTextArea textArea = new JTextArea();
+ private JosmTextArea textArea = new JosmTextArea();
/**
* Construct the dialog with a title and button text. A cancel button is
@@ -44,6 +44,7 @@ public class NoteInputDialog extends ExtendedDialog {
textArea.setRows(6);
textArea.setColumns(30);
textArea.setLineWrap(true);
+ textArea.setWrapStyleWord(true);
JScrollPane scrollPane = new JScrollPane(textArea);
scrollPane.setAlignmentX(Component.LEFT_ALIGNMENT); //without this the label gets pushed to the right
diff --git a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
index e16ab72..6116ee1 100644
--- a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
+++ b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
@@ -11,8 +11,10 @@ import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -25,6 +27,7 @@ import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
import org.openstreetmap.gui.jmapviewer.MemoryTileCache;
import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
import org.openstreetmap.gui.jmapviewer.tilesources.MapQuestOpenAerialTileSource;
import org.openstreetmap.gui.jmapviewer.tilesources.MapQuestOsmTileSource;
@@ -113,7 +116,7 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
private static final StringProperty PROP_MAPSTYLE = new StringProperty("slippy_map_chooser.mapstyle", "Mapnik");
public static final String RESIZE_PROP = SlippyMapBBoxChooser.class.getName() + ".resize";
- private OsmTileLoader cachedLoader;
+ private TileLoader cachedLoader;
private OsmTileLoader uncachedLoader;
private final SizeButton iSizeButton;
@@ -131,11 +134,14 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
debug = Main.isDebugEnabled();
SpringLayout springLayout = new SpringLayout();
setLayout(springLayout);
- TMSLayer.setMaxWorkers();
- cachedLoader = TMSLayer.loaderFactory.makeTileLoader(this);
+
+ Map<String, String> headers = new HashMap<>();
+ headers.put("User-Agent", Version.getInstance().getFullAgentString());
+
+ cachedLoader = TMSLayer.loaderFactory.makeTileLoader(this, headers);
uncachedLoader = new OsmTileLoader(this);
- uncachedLoader.headers.put("User-Agent", Version.getInstance().getFullAgentString());
+ uncachedLoader.headers.putAll(headers);
setZoomContolsVisible(Main.pref.getBoolean("slippy_map_chooser.zoomcontrols",false));
setMapMarkerVisible(false);
setMinimumSize(new Dimension(350, 350 / 2));
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
index d7ca1ac..0ff6077 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
@@ -205,7 +205,6 @@ public class ChangesetDialog extends ToggleDialog{
// -- launch changeset manager action
launchChangesetManagerAction = new LaunchChangesetManagerAction();
- cbInSelectionOnly.addItemListener(launchChangesetManagerAction);
popupMenu = new ChangesetDialogPopup(lstInActiveDataLayer, lstInSelection);
@@ -461,14 +460,27 @@ public class ChangesetDialog extends ToggleDialog{
* Show information about the currently selected changesets
*
*/
- class LaunchChangesetManagerAction extends AbstractAction implements ListSelectionListener, ItemListener {
+ class LaunchChangesetManagerAction extends AbstractAction {
public LaunchChangesetManagerAction() {
putValue(NAME, tr("Details"));
putValue(SHORT_DESCRIPTION, tr("Opens the Changeset Manager window for the selected changesets"));
putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "changesetmanager"));
}
- protected void launchChangesetManager(Collection<Integer> toSelect) {
+ @Override
+ public void actionPerformed(ActionEvent arg0) {
+ ChangesetListModel model = getCurrentChangesetListModel();
+ Set<Integer> sel = model.getSelectedChangesetIds();
+ LaunchChangesetManager.displayChangesets(sel);
+ }
+ }
+
+ /**
+ * A utility class to fetch changesets and display the changeset dialog.
+ */
+ public static class LaunchChangesetManager {
+
+ protected static void launchChangesetManager(Collection<Integer> toSelect) {
ChangesetCacheManager cm = ChangesetCacheManager.getInstance();
if (cm.isVisible()) {
cm.setExtendedState(Frame.NORMAL);
@@ -482,10 +494,11 @@ public class ChangesetDialog extends ToggleDialog{
cm.setSelectedChangesetsById(toSelect);
}
- @Override
- public void actionPerformed(ActionEvent arg0) {
- ChangesetListModel model = getCurrentChangesetListModel();
- Set<Integer> sel = model.getSelectedChangesetIds();
+ /**
+ * Fetches changesets and display the changeset dialog.
+ * @param sel the changeset ids to fetch and display.
+ */
+ public static void displayChangesets(final Set<Integer> sel) {
final Set<Integer> toDownload = new HashSet<>();
if (!Main.isOffline(OnlineResource.OSM_API)) {
ChangesetCache cc = ChangesetCache.getInstance();
@@ -533,21 +546,13 @@ public class ChangesetDialog extends ToggleDialog{
GuiHelper.runInEDT(new Runnable() {
@Override
public void run() {
- launchChangesetManager(toDownload);
+ launchChangesetManager(sel);
}
});
}
};
Main.worker.submit(r);
}
-
- @Override
- public void itemStateChanged(ItemEvent arg0) {
- }
-
- @Override
- public void valueChanged(ListSelectionEvent e) {
- }
}
class ChangesetDialogPopup extends ListPopupMenu {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
index 477279e..93fdc6a 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
@@ -9,9 +9,10 @@ import java.awt.Image;
import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import java.text.SimpleDateFormat;
+import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.List;
import javax.swing.AbstractAction;
@@ -30,6 +31,7 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.DownloadNotesInViewAction;
import org.openstreetmap.josm.actions.UploadNotesAction;
import org.openstreetmap.josm.actions.mapmode.AddNoteAction;
import org.openstreetmap.josm.data.notes.Note;
@@ -43,6 +45,7 @@ import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.NoteLayer;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.date.DateUtils;
/**
* Dialog to display and manipulate notes.
@@ -77,6 +80,7 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
private JList<Note> displayList;
private final AddCommentAction addCommentAction;
private final CloseAction closeAction;
+ private final DownloadNotesInViewAction downloadNotesInViewAction;
private final NewAction newAction;
private final ReopenAction reopenAction;
private final SortAction sortAction;
@@ -89,6 +93,7 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
super(tr("Notes"), "notes/note_open", tr("List of notes"), null, 150);
addCommentAction = new AddCommentAction();
closeAction = new CloseAction();
+ downloadNotesInViewAction = DownloadNotesInViewAction.newActionWithDownloadIcon();
newAction = new NewAction();
reopenAction = new ReopenAction();
sortAction = new SortAction();
@@ -131,6 +136,7 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
pane.add(new JScrollPane(displayList), BorderLayout.CENTER);
createLayout(pane, false, Arrays.asList(new SideButton[]{
+ new SideButton(downloadNotesInViewAction, false),
new SideButton(newAction, false),
new SideButton(addCommentAction, false),
new SideButton(closeAction, false),
@@ -181,16 +187,13 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
if (newLayer instanceof NoteLayer) {
noteData = ((NoteLayer)newLayer).getNoteData();
model.setData(noteData.getNotes());
- setNoteList(noteData.getNotes());
+ setNotes(noteData.getSortedNotes());
}
}
@Override
public void layerRemoved(Layer oldLayer) {
if (oldLayer instanceof NoteLayer) {
- if (Main.isDebugEnabled()) {
- Main.debug("note layer removed. Clearing everything");
- }
noteData = null;
model.clearData();
if (Main.map.mapMode instanceof AddNoteAction) {
@@ -204,7 +207,7 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
* The dialog should match the notes displayed in the note layer.
* @param noteList List of notes to display
*/
- public void setNoteList(List<Note> noteList) {
+ public void setNotes(Collection<Note> noteList) {
model.setData(noteList);
updateButtonStates();
this.repaint();
@@ -226,7 +229,7 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
private class NoteRenderer implements ListCellRenderer<Note> {
private DefaultListCellRenderer defaultListCellRenderer = new DefaultListCellRenderer();
- private final SimpleDateFormat sdf = new SimpleDateFormat("dd MMM yyyy kk:mm");
+ private final DateFormat dateFormat = DateUtils.getDateTimeFormat(DateFormat.MEDIUM, DateFormat.SHORT);
@Override
public Component getListCellRendererComponent(JList<? extends Note> list, Note note, int index,
@@ -238,7 +241,7 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
if (userName == null || userName.isEmpty()) {
userName = "<Anonymous>";
}
- String toolTipText = userName + " @ " + sdf.format(note.getCreatedAt());
+ String toolTipText = userName + " @ " + dateFormat.format(note.getCreatedAt());
JLabel jlabel = (JLabel)comp;
jlabel.setText(note.getId() + ": " +text);
ImageIcon icon;
@@ -260,7 +263,7 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
private List<Note> data;
public NoteTableModel() {
- data = new ArrayList<Note>();
+ data = new ArrayList<>();
}
@Override
@@ -276,7 +279,7 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
return data.get(index);
}
- public void setData(List<Note> noteList) {
+ public void setData(Collection<Note> noteList) {
data.clear();
data.addAll(noteList);
fireContentsChanged(this, 0, noteList.size());
@@ -310,7 +313,6 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
NoteInputDialog dialog = new NoteInputDialog(Main.parent, tr("Comment on note"), tr("Add comment"));
dialog.showNoteDialog(tr("Add comment to note:"), NotesDialog.ICON_COMMENT);
if (dialog.getValue() != 1) {
- Main.debug("User aborted note reopening");
return;
}
int selectedIndex = displayList.getSelectedIndex();
@@ -332,7 +334,6 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
NoteInputDialog dialog = new NoteInputDialog(Main.parent, tr("Close note"), tr("Close note"));
dialog.showNoteDialog(tr("Close note with message:"), NotesDialog.ICON_CLOSED);
if (dialog.getValue() != 1) {
- Main.debug("User aborted note closing");
return;
}
Note note = displayList.getSelectedValue();
@@ -372,7 +373,6 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
NoteInputDialog dialog = new NoteInputDialog(Main.parent, tr("Reopen note"), tr("Reopen note"));
dialog.showNoteDialog(tr("Reopen note with message:"), NotesDialog.ICON_OPEN);
if (dialog.getValue() != 1) {
- Main.debug("User aborted note reopening");
return;
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
index abd2606..a4ba456 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
@@ -3,6 +3,7 @@ package org.openstreetmap.josm.gui.dialogs.properties;
import static org.openstreetmap.josm.tools.I18n.marktr;
import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
import java.awt.Color;
import java.awt.Component;
@@ -50,10 +51,36 @@ public class PropertiesCellRenderer extends DefaultTableCellRenderer {
str = (String) value;
} else if (value instanceof Map<?, ?>) {
Map<?, ?> v = (Map<?, ?>) value;
- if (v.size() != 1) {
- str=tr("<different>");
+ if (v.size() != 1) { // Multiple values: give user a short summary of the values
+ Integer blank_count;
+ Integer other_count;
+ if (v.get("") == null) {
+ blank_count = 0;
+ other_count = v.size();
+ } else {
+ blank_count = (Integer)v.get("");
+ other_count = v.size()-1;
+ }
+ str = "<";
+ if (other_count == 1) {
+ for (Map.Entry<?, ?> entry : v.entrySet()) { // Find the non-blank value in the map
+ if ( entry.getKey() != "") {
+ /* I18n: properties display partial string joined with comma, frst is count, second is value */
+ str += tr("{0} ''{1}''", entry.getValue().toString(), entry.getKey());
+ }
+ }
+ } else {
+ /* I18n: properties display partial string joined with comma */
+ str += trn("{0} different", "{0} different", other_count, other_count);
+ }
+ if(blank_count > 0) {
+ /* I18n: properties display partial string joined with comma */
+ str += trn(", {0} unset", ", {0} unset", blank_count, blank_count);
+ }
+ str += ">";
c.setFont(c.getFont().deriveFont(Font.ITALIC));
- } else {
+
+ } else { // One value: display the value
final Map.Entry<?, ?> entry = v.entrySet().iterator().next();
str = (String) entry.getKey();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
index be2253a..30e6799 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
@@ -703,8 +703,13 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
}
if(tagData.getRowCount() != 0 || membershipData.getRowCount() != 0) {
- setTitle(tr("Tags: {0} / Memberships: {1}",
+ if(newSel.size() > 1) {
+ setTitle(tr("Objects: {2} / Tags: {0} / Memberships: {1}",
+ tagData.getRowCount(), membershipData.getRowCount(), newSel.size()));
+ } else {
+ setTitle(tr("Tags: {0} / Memberships: {1}",
tagData.getRowCount(), membershipData.getRowCount()));
+ }
} else {
setTitle(tr("Tags / Memberships"));
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java b/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
index 607a158..b8fa0a6 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
@@ -6,6 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.trn;
import java.awt.BorderLayout;
import java.awt.Component;
+import java.awt.Container;
import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.FlowLayout;
@@ -76,6 +77,7 @@ import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.io.XmlWriter;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.WindowGeometry;
/**
@@ -633,9 +635,25 @@ class TagEditHelper {
popupMenu.add(rememberLastTags);
}
+ @Override
+ public void setContentPane(Container contentPane) {
+ final String text = "<html>" + Utils.join("<br>", Arrays.asList(
+ tr("<code>Ctrl-1</code> to apply first suggestion"),
+ tr("<code>Shift-Enter</code> to add without closing the dialog"),
+ tr("<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog")
+ ));
+ final JLabel helpLabel = new JLabel(text);
+ helpLabel.setFont(helpLabel.getFont().deriveFont(Font.PLAIN));
+ contentPane.add(helpLabel, GBC.eol().insets(1, 2, 1, 2));
+ super.setContentPane(contentPane);
+ }
+
private void selectNumberOfTags() {
String s = JOptionPane.showInputDialog(this, tr("Please enter the number of recently added tags to display"));
- if (s!=null) try {
+ if (s == null) {
+ return;
+ }
+ try {
int v = Integer.parseInt(s);
if (v>=0 && v<=MAX_LRU_TAGS_NUMBER) {
PROPERTY_RECENT_TAGS_NUMBER.put(v);
@@ -709,8 +727,12 @@ class TagEditHelper {
// Create tag label
final String color = action.isEnabled() ? "" : "; color:gray";
final JLabel tagLabel = new JLabel("<html>"
- + "<style>td{border:1px solid gray; font-weight:normal"+color+"}</style>"
- + "<table><tr><td>" + XmlWriter.encode(t.toString(), true) + "</td></tr></table></html>");
+ + "<style>td{" + color + "}</style>"
+ + "<table><tr>"
+ + "<td>" + count + ".</td>"
+ + "<td style='border:1px solid gray'>" + XmlWriter.encode(t.toString(), true) + "<" +
+ "/td></tr></table></html>");
+ tagLabel.setFont(tagLabel.getFont().deriveFont(Font.PLAIN));
if (action.isEnabled()) {
// Register action
mainPanel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), actionShortcutKey);
@@ -777,6 +799,8 @@ class TagEditHelper {
commandCount++;
Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, value));
changedKey = key;
+ keys.getEditor().setItem("");
+ values.getEditor().setItem("");
}
public void undoAllTagsAdding() {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java
index 38e5ad4..d362c87 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java
@@ -28,6 +28,7 @@ public class RelationSorter {
// first adequate sorter is used, so order matters
additionalSorters.add(new AssociatedStreetRoleStreetSorter());
additionalSorters.add(new AssociatedStreetRoleAddressHouseSorter());
+ additionalSorters.add(new PublicTransportRoleStopPlatformSorter());
}
/**
@@ -79,6 +80,24 @@ public class RelationSorter {
}
/**
+ * Class that sorts the {@code platform} and {@code stop} members of
+ * {@code type=public_transport} relations.
+ */
+ private static class PublicTransportRoleStopPlatformSorter implements AdditionalSorter {
+
+ @Override
+ public boolean acceptsMember(RelationMember m) {
+ return m.getRole() != null && (m.getRole().startsWith("platform") || m.getRole().startsWith("stop"));
+ }
+
+ @Override
+ public List<RelationMember> sortMembers(List<RelationMember> list) {
+ // Retain order from original relation
+ return list;
+ }
+ }
+
+ /**
* Sort a collection of relation members by the way they are linked.
*
* @param relationMembers collection of relation members
diff --git a/src/org/openstreetmap/josm/gui/download/DownloadDialog.java b/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
index c78ba88..8468589 100644
--- a/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
+++ b/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
@@ -30,6 +30,8 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.KeyStroke;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ExpertToggleAction;
@@ -91,16 +93,27 @@ public class DownloadDialog extends JDialog {
JPanel pnl = new JPanel();
pnl.setLayout(new GridBagLayout());
+ final ChangeListener checkboxChangeListener = new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ // size check depends on selected data source
+ updateSizeCheck();
+ }
+ };
+
// adding the download tasks
pnl.add(new JLabel(tr("Data Sources and Types:")), GBC.std().insets(5,5,1,5));
cbDownloadOsmData = new JCheckBox(tr("OpenStreetMap data"), true);
cbDownloadOsmData.setToolTipText(tr("Select to download OSM data in the selected download area."));
- pnl.add(cbDownloadOsmData, GBC.std().insets(1,5,1,5));
+ cbDownloadOsmData.getModel().addChangeListener(checkboxChangeListener);
+ pnl.add(cbDownloadOsmData, GBC.std().insets(1, 5, 1, 5));
cbDownloadGpxData = new JCheckBox(tr("Raw GPS data"));
cbDownloadGpxData.setToolTipText(tr("Select to download GPS traces in the selected download area."));
- pnl.add(cbDownloadGpxData, GBC.std().insets(5,5,1,5));
+ cbDownloadGpxData.getModel().addChangeListener(checkboxChangeListener);
+ pnl.add(cbDownloadGpxData, GBC.std().insets(5, 5, 1, 5));
cbDownloadNotes = new JCheckBox(tr("Notes"));
cbDownloadNotes.setToolTipText(tr("Select to download notes in the selected download area."));
+ cbDownloadNotes.getModel().addChangeListener(checkboxChangeListener);
pnl.add(cbDownloadNotes, GBC.eol().insets(50, 5, 1, 5));
// hook for subclasses
@@ -230,10 +243,18 @@ public class DownloadDialog extends JDialog {
}
private void updateSizeCheck() {
+ boolean isAreaTooLarge = false;
if (currentBounds == null) {
sizeCheck.setText(tr("No area selected yet"));
sizeCheck.setForeground(Color.darkGray);
- } else if (currentBounds.getArea() > Main.pref.getDouble("osm-server.max-request-area", 0.25)) {
+ } else if (isDownloadNotes() && !isDownloadOsmData() && !isDownloadGpxData()) {
+ // see max_note_request_area in https://github.com/openstreetmap/openstreetmap-website/blob/master/config/example.application.yml
+ isAreaTooLarge = currentBounds.getArea() > Main.pref.getDouble("osm-server.max-request-area-notes", 25);
+ } else {
+ // see max_request_area in https://github.com/openstreetmap/openstreetmap-website/blob/master/config/example.application.yml
+ isAreaTooLarge = currentBounds.getArea() > Main.pref.getDouble("osm-server.max-request-area", 0.25);
+ }
+ if (isAreaTooLarge) {
sizeCheck.setText(tr("Download area too large; will probably be rejected by server"));
sizeCheck.setForeground(Color.red);
} else {
diff --git a/src/org/openstreetmap/josm/gui/history/DiffTableModel.java b/src/org/openstreetmap/josm/gui/history/DiffTableModel.java
index 1aabdad..63ad390 100644
--- a/src/org/openstreetmap/josm/gui/history/DiffTableModel.java
+++ b/src/org/openstreetmap/josm/gui/history/DiffTableModel.java
@@ -1,6 +1,8 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.history;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.util.ArrayList;
import java.util.List;
@@ -13,17 +15,13 @@ import org.openstreetmap.josm.gui.history.TwoColumnDiff.Item.DiffItemType;
* used a {@link javax.swing.table.DefaultTableModel} instead.
*/
class DiffTableModel extends AbstractTableModel {
- private List<TwoColumnDiff.Item> rows;
-
- public void setRows(List<TwoColumnDiff.Item> rows) {
- this.rows = rows;
- }
+ private List<TwoColumnDiff.Item> rows = new ArrayList<>();
+ private boolean reversed = false;
- public DiffTableModel(List<TwoColumnDiff.Item> rows) {
+ public void setRows(List<TwoColumnDiff.Item> rows, boolean reversed) {
this.rows = rows;
- }
- public DiffTableModel() {
- this.rows = new ArrayList<>();
+ this.reversed = reversed;
+ fireTableDataChanged();
}
@Override
public int getRowCount() {
@@ -35,6 +33,10 @@ class DiffTableModel extends AbstractTableModel {
return 1;
}
+ public boolean isReversed() {
+ return reversed;
+ }
+
@Override
public TwoColumnDiff.Item getValueAt(int rowIndex, int columnIndex) {
return rows.get(rowIndex);
diff --git a/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java b/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
index 580ef36..eca0b2e 100644
--- a/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
+++ b/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
@@ -83,13 +83,13 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
*/
private HistoryOsmPrimitive latest;
- private VersionTableModel versionTableModel;
- private TagTableModel currentTagTableModel;
- private TagTableModel referenceTagTableModel;
- private DiffTableModel currentRelationMemberTableModel;
- private DiffTableModel referenceRelationMemberTableModel;
- private DiffTableModel referenceNodeListTableModel;
- private DiffTableModel currentNodeListTableModel;
+ private final VersionTableModel versionTableModel;
+ private final TagTableModel currentTagTableModel;
+ private final TagTableModel referenceTagTableModel;
+ private final DiffTableModel currentRelationMemberTableModel;
+ private final DiffTableModel referenceRelationMemberTableModel;
+ private final DiffTableModel referenceNodeListTableModel;
+ private final DiffTableModel currentNodeListTableModel;
/**
* constructor
@@ -222,32 +222,23 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
* TODO: Maybe rename to reflect this? eg. updateNodeListTableModels
*/
protected void initNodeListTableModels() {
-
if(current.getType() != OsmPrimitiveType.WAY || reference.getType() != OsmPrimitiveType.WAY)
return;
TwoColumnDiff diff = new TwoColumnDiff(
((HistoryWay)reference).getNodes().toArray(),
((HistoryWay)current).getNodes().toArray());
- referenceNodeListTableModel.setRows(diff.referenceDiff);
- currentNodeListTableModel.setRows(diff.currentDiff);
-
- referenceNodeListTableModel.fireTableDataChanged();
- currentNodeListTableModel.fireTableDataChanged();
+ referenceNodeListTableModel.setRows(diff.referenceDiff, diff.referenceReversed);
+ currentNodeListTableModel.setRows(diff.currentDiff, false);
}
protected void initMemberListTableModels() {
if(current.getType() != OsmPrimitiveType.RELATION || reference.getType() != OsmPrimitiveType.RELATION)
return;
-
TwoColumnDiff diff = new TwoColumnDiff(
((HistoryRelation)reference).getMembers().toArray(),
((HistoryRelation)current).getMembers().toArray());
-
- referenceRelationMemberTableModel.setRows(diff.referenceDiff);
- currentRelationMemberTableModel.setRows(diff.currentDiff);
-
- currentRelationMemberTableModel.fireTableDataChanged();
- referenceRelationMemberTableModel.fireTableDataChanged();
+ referenceRelationMemberTableModel.setRows(diff.referenceDiff, diff.referenceReversed);
+ currentRelationMemberTableModel.setRows(diff.currentDiff, false);
}
/**
diff --git a/src/org/openstreetmap/josm/gui/history/NodeListViewer.java b/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
index 0c52e18..c74a752 100644
--- a/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
+++ b/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
@@ -17,6 +17,8 @@ import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.ListSelectionModel;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
import javax.swing.table.TableModel;
import org.openstreetmap.josm.Main;
@@ -59,10 +61,10 @@ public class NodeListViewer extends JPanel {
}
protected JTable buildReferenceNodeListTable() {
- JTable table = new JTable(
- model.getNodeListTableModel(PointInTimeType.REFERENCE_POINT_IN_TIME),
- new NodeListTableColumnModel()
- );
+ final DiffTableModel tableModel = model.getNodeListTableModel(PointInTimeType.REFERENCE_POINT_IN_TIME);
+ final NodeListTableColumnModel columnModel = new NodeListTableColumnModel();
+ final JTable table = new JTable(tableModel, columnModel);
+ tableModel.addTableModelListener(newReversedChangeListener(table, columnModel));
table.setName("table.referencenodelisttable");
table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());
@@ -72,10 +74,10 @@ public class NodeListViewer extends JPanel {
}
protected JTable buildCurrentNodeListTable() {
- JTable table = new JTable(
- model.getNodeListTableModel(PointInTimeType.CURRENT_POINT_IN_TIME),
- new NodeListTableColumnModel()
- );
+ final DiffTableModel tableModel = model.getNodeListTableModel(PointInTimeType.CURRENT_POINT_IN_TIME);
+ final NodeListTableColumnModel columnModel = new NodeListTableColumnModel();
+ final JTable table = new JTable(tableModel, columnModel);
+ tableModel.addTableModelListener(newReversedChangeListener(table, columnModel));
table.setName("table.currentnodelisttable");
table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());
@@ -84,6 +86,26 @@ public class NodeListViewer extends JPanel {
return table;
}
+ protected TableModelListener newReversedChangeListener(final JTable table, final NodeListTableColumnModel columnModel) {
+ return new TableModelListener() {
+ private Boolean reversed = null;
+ final String nonReversedText = tr("Nodes") + (table.getFont().canDisplay('\u25bc') ? " \u25bc" : " (1-n)");
+ final String reversedText = tr("Nodes") + (table.getFont().canDisplay('\u25b2') ? " \u25b2" : " (n-1)");
+
+ @Override
+ public void tableChanged(TableModelEvent e) {
+ if (e.getSource() instanceof DiffTableModel) {
+ final DiffTableModel model = (DiffTableModel) e.getSource();
+ if (reversed == null || reversed != model.isReversed()) {
+ reversed = model.isReversed();
+ columnModel.getColumn(0).setHeaderValue(reversed ? reversedText : nonReversedText);
+ table.getTableHeader().repaint();
+ }
+ }
+ }
+ };
+ }
+
protected void build() {
setLayout(new GridBagLayout());
GridBagConstraints gc = new GridBagConstraints();
diff --git a/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java b/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
index 187345f..f35e1fa 100644
--- a/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
+++ b/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
@@ -4,6 +4,8 @@ package org.openstreetmap.josm.gui.history;
import java.awt.Color;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.openstreetmap.josm.gui.history.TwoColumnDiff.Item.DiffItemType;
@@ -54,6 +56,7 @@ class TwoColumnDiff {
public List<Item> currentDiff;
Object[] reference;
Object[] current;
+ boolean referenceReversed = false;
public TwoColumnDiff(Object[] reference, Object[] current) {
this.reference = Utils.copyArray(reference);
@@ -64,9 +67,19 @@ class TwoColumnDiff {
}
private void diff() {
- Diff diff = new Diff(reference, current);
- Diff.Change script = diff.diff_2(false);
- twoColumnDiffFromScript(script, reference, current);
+ Diff.Change script = new Diff(reference, current).diff_2(false);
+ // attempt diff with reference reversed and test whether less deletions+inserts are required
+ Object[] referenceReversed = Utils.copyArray(reference);
+ Collections.reverse(Arrays.asList(referenceReversed));
+ Diff.Change scriptReversed = new Diff(referenceReversed, current).diff_2(false);
+ if (scriptReversed == null /* reference and current are identical */
+ || script != null && scriptReversed.deleted + scriptReversed.inserted < script.deleted + script.inserted) {
+ this.referenceReversed = true;
+ twoColumnDiffFromScript(scriptReversed, referenceReversed, current);
+ } else {
+ this.referenceReversed = false;
+ twoColumnDiffFromScript(script, reference, current);
+ }
}
/**
diff --git a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
index ec36057..21f3019 100644
--- a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
+++ b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
@@ -4,15 +4,21 @@ package org.openstreetmap.josm.gui.history;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.BorderLayout;
+import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.GridLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.text.DateFormat;
+import java.util.Collections;
import java.util.Observable;
import java.util.Observer;
+import javax.swing.AbstractAction;
+import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -24,11 +30,13 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.User;
import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.gui.dialogs.ChangesetDialog;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.gui.widgets.UrlLabel;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.date.DateUtils;
@@ -43,10 +51,15 @@ public class VersionInfoPanel extends JPanel implements Observer{
private JMultilineLabel lblInfo;
private UrlLabel lblUser;
private UrlLabel lblChangeset;
+ private final OpenChangesetDialogAction changesetDialogAction = new OpenChangesetDialogAction();
+ private final JButton changesetButton = new JButton(changesetDialogAction);
private JPanel pnlChangesetSource;
+ private JPanel pnlChangesetImageryUsed;
private JLabel lblSource;
+ private JLabel lblImageryUsed;
private JTextArea lblChangesetComment;
private JTextArea lblChangesetSource;
+ private JTextArea lblChangesetImageryUsed;
protected static JTextArea buildTextArea(String tooltip) {
JTextArea lbl = new JTextArea();
@@ -70,7 +83,7 @@ public class VersionInfoPanel extends JPanel implements Observer{
protected static JPanel buildTextPanel(JLabel label, JTextArea textArea) {
JPanel pnl = new JPanel(new GridBagLayout());
pnl.add(label, GBC.std().anchor(GBC.NORTHWEST));
- pnl.add(textArea, GBC.eol().fill());
+ pnl.add(textArea, GBC.eol().insets(2, 0, 0, 0).fill());
return pnl;
}
@@ -83,15 +96,19 @@ public class VersionInfoPanel extends JPanel implements Observer{
lblUser = new UrlLabel("", 2);
pnlUserAndChangeset.add(new JLabel(tr("User:")));
pnlUserAndChangeset.add(lblUser);
- pnlUserAndChangeset.add(new JLabel(tr("Changeset:")));
+ changesetButton.setMargin(new Insets(0, 0, 0, 0));
+ pnlUserAndChangeset.add(changesetButton);
lblChangeset = new UrlLabel("", 2);
pnlUserAndChangeset.add(lblChangeset);
lblChangesetComment = buildTextArea(tr("Changeset comment"));
lblChangesetSource = buildTextArea(tr("Changeset source"));
+ lblChangesetImageryUsed = buildTextArea(tr("Imagery used"));
lblSource = buildLabel(tr("<b>Source</b>:"), tr("Changeset source"), lblChangesetSource);
+ lblImageryUsed = buildLabel(tr("<b>Imagery</b>:"), tr("Imagery used"), lblChangesetImageryUsed);
pnlChangesetSource = buildTextPanel(lblSource, lblChangesetSource);
+ pnlChangesetImageryUsed = buildTextPanel(lblImageryUsed, lblChangesetImageryUsed);
setLayout(new GridBagLayout());
GridBagConstraints gc = new GridBagConstraints();
@@ -107,6 +124,8 @@ public class VersionInfoPanel extends JPanel implements Observer{
add(lblChangesetComment, gc);
gc.gridy = 3;
add(pnlChangesetSource, gc);
+ gc.gridy = 4;
+ add(pnlChangesetImageryUsed, gc);
}
protected HistoryOsmPrimitive getPrimitive() {
@@ -182,6 +201,8 @@ public class VersionInfoPanel extends JPanel implements Observer{
String url = Main.getBaseBrowseUrl() + "/changeset/" + primitive.getChangesetId();
lblChangeset.setUrl(url);
lblChangeset.setDescription(Long.toString(primitive.getChangesetId()));
+ changesetDialogAction.setId((int) primitive.getChangesetId());
+ changesetButton.setEnabled(true);
String username = "";
if (user != null) {
@@ -214,11 +235,14 @@ public class VersionInfoPanel extends JPanel implements Observer{
}
lblChangeset.setDescription(tr("none"));
lblChangeset.setUrl(null);
+ changesetDialogAction.setId(null);
+ changesetButton.setEnabled(false);
}
final Changeset oppCs = model.getPointInTime(pointInTimeType.opposite()).getChangeset();
updateText(cs, "comment", lblChangesetComment, null, oppCs, lblChangesetComment);
updateText(cs, "source", lblChangesetSource, lblSource, oppCs, pnlChangesetSource);
+ updateText(cs, "imagery_used", lblChangesetImageryUsed, lblImageryUsed, oppCs, pnlChangesetImageryUsed);
}
protected static void updateText(Changeset cs, String attr, JTextArea textArea, JLabel label, Changeset oppCs, JComponent container) {
@@ -231,4 +255,22 @@ public class VersionInfoPanel extends JPanel implements Observer{
// Hide container if values of both versions are empty
container.setVisible(text != null || (oppCs != null && oppCs.get(attr) != null));
}
+
+ static class OpenChangesetDialogAction extends AbstractAction {
+ private Integer id;
+
+ public OpenChangesetDialogAction() {
+ super(tr("Changeset"), new ImageProvider("dialogs/changeset", "changesetmanager").resetMaxSize(new Dimension(16, 16)).get());
+ putValue(SHORT_DESCRIPTION, tr("Opens the Changeset Manager window for the selected changesets"));
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ ChangesetDialog.LaunchChangesetManager.displayChangesets(Collections.singleton(id));
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java b/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
index df5670c..dc29bd1 100644
--- a/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
@@ -82,8 +82,7 @@ public class BasicUploadSettingsPanel extends JPanel {
hcbUploadSource.setToolTipText(tr("Enter a source"));
hcbUploadSource.setMaxTextLength(Changeset.MAX_CHANGESET_TAG_LENGTH);
- List<String> sourceHistory = new LinkedList<>(Main.pref.getCollection(SOURCE_HISTORY_KEY,
- Arrays.asList("knowledge", "survey", "Bing")));
+ List<String> sourceHistory = new LinkedList<>(Main.pref.getCollection(SOURCE_HISTORY_KEY, getDefaultSources()));
Collections.reverse(sourceHistory); // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
hcbUploadSource.setPossibleItems(sourceHistory);
CommentModelListener sourceModelListener = new CommentModelListener(hcbUploadSource, changesetSourceModel);
@@ -93,6 +92,10 @@ public class BasicUploadSettingsPanel extends JPanel {
return pnl;
}
+ static public List<String> getDefaultSources() {
+ return Arrays.asList("knowledge", "survey", "Bing");
+ }
+
protected void build() {
setLayout(new BorderLayout());
setBorder(BorderFactory.createEmptyBorder(3,3,3,3));
diff --git a/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java b/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java
index 2e17266..167a38f 100644
--- a/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java
+++ b/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java
@@ -63,17 +63,18 @@ public class DownloadPrimitivesWithReferrersTask extends PleaseWaitRunnable {
* @param downloadReferrers if the referrers of the object should be downloaded as well,
* i.e., parent relations, and for nodes, additionally, parent ways
* @param full if the members of a relation should be downloaded as well
+ * @param newLayerName the name to use for the new layer, can be {@code null}.
* @param monitor ProgressMonitor to use, or null to create a new one
*/
public DownloadPrimitivesWithReferrersTask(boolean newLayer, List<PrimitiveId> ids, boolean downloadReferrers,
- boolean full, ProgressMonitor monitor) {
+ boolean full, String newLayerName, ProgressMonitor monitor) {
super(tr("Download objects"), monitor, false);
this.ids = ids;
this.downloadReferrers = downloadReferrers;
this.full = full;
this.newLayer = newLayer;
// All downloaded primitives are put in a tmpLayer
- tmpLayer = new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null);
+ tmpLayer = new OsmDataLayer(new DataSet(), newLayerName != null ? newLayerName : OsmDataLayer.createNewName(), null);
}
/**
diff --git a/src/org/openstreetmap/josm/gui/io/UploadDialog.java b/src/org/openstreetmap/josm/gui/io/UploadDialog.java
index f159b0b..e4cf835 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadDialog.java
@@ -569,8 +569,8 @@ public class UploadDialog extends AbstractUploadDialog implements PropertyChange
setTitle(tr("Upload to ''{0}''", url));
}
- private String getLastChangesetTagFromHistory(String historyKey) {
- Collection<String> history = Main.pref.getCollection(historyKey, new ArrayList<String>());
+ private String getLastChangesetTagFromHistory(String historyKey, List<String> def) {
+ Collection<String> history = Main.pref.getCollection(historyKey, def);
int age = (int) (System.currentTimeMillis() / 1000 - Main.pref.getInteger(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0));
if (age < Main.pref.getInteger(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, 4 * 3600 * 1000) && history != null && !history.isEmpty()) {
return history.iterator().next();
@@ -580,10 +580,10 @@ public class UploadDialog extends AbstractUploadDialog implements PropertyChange
}
public String getLastChangesetCommentFromHistory() {
- return getLastChangesetTagFromHistory(BasicUploadSettingsPanel.HISTORY_KEY);
+ return getLastChangesetTagFromHistory(BasicUploadSettingsPanel.HISTORY_KEY, new ArrayList<String>());
}
public String getLastChangesetSourceFromHistory() {
- return getLastChangesetTagFromHistory(BasicUploadSettingsPanel.SOURCE_HISTORY_KEY);
+ return getLastChangesetTagFromHistory(BasicUploadSettingsPanel.SOURCE_HISTORY_KEY, BasicUploadSettingsPanel.getDefaultSources());
}
}
diff --git a/src/org/openstreetmap/josm/gui/layer/NoteLayer.java b/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
index 42d0697..dba332d 100644
--- a/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
@@ -9,8 +9,10 @@ import java.awt.Point;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.io.File;
-import java.text.SimpleDateFormat;
+import java.text.DateFormat;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import javax.swing.Action;
@@ -33,6 +35,7 @@ import org.openstreetmap.josm.gui.dialogs.NotesDialog;
import org.openstreetmap.josm.io.NoteExporter;
import org.openstreetmap.josm.io.XmlWriter;
import org.openstreetmap.josm.tools.ColorHelper;
+import org.openstreetmap.josm.tools.date.DateUtils;
/**
* A layer to hold Note objects
@@ -46,15 +49,14 @@ public class NoteLayer extends AbstractModifiableLayer implements MouseListener
* @param notes A list of notes to show in this layer
* @param name The name of the layer. Typically "Notes"
*/
- public NoteLayer(List<Note> notes, String name) {
+ public NoteLayer(Collection<Note> notes, String name) {
super(name);
noteData = new NoteData(notes);
}
/** Convenience constructor that creates a layer with an empty note list */
public NoteLayer() {
- super(tr("Notes"));
- noteData = new NoteData();
+ this(Collections.<Note>emptySet(), tr("Notes"));
}
@Override
@@ -87,7 +89,6 @@ public class NoteLayer extends AbstractModifiableLayer implements MouseListener
@Override
public boolean requiresSaveToFile() {
- Main.debug("associated notes file: " + getAssociatedFile());
return getAssociatedFile() != null && isModified();
}
@@ -111,10 +112,8 @@ public class NoteLayer extends AbstractModifiableLayer implements MouseListener
if (noteData.getSelectedNote() != null) {
StringBuilder sb = new StringBuilder("<html>");
sb.append(tr("Note"));
- sb.append(" " + noteData.getSelectedNote().getId());
- List<NoteComment> comments = noteData.getSelectedNote().getComments();
- SimpleDateFormat dayFormat = new SimpleDateFormat("MMM d, yyyy");
- for (NoteComment comment : comments) {
+ sb.append(" ").append(noteData.getSelectedNote().getId());
+ for (NoteComment comment : noteData.getSelectedNote().getComments()) {
String commentText = comment.getText();
//closing a note creates an empty comment that we don't want to show
if (commentText != null && commentText.trim().length() > 0) {
@@ -125,10 +124,11 @@ public class NoteLayer extends AbstractModifiableLayer implements MouseListener
}
sb.append(userName);
sb.append(" on ");
- sb.append(dayFormat.format(comment.getCommentTimestamp()));
+ sb.append(DateUtils.getDateFormat(DateFormat.MEDIUM).format(comment.getCommentTimestamp()));
sb.append(":<br/>");
String htmlText = XmlWriter.encode(comment.getText(), true);
htmlText = htmlText.replace("
", "<br/>"); //encode method leaves us with entity instead of \n
+ htmlText = htmlText.replace("/", "/\u200b"); //zero width space to wrap long URLs (see #10864)
sb.append(htmlText);
}
}
@@ -148,7 +148,7 @@ public class NoteLayer extends AbstractModifiableLayer implements MouseListener
//but without it, the tooltip doesn't get sized correctly
for (int x = 0; x < 2; x++) {
Dimension d = toolTip.getUI().getPreferredSize(toolTip);
- d.width = Math.min(d.width, (mv.getWidth() * 1 / 2));
+ d.width = Math.min(d.width, (mv.getWidth() / 2));
if (d.width > 0 && d.height > 0) {
toolTip.setSize(d);
try {
@@ -186,6 +186,9 @@ public class NoteLayer extends AbstractModifiableLayer implements MouseListener
@Override
public void visitBoundingBox(BoundingXYVisitor v) {
+ for (Note note : noteData.getNotes()) {
+ v.visit(note.getLatLon());
+ }
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/layer/TMSLayer.java b/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
index e6d113f..a496320 100644
--- a/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
@@ -21,13 +21,11 @@ import java.io.StringReader;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashSet;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Scanner;
-import java.util.Set;
import java.util.concurrent.Callable;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -41,14 +39,12 @@ import javax.swing.JPopupMenu;
import org.openstreetmap.gui.jmapviewer.AttributionSupport;
import org.openstreetmap.gui.jmapviewer.Coordinate;
-import org.openstreetmap.gui.jmapviewer.JobDispatcher;
import org.openstreetmap.gui.jmapviewer.MemoryTileCache;
-import org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader;
import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
-import org.openstreetmap.gui.jmapviewer.TMSFileCacheTileLoader;
import org.openstreetmap.gui.jmapviewer.Tile;
import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader;
-import org.openstreetmap.gui.jmapviewer.interfaces.TileClearController;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
import org.openstreetmap.gui.jmapviewer.tilesources.BingAerialTileSource;
@@ -63,6 +59,7 @@ import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.imagery.ImageryInfo;
import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
+import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.data.preferences.IntegerProperty;
@@ -75,7 +72,6 @@ import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.gui.progress.ProgressMonitor.CancelListener;
import org.openstreetmap.josm.io.CacheCustomContent;
import org.openstreetmap.josm.io.OsmTransferException;
import org.openstreetmap.josm.io.UTFInputStreamReader;
@@ -108,7 +104,6 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
public static final IntegerProperty PROP_MAX_ZOOM_LVL = new IntegerProperty(PREFERENCE_PREFIX + ".max_zoom_lvl", DEFAULT_MAX_ZOOM);
//public static final BooleanProperty PROP_DRAW_DEBUG = new BooleanProperty(PREFERENCE_PREFIX + ".draw_debug", false);
public static final BooleanProperty PROP_ADD_TO_SLIPPYMAP_CHOOSER = new BooleanProperty(PREFERENCE_PREFIX + ".add_to_slippymap_chooser", true);
- public static final IntegerProperty PROP_TMS_JOBS = new IntegerProperty("tmsloader.maxjobs", 25);
public static final StringProperty PROP_TILECACHE_DIR;
static {
@@ -122,40 +117,50 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
}
public interface TileLoaderFactory {
- OsmTileLoader makeTileLoader(TileLoaderListener listener);
+ TileLoader makeTileLoader(TileLoaderListener listener);
+ TileLoader makeTileLoader(TileLoaderListener listener, Map<String, String> headers);
}
- protected MemoryTileCache tileCache;
+ protected TileCache tileCache;
protected TileSource tileSource;
- protected OsmTileLoader tileLoader;
+ protected TileLoader tileLoader;
+
public static TileLoaderFactory loaderFactory = new TileLoaderFactory() {
@Override
- public OsmTileLoader makeTileLoader(TileLoaderListener listener) {
- String cachePath = TMSLayer.PROP_TILECACHE_DIR.get();
- if (cachePath != null && !cachePath.isEmpty()) {
- try {
- OsmFileCacheTileLoader loader;
- loader = new TMSFileCacheTileLoader(listener, new File(cachePath));
- loader.headers.put("User-Agent", Version.getInstance().getFullAgentString());
- return loader;
- } catch (IOException e) {
- Main.warn(e);
- }
+ public TileLoader makeTileLoader(TileLoaderListener listener, Map<String, String> inputHeaders) {
+ Map<String, String> headers = new HashMap<>();
+ headers.put("User-Agent", Version.getInstance().getFullAgentString());
+ headers.put("Accept", "text/html, image/png, image/jpeg, image/gif, */*");
+ if (inputHeaders != null)
+ headers.putAll(inputHeaders);
+
+ try {
+ return new TMSCachedTileLoader(listener, "TMS",
+ Main.pref.getInteger("socket.timeout.connect",15) * 1000,
+ Main.pref.getInteger("socket.timeout.read", 30) * 1000,
+ headers,
+ PROP_TILECACHE_DIR.get());
+ } catch (IOException e) {
+ Main.warn(e);
}
return null;
}
+
+ @Override
+ public TileLoader makeTileLoader(TileLoaderListener listener) {
+ return makeTileLoader(listener, null);
+ }
};
/**
* Plugins that wish to set custom tile loader should call this method
*/
+
public static void setCustomTileLoaderFactory(TileLoaderFactory loaderFactory) {
TMSLayer.loaderFactory = loaderFactory;
}
- private Set<Tile> tileRequestsOutstanding = new HashSet<>();
-
@Override
public synchronized void tileLoadingFinished(Tile tile, boolean success) {
if (tile.hasError()) {
@@ -165,58 +170,16 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
if (sharpenLevel != 0 && success) {
tile.setImage(sharpenImage(tile.getImage()));
}
- tile.setLoaded(true);
+ tile.setLoaded(success);
needRedraw = true;
if (Main.map != null) {
Main.map.repaint(100);
}
- tileRequestsOutstanding.remove(tile);
if (Main.isDebugEnabled()) {
Main.debug("tileLoadingFinished() tile: " + tile + " success: " + success);
}
}
- private static class TmsTileClearController implements TileClearController, CancelListener {
-
- private final ProgressMonitor monitor;
- private boolean cancel = false;
-
- public TmsTileClearController(ProgressMonitor monitor) {
- this.monitor = monitor;
- this.monitor.addCancelListener(this);
- }
-
- @Override
- public void initClearDir(File dir) {
- }
-
- @Override
- public void initClearFiles(File[] files) {
- monitor.setTicksCount(files.length);
- monitor.setTicks(0);
- }
-
- @Override
- public boolean cancel() {
- return cancel;
- }
-
- @Override
- public void fileDeleted(File file) {
- monitor.setTicks(monitor.getTicks()+1);
- }
-
- @Override
- public void clearFinished() {
- monitor.finishTask();
- }
-
- @Override
- public void operationCanceled() {
- cancel = true;
- }
- }
-
/**
* Clears the tile cache.
*
@@ -225,13 +188,12 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
* method.
*
* @param monitor
- * @see MemoryTileCache#clear()
* @see OsmFileCacheTileLoader#clearCache(org.openstreetmap.gui.jmapviewer.interfaces.TileSource, org.openstreetmap.gui.jmapviewer.interfaces.TileClearController)
*/
void clearTileCache(ProgressMonitor monitor) {
tileCache.clear();
if (tileLoader instanceof CachedTileLoader) {
- ((CachedTileLoader)tileLoader).clearCache(tileSource, new TmsTileClearController(monitor));
+ ((CachedTileLoader)tileLoader).clearCache(tileSource);
}
}
@@ -415,26 +377,20 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
currentZoomLevel = getBestZoom();
- tileCache = new MemoryTileCache();
-
- tileLoader = loaderFactory.makeTileLoader(this);
- if (tileLoader == null) {
- tileLoader = new OsmTileLoader(this);
- }
- tileLoader.timeoutConnect = Main.pref.getInteger("socket.timeout.connect",15) * 1000;
- tileLoader.timeoutRead = Main.pref.getInteger("socket.timeout.read", 30) * 1000;
+ Map<String, String> headers = null;
if (tileSource instanceof TemplatedTMSTileSource) {
- for(Entry<String, String> e : ((TemplatedTMSTileSource)tileSource).getHeaders().entrySet()) {
- tileLoader.headers.put(e.getKey(), e.getValue());
- }
+ headers = (((TemplatedTMSTileSource)tileSource).getHeaders());
}
- tileLoader.headers.put("User-Agent", Version.getInstance().getFullAgentString());
- }
- @Override
- public void setOffset(double dx, double dy) {
- super.setOffset(dx, dy);
- needRedraw = true;
+ // FIXME: tileCache = new MemoryTileCache();
+ tileLoader = loaderFactory.makeTileLoader(this, headers);
+ if (tileLoader instanceof TMSCachedTileLoader) {
+ tileCache = (TileCache) tileLoader;
+ } else {
+ tileCache = new MemoryTileCache();
+ }
+ if (tileLoader == null)
+ tileLoader = new OsmTileLoader(this);
}
/**
@@ -471,27 +427,17 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
return intResult;
}
- /**
- * Function to set the maximum number of workers for tile loading to the value defined
- * in preferences.
- */
- public static void setMaxWorkers() {
- JobDispatcher.setMaxWorkers(PROP_TMS_JOBS.get());
- JobDispatcher.getInstance().setLIFO(true);
- }
-
@SuppressWarnings("serial")
public TMSLayer(ImageryInfo info) {
super(info);
- setMaxWorkers();
if(!isProjectionSupported(Main.getProjection())) {
JOptionPane.showMessageDialog(Main.parent,
- tr("TMS layers do not support the projection {0}.\n{1}\n"
- + "Change the projection or remove the layer.",
- Main.getProjection().toCode(), nameSupportedProjections()),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE);
+ tr("TMS layers do not support the projection {0}.\n{1}\n"
+ + "Change the projection or remove the layer.",
+ Main.getProjection().toCode(), nameSupportedProjections()),
+ tr("Warning"),
+ JOptionPane.WARNING_MESSAGE);
}
setBackgroundLayer(true);
@@ -684,8 +630,6 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
Main.debug("zoomChanged(): " + currentZoomLevel);
}
needRedraw = true;
- JobDispatcher.getInstance().cancelOutstandingJobs();
- tileRequestsOutstanding.clear();
}
int getMaxZoomLvl() {
@@ -770,7 +714,7 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
* are temporary only and intentionally not inserted
* into the tileCache.
*/
- synchronized Tile tempCornerTile(Tile t) {
+ Tile tempCornerTile(Tile t) {
int x = t.getXtile() + 1;
int y = t.getYtile() + 1;
int zoom = t.getZoom();
@@ -780,7 +724,7 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
return new Tile(tileSource, x, y, zoom);
}
- synchronized Tile getOrCreateTile(int x, int y, int zoom) {
+ Tile getOrCreateTile(int x, int y, int zoom) {
Tile tile = getTile(x, y, zoom);
if (tile == null) {
tile = new Tile(tileSource, x, y, zoom);
@@ -794,24 +738,21 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
* This can and will return null for tiles that are not
* already in the cache.
*/
- synchronized Tile getTile(int x, int y, int zoom) {
+ Tile getTile(int x, int y, int zoom) {
int max = (1 << zoom);
if (x < 0 || x >= max || y < 0 || y >= max)
return null;
return tileCache.getTile(tileSource, x, y, zoom);
}
- synchronized boolean loadTile(Tile tile, boolean force) {
+ boolean loadTile(Tile tile, boolean force) {
if (tile == null)
return false;
- if (!force && (tile.hasError() || tile.isLoaded()))
+ if (!force && (tile.isLoaded() || tile.hasError()))
return false;
if (tile.isLoading())
return false;
- if (tileRequestsOutstanding.contains(tile))
- return false;
- tileRequestsOutstanding.add(tile);
- JobDispatcher.getInstance().addJob(tileLoader.createTileLoaderJob(tile));
+ tileLoader.createTileLoaderJob(tile).submit();
return true;
}
@@ -1268,28 +1209,32 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
public TileSet getTileSet(int zoom) {
if (zoom < minZoom)
return nullTileSet;
- TileSet ts = tileSets[zoom-minZoom];
- if (ts == null) {
- ts = new TileSet(topLeft, botRight, zoom);
- tileSets[zoom-minZoom] = ts;
+ synchronized (tileSets) {
+ TileSet ts = tileSets[zoom-minZoom];
+ if (ts == null) {
+ ts = new TileSet(topLeft, botRight, zoom);
+ tileSets[zoom-minZoom] = ts;
+ }
+ return ts;
}
- return ts;
}
+
public TileSetInfo getTileSetInfo(int zoom) {
if (zoom < minZoom)
return new TileSetInfo();
- TileSetInfo tsi = tileSetInfos[zoom-minZoom];
- if (tsi == null) {
- tsi = TMSLayer.getTileSetInfo(getTileSet(zoom));
- tileSetInfos[zoom-minZoom] = tsi;
+ synchronized (tileSetInfos) {
+ TileSetInfo tsi = tileSetInfos[zoom-minZoom];
+ if (tsi == null) {
+ tsi = TMSLayer.getTileSetInfo(getTileSet(zoom));
+ tileSetInfos[zoom-minZoom] = tsi;
+ }
+ return tsi;
}
- return tsi;
}
}
@Override
public void paint(Graphics2D g, MapView mv, Bounds bounds) {
- //long start = System.currentTimeMillis();
EastNorth topLeft = mv.getEastNorth(0, 0);
EastNorth botRight = mv.getEastNorth(mv.getWidth(), mv.getHeight());
@@ -1435,6 +1380,14 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
myDrawString(g, tr("Display zoom: {0}", displayZoomLevel), 50, 155);
myDrawString(g, tr("Pixel scale: {0}", getScaleFactor(currentZoomLevel)), 50, 170);
myDrawString(g, tr("Best zoom: {0}", Math.log(getScaleFactor(1))/Math.log(2)/2+1), 50, 185);
+ if(tileLoader instanceof TMSCachedTileLoader) {
+ TMSCachedTileLoader cachedTileLoader = (TMSCachedTileLoader)tileLoader;
+ int offset = 185;
+ for(String part: cachedTileLoader.getStats().split("\n")) {
+ myDrawString(g, tr("Cache stats: {0}", part), 50, offset+=15);
+ }
+
+ }
}
}
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
index d739733..4462bb3 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
@@ -602,8 +602,8 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
try {
metadata = JpegMetadataReader.readMetadata(e.getFile());
- dirExif = metadata.getDirectory(ExifIFD0Directory.class);
- dirGps = metadata.getDirectory(GpsDirectory.class);
+ dirExif = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
+ dirGps = metadata.getFirstDirectoryOfType(GpsDirectory.class);
} catch (CompoundException | IOException p) {
e.setExifCoor(null);
e.setPos(null);
diff --git a/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java
index 565f880..17d177d 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java
@@ -119,25 +119,30 @@ public class BoxTextElemStyle extends ElemStyle {
HorizontalTextAlignment hAlign = HorizontalTextAlignment.RIGHT;
Keyword hAlignKW = c.get(TEXT_ANCHOR_HORIZONTAL, Keyword.RIGHT, Keyword.class);
- if ("left".equals(hAlignKW.val)) {
- hAlign = HorizontalTextAlignment.LEFT;
- } else if ("center".equals(hAlignKW.val)) {
- hAlign = HorizontalTextAlignment.CENTER;
- } else if ("right".equals(hAlignKW.val)) {
- hAlign = HorizontalTextAlignment.RIGHT;
+ switch (hAlignKW.val) {
+ case "left":
+ hAlign = HorizontalTextAlignment.LEFT;
+ break;
+ case "center":
+ hAlign = HorizontalTextAlignment.CENTER;
}
VerticalTextAlignment vAlign = VerticalTextAlignment.BOTTOM;
- String vAlignStr = c.get(TEXT_ANCHOR_VERTICAL, Keyword.BOTTOM, Keyword.class).val;
- if ("above".equals(vAlignStr)) {
- vAlign = VerticalTextAlignment.ABOVE;
- } else if ("top".equals(vAlignStr)) {
- vAlign = VerticalTextAlignment.TOP;
- } else if ("center".equals(vAlignStr)) {
- vAlign = VerticalTextAlignment.CENTER;
- } else if ("bottom".equals(vAlignStr)) {
- vAlign = VerticalTextAlignment.BOTTOM;
- } else if ("below".equals(vAlignStr)) {
- vAlign = VerticalTextAlignment.BELOW;
+ Keyword vAlignKW = c.get(TEXT_ANCHOR_VERTICAL, Keyword.BOTTOM, Keyword.class);
+ switch (vAlignKW.val) {
+ case "bottom":
+ vAlign = VerticalTextAlignment.BOTTOM;
+ break;
+ case "above":
+ vAlign = VerticalTextAlignment.ABOVE;
+ break;
+ case "top":
+ vAlign = VerticalTextAlignment.TOP;
+ break;
+ case "center":
+ vAlign = VerticalTextAlignment.CENTER;
+ break;
+ case "below":
+ vAlign = VerticalTextAlignment.BELOW;
}
return new BoxTextElemStyle(c, text, boxProvider, box, hAlign, vAlign);
diff --git a/src/org/openstreetmap/josm/gui/mappaint/Environment.java b/src/org/openstreetmap/josm/gui/mappaint/Environment.java
index 31cfd17..bc58604 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/Environment.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/Environment.java
@@ -39,6 +39,11 @@ public class Environment {
public Integer index = null;
/**
+ * count of nodes in parent way or members in parent relation. Must be != null in LINK context.
+ */
+ public Integer count = null;
+
+ /**
* Creates a new uninitialized environment.
*/
public Environment() {}
@@ -68,6 +73,7 @@ public class Environment {
this.child = other.child;
this.source = other.source;
this.index = other.index;
+ this.count = other.count;
this.context = other.getContext();
}
@@ -98,15 +104,17 @@ public class Environment {
* Creates a clone of this environment, with the specified parent, index, and context set to {@link Context#LINK}.
* @param parent the matching parent object
* @param index index of node in parent way or member in parent relation
+ * @param count count of nodes in parent way or members in parent relation
* @return A clone of this environment, with the specified parent, index, and context set to {@link Context#LINK}
* @since 6175
* @see #parent
* @see #index
*/
- public Environment withParentAndIndexAndLinkContext(OsmPrimitive parent, int index) {
+ public Environment withParentAndIndexAndLinkContext(OsmPrimitive parent, int index, int count) {
Environment e = new Environment(this);
e.parent = parent;
e.index = index;
+ e.count = count;
e.context = Context.LINK;
return e;
}
@@ -127,15 +135,17 @@ public class Environment {
* Creates a clone of this environment, with the specified child, index, and context set to {@link Context#LINK}.
* @param child the matching child object
* @param index index of node in parent way or member in parent relation
+ * @param count count of nodes in parent way or members in parent relation
* @return A clone of this environment, with the specified child, index, and context set to {@code Context#LINK}
* @since 6175
* @see #child
* @see #index
*/
- public Environment withChildAndIndexAndLinkContext(OsmPrimitive child, int index) {
+ public Environment withChildAndIndexAndLinkContext(OsmPrimitive child, int index, int count) {
Environment e = new Environment(this);
e.child = child;
e.index = index;
+ e.count = count;
e.context = Context.LINK;
return e;
}
@@ -143,12 +153,14 @@ public class Environment {
/**
* Creates a clone of this environment, with the specified index.
* @param index index of node in parent way or member in parent relation
+ * @param count count of nodes in parent way or members in parent relation
* @return A clone of this environment, with the specified index
* @see #index
*/
- public Environment withIndex(int index) {
+ public Environment withIndex(int index, int count) {
Environment e = new Environment(this);
e.index = index;
+ e.count = count;
return e;
}
@@ -213,6 +225,7 @@ public class Environment {
parent = null;
child = null;
index = null;
+ count = null;
}
public Cascade getCascade(String layer) {
diff --git a/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java
index 6e268c3..cadc73d 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java
@@ -18,6 +18,7 @@ import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.BoxProvider;
import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.SimpleBoxProvider;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
+import org.openstreetmap.josm.gui.util.RotationAngle;
import org.openstreetmap.josm.tools.Utils;
/**
@@ -25,6 +26,7 @@ import org.openstreetmap.josm.tools.Utils;
*/
public class NodeElemStyle extends ElemStyle implements StyleKeys {
public final MapImage mapImage;
+ public final RotationAngle mapImageAngle;
public final Symbol symbol;
private Image enabledNodeIcon;
@@ -98,10 +100,11 @@ public class NodeElemStyle extends ElemStyle implements StyleKeys {
public static final StyleList DEFAULT_NODE_STYLELIST = new StyleList(NodeElemStyle.SIMPLE_NODE_ELEMSTYLE);
public static final StyleList DEFAULT_NODE_STYLELIST_TEXT = new StyleList(NodeElemStyle.SIMPLE_NODE_ELEMSTYLE, BoxTextElemStyle.SIMPLE_NODE_TEXT_ELEMSTYLE);
- protected NodeElemStyle(Cascade c, MapImage mapImage, Symbol symbol, float default_major_z_index) {
+ protected NodeElemStyle(Cascade c, MapImage mapImage, Symbol symbol, float default_major_z_index, RotationAngle rotationAngle) {
super(c, default_major_z_index);
this.mapImage = mapImage;
this.symbol = symbol;
+ this.mapImageAngle = rotationAngle;
}
public static NodeElemStyle create(Environment env) {
@@ -116,13 +119,30 @@ public class NodeElemStyle extends ElemStyle implements StyleKeys {
if (mapImage == null) {
symbol = createSymbol(env);
}
+ RotationAngle rotationAngle = null;
+ final Float angle = c.get(ICON_ROTATION, null, Float.class, true);
+ if (angle != null) {
+ rotationAngle = RotationAngle.buildStaticRotation(angle);
+ } else {
+ final Keyword rotationKW = c.get(ICON_ROTATION, null, Keyword.class);
+ if (rotationKW != null) {
+ if ("way".equals(rotationKW.val)) {
+ rotationAngle = RotationAngle.buildWayDirectionRotation();
+ } else {
+ try {
+ rotationAngle = RotationAngle.buildStaticRotation(rotationKW.val);
+ } catch (IllegalArgumentException ignore) {
+ }
+ }
+ }
+ }
// optimization: if we neither have a symbol, nor a mapImage
// we don't have to check for the remaining style properties and we don't
// have to allocate a node element style.
if (!allowDefault && symbol == null && mapImage == null) return null;
- return new NodeElemStyle(c, mapImage, symbol, default_major_z_index);
+ return new NodeElemStyle(c, mapImage, symbol, default_major_z_index, rotationAngle);
}
public static MapImage createIcon(final Environment env, final String[] keys) {
@@ -256,7 +276,8 @@ public class NodeElemStyle extends ElemStyle implements StyleKeys {
if (primitive instanceof Node) {
Node n = (Node) primitive;
if (mapImage != null && painter.isShowIcons()) {
- painter.drawNodeIcon(n, mapImage, painter.isInactiveMode() || n.isDisabled(), selected, member);
+ painter.drawNodeIcon(n, mapImage, painter.isInactiveMode() || n.isDisabled(), selected, member,
+ mapImageAngle == null ? 0.0 : mapImageAngle.getRotationAngle(primitive));
} else if (symbol != null) {
Color fillColor = symbol.fillColor;
if (fillColor != null) {
@@ -344,6 +365,7 @@ public class NodeElemStyle extends ElemStyle implements StyleKeys {
int hash = super.hashCode();
hash = 17 * hash + (mapImage != null ? mapImage.hashCode() : 0);
hash = 17 * hash + (symbol != null ? symbol.hashCode() : 0);
+ hash = 17 * hash + (mapImageAngle != null ? mapImageAngle.hashCode() : 0);
return hash;
}
@@ -360,6 +382,8 @@ public class NodeElemStyle extends ElemStyle implements StyleKeys {
return false;
if (!Objects.equals(symbol, other.symbol))
return false;
+ if (!Objects.equals(mapImageAngle, other.mapImageAngle))
+ return false;
return true;
}
@@ -373,6 +397,9 @@ public class NodeElemStyle extends ElemStyle implements StyleKeys {
if (symbol != null) {
s.append(" symbol=[" + symbol + "]");
}
+ if (mapImageAngle != null) {
+ s.append(" mapImageAngle=[" + mapImageAngle + "]");
+ }
s.append('}');
return s.toString();
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java b/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java
index 901b29f..7e12f3f 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java
@@ -20,6 +20,7 @@ public interface StyleKeys {
String ICON_OFFSET_X = "icon-offset-x";
String ICON_OFFSET_Y = "icon-offset-y";
String ICON_OPACITY = "icon-opacity";
+ String ICON_ROTATION = "icon-rotation";
String ICON_WIDTH = "icon-width";
String LINECAP = "linecap";
String LINEJOIN = "linejoin";
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
index d1e0783..a6806c4 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
@@ -3,16 +3,19 @@ package org.openstreetmap.josm.gui.mappaint.mapcss;
import java.text.MessageFormat;
import java.util.Arrays;
+import java.util.Collection;
import java.util.EnumSet;
import java.util.Objects;
import java.util.Set;
import java.util.regex.Pattern;
+import org.openstreetmap.josm.Main;
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.Tag;
import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
import org.openstreetmap.josm.gui.mappaint.Cascade;
import org.openstreetmap.josm.gui.mappaint.ElemStyles;
import org.openstreetmap.josm.gui.mappaint.Environment;
@@ -270,7 +273,11 @@ public abstract class Condition {
@Override
public boolean applies(Environment env) {
if (env.index == null) return false;
- return op.eval(Integer.toString(env.index + 1), index);
+ if (index.startsWith("-")) {
+ return env.count != null && op.eval(Integer.toString(env.index - env.count), index);
+ } else {
+ return op.eval(Integer.toString(env.index + 1), index);
+ }
}
}
@@ -333,8 +340,15 @@ public abstract class Condition {
}
}
- public Tag asTag() {
- return new Tag(label);
+ public Tag asTag(OsmPrimitive p) {
+ String key = label;
+ if (KeyMatchType.REGEX.equals(matchType)) {
+ final Collection<String> matchingKeys = Utils.filter(p.keySet(), containsPattern);
+ if (!matchingKeys.isEmpty()) {
+ key = matchingKeys.iterator().next();
+ }
+ }
+ return new Tag(key, p.get(key));
}
@Override
@@ -405,6 +419,13 @@ public abstract class Condition {
return e.osm instanceof Node && OsmPrimitive.getFilteredList(e.osm.getReferrers(), Way.class).isEmpty();
case "righthandtraffic":
return ExpressionFactory.Functions.is_right_hand_traffic(e);
+ case "unclosed_multipolygon":
+ return e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon() &&
+ !e.osm.isIncomplete() && !((Relation) e.osm).hasIncompleteMembers() &&
+ !MultipolygonCache.getInstance().get(Main.map.mapView, (Relation) e.osm).getOpenEnds().isEmpty();
+ case "open_end":
+ // handling at org.openstreetmap.josm.gui.mappaint.mapcss.Selector.ChildOrParentSelector.MultipolygonOpenEndFinder
+ return true;
}
return false;
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
index c473120..08949bb 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
@@ -27,10 +27,13 @@ import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
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.gui.mappaint.Cascade;
import org.openstreetmap.josm.gui.mappaint.Environment;
+import org.openstreetmap.josm.gui.util.RotationAngle;
import org.openstreetmap.josm.io.XmlWriter;
import org.openstreetmap.josm.tools.ColorHelper;
+import org.openstreetmap.josm.tools.Geometry;
import org.openstreetmap.josm.tools.Predicates;
import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
import org.openstreetmap.josm.tools.Utils;
@@ -497,6 +500,34 @@ public final class ExpressionFactory {
}
/**
+ * Returns the area of a closed way in square meters or {@code null}.
+ * @param env the environment
+ * @return the area of a closed way in square meters or {@code null}
+ * @see Geometry#closedWayArea(Way)
+ */
+ public static Float areasize(final Environment env) {
+ if (env.osm instanceof Way && ((Way) env.osm).isClosed()) {
+ return (float) Geometry.closedWayArea((Way) env.osm);
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Returns the length of the way in metres or {@code null}.
+ * @param env the environment
+ * @return the length of the way in metres or {@code null}.
+ * @see Way#getLength()
+ */
+ public static Float waylength(final Environment env) {
+ if (env.osm instanceof Way) {
+ return (float) ((Way) env.osm).getLength();
+ } else {
+ return null;
+ }
+ }
+
+ /**
* Function associated to the logical "!" operator.
* @param b boolean value
* @return {@code true} if {@code !b}
@@ -546,6 +577,33 @@ public final class ExpressionFactory {
}
/**
+ * Converts an angle in degrees to radians.
+ * @param degree the angle in degrees
+ * @return the angle in radians
+ * @see Math#toRadians(double)
+ */
+ public static double degree_to_radians(double degree) {
+ return Math.toRadians(degree);
+ }
+
+ /**
+ * Converts an angle diven in cardinal directions to radians.
+ * The following values are supported: {@code n}, {@code north}, {@code ne}, {@code northeast},
+ * {@code e}, {@code east}, {@code se}, {@code southeast}, {@code s}, {@code south},
+ * {@code sw}, {@code southwest}, {@code w}, {@code west}, {@code nw}, {@code northwest}.
+ * @param cardinal the angle in cardinal directions.
+ * @see RotationAngle#parseCardinalRotation(String)
+ * @return the angle in radians
+ */
+ public static Double cardinal_to_radians(String cardinal) {
+ try {
+ return RotationAngle.parseCardinalRotation(cardinal);
+ } catch (IllegalArgumentException ignore) {
+ return null;
+ }
+ }
+
+ /**
* Determines if the objects {@code a} and {@code b} are equal.
* @param a First object
* @param b Second object
@@ -559,6 +617,16 @@ public final class ExpressionFactory {
}
/**
+ * Determines if the objects {@code a} and {@code b} are not equal.
+ * @param a First object
+ * @param b Second object
+ * @return {@code false} if objects are equal, {@code true} otherwise
+ * @see Object#equals(Object)
+ */
+ public static boolean not_equal(Object a, Object b) {
+ return !equal(a,b);
+ }
+ /**
* Determines whether the JOSM search with {@code searchStr} applies to the object.
* @param env the environment
* @param searchStr the search string
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
index 203bfd6..7a14770 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
@@ -9,6 +9,8 @@ package org.openstreetmap.josm.gui.mappaint.mapcss.parsergen;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.openstreetmap.josm.Main;
@@ -17,6 +19,7 @@ import org.openstreetmap.josm.gui.mappaint.mapcss.Condition;
import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.Context;
import org.openstreetmap.josm.gui.mappaint.mapcss.Expression;
import org.openstreetmap.josm.gui.mappaint.mapcss.ExpressionFactory;
+import org.openstreetmap.josm.gui.mappaint.mapcss.ExpressionFactory.NullExpression;
import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction;
import org.openstreetmap.josm.gui.mappaint.mapcss.LiteralExpression;
import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSException;
@@ -181,6 +184,7 @@ TOKEN:
| < DOLLAR: "$" >
| < CARET: "^" >
| < FULLSTOP: "." >
+| < DEG: "°" >
| < ELEMENT_OF: "∈" >
| < CROSSING: "⧉" >
| < COMMENT_START: "/*" > : COMMENT
@@ -853,52 +857,165 @@ Declaration declaration() :
{ return new Declaration(ins, declarationCounter++); }
}
-Expression expression():
+/**
+ * General expression.
+ * Separate production rule for each level of operator precedence (recursive descent).
+ */
+Expression expression() :
{
- List<Expression> args = new ArrayList<Expression>();
Expression e;
+}
+{
+ e=conditional_expression()
+ {
+ return e;
+ }
+}
+
+Expression conditional_expression() :
+{
+ Expression e, e1, e2;
String op = null;
}
{
+ e=or_expression()
(
- <EXCLAMATION> { op = "not"; } w() e=primary() { args.add(e); } w()
- |
- <MINUS> { op = "minus"; } w() e=primary() { args.add(e); } w()
- |
+ <QUESTION> w()
+ e1=conditional_expression()
+ <COLON> w()
+ e2=conditional_expression()
+ {
+ e = ExpressionFactory.createFunctionExpression("cond", Arrays.asList(e, e1, e2));
+ }
+ )?
+ {
+ return e;
+ }
+}
+Expression or_expression() :
+{
+ Expression e, e2;
+ String op = null;
+}
+{
+ e=and_expression()
+ (
+ <PIPE> <PIPE> w()
+ e2=and_expression()
+ {
+ e = ExpressionFactory.createFunctionExpression("or", Arrays.asList(e, e2));
+ }
+ )*
+ {
+ return e;
+ }
+}
+
+Expression and_expression() :
+{
+ Expression e, e2;
+ String op = null;
+}
+{
+ e=relational_expression()
+ (
+ <AMPERSAND> <AMPERSAND> w()
+ e2=relational_expression()
+ {
+ e = ExpressionFactory.createFunctionExpression("and", Arrays.asList(e, e2));
+ }
+ )*
+ {
+ return e;
+ }
+}
+
+Expression relational_expression() :
+{
+ Expression e, e2;
+ String op = null;
+}
+{
+ e=additive_expression()
+ (
(
- e=primary() { args.add(e); } w()
- (
- ( <PLUS> { op = "plus"; } w() e=primary() { args.add(e); } w() )+
- |
- ( <STAR> { op = "times"; } w() e=primary() { args.add(e); } w() )+
- |
- ( <MINUS> { op = "minus"; } w() e=primary() { args.add(e); } w() )+
- |
- ( <SLASH> { op = "divided_by"; } w() e=primary() { args.add(e); } w() )+
- |
- <GREATER_EQUAL> { op = "greater_equal"; } w() e=primary() { args.add(e); } w()
- |
- <LESS_EQUAL> { op = "less_equal"; } w() e=primary() { args.add(e); } w()
- |
- <GREATER> { op = "greater"; } w() e=primary() { args.add(e); } w()
- |
- <EQUAL> ( <EQUAL> )? { op = "equal"; } w() e=primary() { args.add(e); } w()
- |
- <LESS> { op = "less"; } w() e=primary() { args.add(e); } w()
- |
- <AMPERSAND> <AMPERSAND> { op = "and"; } w() e=primary() { args.add(e); } w()
- |
- <PIPE> <PIPE> { op = "or"; } w() e=primary() { args.add(e); } w()
- |
- <QUESTION> { op = "cond"; } w() e=primary() { args.add(e); } w() <COLON> w() e=primary() { args.add(e); } w()
- )?
- )
- )
+ <GREATER_EQUAL> { op = "greater_equal"; }
+ |
+ <LESS_EQUAL> { op = "less_equal"; }
+ |
+ <GREATER> { op = "greater"; }
+ |
+ <LESS> { op = "less"; }
+ |
+ <EQUAL> ( <EQUAL> )? { op = "equal"; }
+ |
+ <EXCLAMATION> <EQUAL> { op = "not_equal"; }
+ ) w()
+ e2=additive_expression()
+ {
+ e = ExpressionFactory.createFunctionExpression(op, Arrays.asList(e, e2));
+ }
+ )?
+ {
+ return e;
+ }
+}
+
+Expression additive_expression() :
+{
+ Expression e, e2;
+ String op = null;
+}
+{
+ e=multiplicative_expression()
+ (
+ ( <PLUS> { op = "plus"; } | <MINUS> { op = "minus"; } ) w()
+ e2=multiplicative_expression()
+ {
+ e = ExpressionFactory.createFunctionExpression(op, Arrays.asList(e, e2));
+ }
+ )*
+ {
+ return e;
+ }
+}
+
+Expression multiplicative_expression() :
+{
+ Expression e, e2;
+ String op = null;
+}
+{
+ e=unary_expression()
+ (
+ ( <STAR> { op = "times"; } | <SLASH> { op = "divided_by"; } ) w()
+ e2=unary_expression()
+ {
+ e = ExpressionFactory.createFunctionExpression(op, Arrays.asList(e, e2));
+ }
+ )*
+ {
+ return e;
+ }
+}
+
+Expression unary_expression() :
+{
+ Expression e;
+ String op = null;
+}
+{
+ (
+ <MINUS> { op = "minus"; } w()
+ |
+ <EXCLAMATION> { op = "not"; } w()
+ )?
+ e=primary() w()
{
if (op == null)
- return args.get(0);
- return ExpressionFactory.createFunctionExpression(op, args);
+ return e;
+ return ExpressionFactory.createFunctionExpression(op, Collections.singletonList(e));
}
}
@@ -912,7 +1029,12 @@ Expression primary() :
LOOKAHEAD(3) // both function and identifier start with an identifier (+ optional whitespace)
fn=function() { return fn; }
|
- lit=literal() { return new LiteralExpression(lit); }
+ lit=literal()
+ {
+ if (lit == null)
+ return NullExpression.INSTANCE;
+ return new LiteralExpression(lit);
+ }
|
<LPAR> w() nested=expression() <RPAR> { return nested; }
}
@@ -938,7 +1060,7 @@ Object literal() :
{
String val, pref;
Token t;
- float f;
+ Float f;
}
{
LOOKAHEAD(2)
@@ -951,11 +1073,53 @@ Object literal() :
|
<PLUS> f=ufloat() { return new Instruction.RelativeFloat(f); }
|
+ LOOKAHEAD(2)
+ f=ufloat_unit() { return f; }
+ |
f=ufloat() { return f; }
|
t=<HEXCOLOR> { return ColorHelper.html2color(t.image); }
}
+/**
+ * Number followed by a unit.
+ *
+ * Returns angles in radians and lengths in pixels.
+ */
+Float ufloat_unit() :
+{
+ float f;
+ String u;
+}
+{
+ f=ufloat() ( u=ident() | <DEG> { u = "°"; } )
+ {
+ Double m = unit_factor(u);
+ if (m == null)
+ return null;
+ return (float) (f * m);
+ }
+}
+
+JAVACODE
+private Double unit_factor(String unit) {
+ switch (unit) {
+ case "deg":
+ case "°": return Math.PI / 180;
+ case "rad": return 1.;
+ case "grad": return Math.PI / 200;
+ case "turn": return 2 * Math.PI;
+ case "px": return 1.;
+ case "cm": return 96/2.54;
+ case "mm": return 9.6/2.54;
+ case "in": return 96.;
+ case "q": return 2.4/2.54;
+ case "pc": return 16.;
+ case "pt": return 96./72;
+ default: return null;
+ }
+}
+
JAVACODE
void error_skipto(int kind, MapCSSException me) {
if (token.kind == EOF)
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
index 482a9ca..7cbef1d 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
@@ -15,6 +15,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.AbstractVisitor;
+import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
import org.openstreetmap.josm.gui.mappaint.Environment;
import org.openstreetmap.josm.gui.mappaint.Range;
import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -149,9 +150,10 @@ public interface Selector {
for (int i=0; i<w.getNodesCount(); i++) {
Node n = w.getNode(i);
if (n.equals(e.osm)) {
- if (link.matches(e.withParentAndIndexAndLinkContext(w, i))) {
+ if (link.matches(e.withParentAndIndexAndLinkContext(w, i, w.getNodesCount()))) {
e.parent = w;
e.index = i;
+ e.count = w.getNodesCount();
return;
}
}
@@ -171,9 +173,10 @@ public interface Selector {
for (int i=0; i < r.getMembersCount(); i++) {
RelationMember m = r.getMember(i);
if (m.getMember().equals(e.osm)) {
- if (link.matches(e.withParentAndIndexAndLinkContext(r, i))) {
+ if (link.matches(e.withParentAndIndexAndLinkContext(r, i, r.getMembersCount()))) {
e.parent = r;
e.index = i;
+ e.count = r.getMembersCount();
return;
}
}
@@ -216,6 +219,34 @@ public interface Selector {
}
}
+ private class MultipolygonOpenEndFinder extends AbstractFinder {
+
+ @Override
+ public void visit(Way w) {
+ w.visitReferrers(innerVisitor);
+ }
+
+ public MultipolygonOpenEndFinder(Environment e) {
+ super(e);
+ }
+
+ private final AbstractVisitor innerVisitor = new AbstractFinder(e) {
+ @Override
+ public void visit(Relation r) {
+ if (left.matches(e.withPrimitive(r))) {
+ final List<Node> openEnds = MultipolygonCache.getInstance().get(Main.map.mapView, r).getOpenEnds();
+ final int openEndIndex = openEnds.indexOf((Node) e.osm);
+ if (openEndIndex >= 0) {
+ e.parent = r;
+ e.index = openEndIndex;
+ e.count = openEnds.size();
+ }
+ }
+ }
+ };
+
+ }
+
private final class CrossingFinder extends AbstractFinder {
private CrossingFinder(Environment e) {
super(e);
@@ -328,12 +359,21 @@ public interface Selector {
if (left.matches(e2) && link.matches(e2.withLinkContext())) {
e.child = n;
e.index = i;
+ e.count = w.getNodesCount();
e.parent = w;
return true;
}
}
}
}
+ } else if (ChildOrParentSelectorType.CHILD.equals(type)
+ && link.conds != null && !link.conds.isEmpty()
+ && link.conds.get(0) instanceof Condition.PseudoClassCondition
+ && "open_end".equals(((Condition.PseudoClassCondition) link.conds.get(0)).id)) {
+ if (e.osm instanceof Node) {
+ e.osm.visitReferrers(new MultipolygonOpenEndFinder(e));
+ return e.parent != null;
+ }
} else if (ChildOrParentSelectorType.CHILD.equals(type)) {
MatchingReferrerFinder collector = new MatchingReferrerFinder(e);
e.osm.visitReferrers(collector);
@@ -345,9 +385,10 @@ public interface Selector {
for (int i=0; i<wayNodes.size(); i++) {
Node n = wayNodes.get(i);
if (left.matches(e.withPrimitive(n))) {
- if (link.matches(e.withChildAndIndexAndLinkContext(n, i))) {
+ if (link.matches(e.withChildAndIndexAndLinkContext(n, i, wayNodes.size()))) {
e.child = n;
e.index = i;
+ e.count = wayNodes.size();
return true;
}
}
@@ -358,9 +399,10 @@ public interface Selector {
for (int i=0; i<members.size(); i++) {
OsmPrimitive member = members.get(i).getMember();
if (left.matches(e.withPrimitive(member))) {
- if (link.matches(e.withChildAndIndexAndLinkContext(member, i))) {
+ if (link.matches(e.withChildAndIndexAndLinkContext(member, i, members.size()))) {
e.child = member;
e.index = i;
+ e.count = members.size();
return true;
}
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java b/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java
index 93e5c84..49b8bb6 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java
@@ -26,6 +26,7 @@ import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
import org.openstreetmap.josm.gui.widgets.JosmComboBox;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.LanguageInfo;
/**
* Language preferences.
@@ -71,7 +72,7 @@ public class LanguagePreference implements SubPreferenceSetting {
return Main.pref.put("language", null);
else
return Main.pref.put("language",
- ((Locale)langCombo.getSelectedItem()).toString());
+ LanguageInfo.getJOSMLocaleCode((Locale)langCombo.getSelectedItem()));
}
private static class LanguageComboBoxModel extends DefaultComboBoxModel<Locale> {
@@ -85,6 +86,7 @@ public class LanguagePreference implements SubPreferenceSetting {
public void selectLanguage(String language) {
setSelectedItem(null);
if (language != null) {
+ language = LanguageInfo.getJavaLocaleCode(language);
for (Locale locale: data) {
if (locale == null) {
continue;
@@ -117,8 +119,10 @@ public class LanguagePreference implements SubPreferenceSetting {
public Component getListCellRendererComponent(JList<? extends Locale> list, Locale l,
int index, boolean isSelected, boolean cellHasFocus) {
return dispatch.getListCellRendererComponent(list,
- l == null ? tr("Default (Auto determined)") : l.getDisplayName(l),
- index, isSelected, cellHasFocus);
+ l == null
+ ? tr("Default (Auto determined)")
+ : LanguageInfo.getDisplayName(l),
+ index, isSelected, cellHasFocus);
}
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java
index 56efbfd..75ce084 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java
@@ -11,9 +11,11 @@ import javax.swing.JPanel;
import javax.swing.JSpinner;
import javax.swing.SpinnerNumberModel;
+import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
+import org.openstreetmap.josm.data.imagery.TMSCachedTileLoaderJob;
import org.openstreetmap.josm.gui.layer.TMSLayer;
-import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.tools.GBC;
/**
* {@code JPanel} giving access to TMS settings.
@@ -28,6 +30,9 @@ public class TMSSettingsPanel extends JPanel {
private final JSpinner maxZoomLvl;
private final JCheckBox addToSlippyMapChosser = new JCheckBox();
private final JosmTextField tilecacheDir = new JosmTextField();
+ private final JSpinner maxElementsOnDisk;
+ private final JSpinner maxConcurrentDownloads;
+
/**
* Constructs a new {@code TMSSettingsPanel}.
@@ -36,6 +41,8 @@ public class TMSSettingsPanel extends JPanel {
super(new GridBagLayout());
minZoomLvl = new JSpinner(new SpinnerNumberModel(TMSLayer.DEFAULT_MIN_ZOOM, TMSLayer.MIN_ZOOM, TMSLayer.MAX_ZOOM, 1));
maxZoomLvl = new JSpinner(new SpinnerNumberModel(TMSLayer.DEFAULT_MAX_ZOOM, TMSLayer.MIN_ZOOM, TMSLayer.MAX_ZOOM, 1));
+ maxElementsOnDisk = new JSpinner(new SpinnerNumberModel(TMSCachedTileLoader.MAX_OBJECTS_ON_DISK.get().intValue(), 0, Integer.MAX_VALUE, 1));
+ maxConcurrentDownloads = new JSpinner(new SpinnerNumberModel(TMSCachedTileLoaderJob.THREAD_LIMIT.get().intValue(), 0, Integer.MAX_VALUE, 1));
add(new JLabel(tr("Auto zoom by default: ")), GBC.std());
add(GBC.glue(5, 0), GBC.std());
@@ -60,8 +67,17 @@ public class TMSSettingsPanel extends JPanel {
add(new JLabel(tr("Tile cache directory: ")), GBC.std());
add(GBC.glue(5, 0), GBC.std());
add(tilecacheDir, GBC.eol().fill(GBC.HORIZONTAL));
+
+ add(new JLabel(tr("Maximum concurrent downloads: ")), GBC.std());
+ add(GBC.glue(5, 0), GBC.std());
+ add(maxConcurrentDownloads, GBC.eol());
+
+ add(new JLabel(tr("Maximum elements in disk cache: ")), GBC.std());
+ add(GBC.glue(5, 0), GBC.std());
+ add(this.maxElementsOnDisk, GBC.eol());
+
}
-
+
/**
* Loads the TMS settings.
*/
@@ -72,15 +88,17 @@ public class TMSSettingsPanel extends JPanel {
this.maxZoomLvl.setValue(TMSLayer.getMaxZoomLvl(null));
this.minZoomLvl.setValue(TMSLayer.getMinZoomLvl(null));
this.tilecacheDir.setText(TMSLayer.PROP_TILECACHE_DIR.get());
+ this.maxElementsOnDisk.setValue(TMSCachedTileLoader.MAX_OBJECTS_ON_DISK.get());
+ this.maxConcurrentDownloads.setValue(TMSCachedTileLoaderJob.THREAD_LIMIT.get());
}
-
+
/**
* Saves the TMS settings.
* @return true when restart is required
*/
public boolean saveSettings() {
boolean restartRequired = false;
-
+
if (TMSLayer.PROP_ADD_TO_SLIPPYMAP_CHOOSER.get() != this.addToSlippyMapChosser.isSelected()) {
restartRequired = true;
}
@@ -89,8 +107,19 @@ public class TMSSettingsPanel extends JPanel {
TMSLayer.PROP_DEFAULT_AUTOLOAD.put(this.autoloadTiles.isSelected());
TMSLayer.setMaxZoomLvl((Integer)this.maxZoomLvl.getValue());
TMSLayer.setMinZoomLvl((Integer)this.minZoomLvl.getValue());
- TMSLayer.PROP_TILECACHE_DIR.put(this.tilecacheDir.getText());
-
+
+ TMSCachedTileLoader.MAX_OBJECTS_ON_DISK.put((Integer) this.maxElementsOnDisk.getValue());
+
+ if (!TMSCachedTileLoaderJob.THREAD_LIMIT.get().equals(this.maxConcurrentDownloads.getValue())) {
+ restartRequired = true;
+ TMSCachedTileLoaderJob.THREAD_LIMIT.put((Integer) this.maxConcurrentDownloads.getValue());
+ }
+
+ if (!TMSLayer.PROP_TILECACHE_DIR.get().equals(this.tilecacheDir.getText())) {
+ restartRequired = true;
+ TMSLayer.PROP_TILECACHE_DIR.put(this.tilecacheDir.getText());
+ }
+
return restartRequired;
}
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
index c2fbd45..42d3a6d 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
@@ -15,6 +15,7 @@ import java.beans.PropertyChangeListener;
import javax.swing.ButtonGroup;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
+import javax.swing.JSeparator;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -41,7 +42,7 @@ public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel im
/** the panel for the OAuth authentication parameters */
private OAuthAuthenticationPreferencesPanel pnlOAuthPreferences;
/** the panel for messages notifier preferences */
- private MessagesNotifierPanel pnlMessagesPreferences;
+ private FeaturesPanel pnlFeaturesPreferences;
/**
* builds the UI
@@ -93,11 +94,14 @@ public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel im
rbBasicAuthentication.setSelected(true);
pnlAuthenticationParameteters.add(pnlBasicAuthPreferences, BorderLayout.CENTER);
- //-- the panel for messages preferences
gc.gridy = 2;
+ add(new JSeparator(), gc);
+
+ //-- the panel for API feature preferences
+ gc.gridy = 3;
gc.fill = GridBagConstraints.NONE;
- pnlMessagesPreferences = new MessagesNotifierPanel();
- add(pnlMessagesPreferences, gc);
+ pnlFeaturesPreferences = new FeaturesPanel();
+ add(pnlFeaturesPreferences, gc);
}
/**
@@ -124,7 +128,7 @@ public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel im
}
pnlBasicAuthPreferences.initFromPreferences();
pnlOAuthPreferences.initFromPreferences();
- pnlMessagesPreferences.initFromPreferences();
+ pnlFeaturesPreferences.initFromPreferences();
}
/**
@@ -151,7 +155,7 @@ public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel im
pnlOAuthPreferences.saveToPreferences();
}
// save message notifications preferences. To be done after authentication preferences.
- pnlMessagesPreferences.saveToPreferences();
+ pnlFeaturesPreferences.saveToPreferences();
}
/**
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/MessagesNotifierPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/FeaturesPanel.java
similarity index 75%
rename from src/org/openstreetmap/josm/gui/preferences/server/MessagesNotifierPanel.java
rename to src/org/openstreetmap/josm/gui/preferences/server/FeaturesPanel.java
index 4338a18..7233e6b 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/MessagesNotifierPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/FeaturesPanel.java
@@ -12,6 +12,7 @@ import javax.swing.JPanel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadNotesTask;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.io.MessageNotifier;
import org.openstreetmap.josm.tools.GBC;
@@ -20,16 +21,17 @@ import org.openstreetmap.josm.tools.GBC;
* Preferences panel for OSM messages notifier.
* @since 6349
*/
-public class MessagesNotifierPanel extends JPanel {
+public class FeaturesPanel extends JPanel {
private JCheckBox notifier;
private JLabel intervalLabel;
private final JosmTextField notifierInterval = new JosmTextField(4);
+ private final JosmTextField notesDaysClosed = new JosmTextField(4);
/**
* Constructs a new {@code MessagesNotifierPanel}.
*/
- public MessagesNotifierPanel() {
+ public FeaturesPanel() {
build();
initFromPreferences();
updateEnabledState();
@@ -49,11 +51,19 @@ public class MessagesNotifierPanel extends JPanel {
});
intervalLabel = new JLabel(tr("Check interval (minutes):"));
- add(intervalLabel, GBC.std().insets(25,0,0,0));
+ add(intervalLabel, GBC.std().insets(25, 0, 0, 0));
notifierInterval.setToolTipText(tr("Default value: {0}", MessageNotifier.PROP_INTERVAL.getDefaultValue()));
notifierInterval.setMinimumSize(notifierInterval.getPreferredSize());
add(notifierInterval, GBC.eol().insets(5,0,0,0));
+
+ final JLabel notesDaysClosedLabel = new JLabel(tr("Max age for closed notes (days):"));
+ notesDaysClosedLabel.setToolTipText(tr("Specifies the number of days a note needs to be closed to no longer be downloaded"));
+ add(notesDaysClosedLabel, GBC.std().insets(0, 20, 0, 0));
+ notesDaysClosed.setToolTipText(tr("Default value: {0}", DownloadNotesTask.DAYS_CLOSED.getDefaultValue()));
+ notesDaysClosed.setMinimumSize(notesDaysClosed.getPreferredSize());
+ add(notesDaysClosed, GBC.eol().insets(5, 20, 0, 0));
+
}
private void updateEnabledState() {
@@ -61,6 +71,7 @@ public class MessagesNotifierPanel extends JPanel {
intervalLabel.setEnabled(enabled);
notifierInterval.setEnabled(enabled);
notifierInterval.setEditable(enabled);
+ notesDaysClosed.setEditable(enabled);
}
/**
@@ -69,6 +80,7 @@ public class MessagesNotifierPanel extends JPanel {
public final void initFromPreferences() {
notifier.setSelected(MessageNotifier.PROP_NOTIFIER_ENABLED.get());
notifierInterval.setText(Integer.toString(MessageNotifier.PROP_INTERVAL.get()));
+ notesDaysClosed.setText(Integer.toString(DownloadNotesTask.DAYS_CLOSED.get()));
}
/**
@@ -78,6 +90,7 @@ public class MessagesNotifierPanel extends JPanel {
final boolean enabled = notifier.isSelected();
boolean changed = MessageNotifier.PROP_NOTIFIER_ENABLED.put(enabled);
changed |= MessageNotifier.PROP_INTERVAL.parseAndPut(notifierInterval.getText());
+ changed |= DownloadNotesTask.DAYS_CLOSED.parseAndPut(notesDaysClosed.getText());
// If parameters have changed, restart notifier
if (changed) {
MessageNotifier.stop();
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
index defc91d..3e386f9 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
@@ -75,6 +75,7 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
public TaggingPresetMenu group = null;
public String name;
+ public String iconName;
public String name_context;
public String locale_name;
public boolean preset_name_label;
@@ -146,6 +147,7 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
* This task is performed in the background in order to speedup startup.
*/
public void setIcon(final String iconName) {
+ this.iconName = iconName;
File arch = TaggingPresetReader.getZipIcons();
final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
ImageProvider imgProv = new ImageProvider(iconName);
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
index fff010f..69d1e9f 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
@@ -64,6 +64,8 @@ public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem>
@Override
public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
+ // TODO get rid of code duplication w.r.t. AutoCompletingTextField.AutoCompletionDocument.insertString
+
if (selecting || (offs == 0 && str.equals(getText(0, getLength()))))
return;
if (maxTextLength > -1 && str.length()+getLength() > maxTextLength)
@@ -82,6 +84,14 @@ public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem>
if (a != null && a.isDefined(StyleConstants.ComposedTextAttribute))
return;
+ // if the current offset isn't at the end of the document we don't autocomplete.
+ // If a highlighted autocompleted suffix was present and we get here Swing has
+ // already removed it from the document. getLength() therefore doesn't include the
+ // autocompleted suffix.
+ if (offs + str.length() < getLength()) {
+ return;
+ }
+
int size = getLength();
int start = offs+str.length();
int end = start;
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java
index ec51b5f..9944981 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java
@@ -7,6 +7,7 @@ import java.awt.event.FocusEvent;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.util.EventObject;
+import java.util.Objects;
import javax.swing.ComboBoxEditor;
import javax.swing.JTable;
@@ -94,7 +95,7 @@ public class AutoCompletingTextField extends JosmTextField implements ComboBoxEd
}
String prefix = currentText.substring(0, offs);
autoCompletionList.applyFilter(prefix+str);
- if (autoCompletionList.getFilteredSize()>0) {
+ if (autoCompletionList.getFilteredSize() > 0 && !Objects.equals(str, noAutoCompletionString)) {
// there are matches. Insert the new text and highlight the
// auto completed suffix
//
@@ -119,6 +120,8 @@ public class AutoCompletingTextField extends JosmTextField implements ComboBoxEd
/** the auto completion list user input is matched against */
protected AutoCompletionList autoCompletionList = null;
+ /** a string which should not be auto completed */
+ protected String noAutoCompletionString = null;
@Override
protected Document createDefaultModel() {
@@ -218,6 +221,13 @@ public class AutoCompletingTextField extends JosmTextField implements ComboBoxEd
}
}
+ @Override
+ public void setText(String t) {
+ // disallow auto completion for this explicitly set string
+ this.noAutoCompletionString = t;
+ super.setText(t);
+ }
+
/**
* Sets the maximum number of characters allowed.
* @param max maximum number of characters allowed
diff --git a/src/org/openstreetmap/josm/gui/util/RotationAngle.java b/src/org/openstreetmap/josm/gui/util/RotationAngle.java
new file mode 100644
index 0000000..dc302e1
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/util/RotationAngle.java
@@ -0,0 +1,121 @@
+package org.openstreetmap.josm.gui.util;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+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.tools.Geometry;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * Determines how an icon is to be rotated depending on the primitive to displayed.
+ */
+public abstract class RotationAngle {
+ /**
+ * Calculates the rotation angle depending on the primitive to displayed.
+ */
+ public abstract double getRotationAngle(OsmPrimitive p);
+
+ /**
+ * Always returns the fixed {@code angle}.
+ */
+ public static RotationAngle buildStaticRotation(final double angle) {
+ return new RotationAngle() {
+ @Override
+ public double getRotationAngle(OsmPrimitive p) {
+ return angle;
+ }
+
+ @Override
+ public String toString() {
+ return angle + "rad";
+ }
+ };
+ }
+
+ /**
+ * Parses the rotation angle from the specified {@code string}.
+ */
+ public static RotationAngle buildStaticRotation(final String string) {
+ final double value;
+ try {
+ value = parseCardinalRotation(string);
+ } catch (IllegalArgumentException ignore) {
+ throw new IllegalArgumentException("Invalid string: " + string);
+ }
+ return buildStaticRotation(value);
+ }
+
+ /**
+ * Converts an angle diven in cardinal directions to radians.
+ * The following values are supported: {@code n}, {@code north}, {@code ne}, {@code northeast},
+ * {@code e}, {@code east}, {@code se}, {@code southeast}, {@code s}, {@code south},
+ * {@code sw}, {@code southwest}, {@code w}, {@code west}, {@code nw}, {@code northwest}.
+ * @param cardinal the angle in cardinal directions
+ * @return the angle in radians
+ */
+ public static double parseCardinalRotation(final String cardinal) {
+ switch (cardinal.toLowerCase()) {
+ case "n":
+ case "north":
+ return Math.toRadians(0);
+ case "ne":
+ case "northeast":
+ return Math.toRadians(45);
+ case "e":
+ case "east":
+ return Math.toRadians(90);
+ case "se":
+ case "southeast":
+ return Math.toRadians(135);
+ case "s":
+ case "south":
+ return Math.toRadians(180);
+ case "sw":
+ case "southwest":
+ return Math.toRadians(225);
+ case "w":
+ case "west":
+ return Math.toRadians(270);
+ case "nw":
+ case "northwest":
+ return Math.toRadians(315);
+ default:
+ throw new IllegalArgumentException("Unexpected cardinal direction " + cardinal);
+ }
+ }
+
+ /**
+ * Computes the angle depending on the referencing way segment, or {@code 0} if none exists.
+ */
+ public static RotationAngle buildWayDirectionRotation() {
+ return new RotationAngle() {
+ @Override
+ public double getRotationAngle(OsmPrimitive p) {
+ if (!(p instanceof Node)) {
+ return 0;
+ }
+ final Node n = (Node) p;
+ final SubclassFilteredCollection<OsmPrimitive, Way> ways = Utils.filteredCollection(n.getReferrers(), Way.class);
+ if (ways.isEmpty()) {
+ return 0;
+ }
+ final Way w = ways.iterator().next();
+ final int idx = w.getNodes().indexOf(n);
+ if (idx == 0) {
+ return -Geometry.getSegmentAngle(n.getEastNorth(), w.getNode(idx + 1).getEastNorth());
+ } else {
+ return -Geometry.getSegmentAngle(w.getNode(idx - 1).getEastNorth(), n.getEastNorth());
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "way-direction";
+ }
+ };
+ }
+}
diff --git a/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java b/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
index 89631cc..32f4a85 100644
--- a/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
+++ b/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
@@ -7,7 +7,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.DataSource;
import org.openstreetmap.josm.data.gpx.GpxData;
@@ -161,25 +160,21 @@ public class BoundingBoxDownloader extends OsmServerReader {
}
@Override
- public List<Note> parseNotes(Integer noteLimit, Integer daysClosed, ProgressMonitor progressMonitor) throws OsmTransferException {
+ public List<Note> parseNotes(int noteLimit, int daysClosed, ProgressMonitor progressMonitor) throws OsmTransferException, MoreNotesException {
progressMonitor.beginTask("Downloading notes");
- noteLimit = checkNoteLimit(noteLimit);
- daysClosed = checkDaysClosed(daysClosed);
- String url = new StringBuilder()
- .append("notes?limit=")
- .append(noteLimit)
- .append("&closed=")
- .append(daysClosed)
- .append("&bbox=")
- .append(lon1)
- .append(",").append(lat1)
- .append(",").append(lon2)
- .append(",").append(lat2)
- .toString();
+ CheckParameterUtil.ensureThat(noteLimit > 0, "Requested note limit is less than 1.");
+ // see result_limit in https://github.com/openstreetmap/openstreetmap-website/blob/master/app/controllers/notes_controller.rb
+ CheckParameterUtil.ensureThat(noteLimit <= 10000, "Requested note limit is over API hard limit of 10000.");
+ CheckParameterUtil.ensureThat(daysClosed >= 0, "Requested note limit is less than 0.");
+ String url = "notes?limit=" + noteLimit + "&closed=" + daysClosed + "&bbox=" + lon1 + "," + lat1 + "," + lon2 + "," + lat2;
try {
InputStream is = getInputStream(url, progressMonitor.createSubTaskMonitor(1, false));
NoteReader reader = new NoteReader(is);
- return reader.parse();
+ final List<Note> notes = reader.parse();
+ if (notes.size() == noteLimit) {
+ throw new MoreNotesException(notes, noteLimit);
+ }
+ return notes;
} catch (IOException e) {
throw new OsmTransferException(e);
} catch (SAXException e) {
@@ -189,32 +184,23 @@ public class BoundingBoxDownloader extends OsmServerReader {
}
}
- private Integer checkNoteLimit(Integer limit) {
- if (limit == null) {
- limit = Main.pref.getInteger("osm.notes.downloadLimit", 1000);
- }
- if (limit > 10000) {
- Main.error("Requested note limit is over API hard limit of 10000. Reducing to 10000.");
- limit = 10000;
- }
- if (limit < 1) {
- Main.error("Requested note limit is less than 1. Setting to 1.");
- limit = 1;
- }
- Main.debug("returning note limit: " + limit);
- return limit;
- }
-
- private Integer checkDaysClosed(Integer days) {
- if (days == null) {
- days = Main.pref.getInteger("osm.notes.daysClosed", 7);
- }
- if (days < -1) {
- Main.error("Requested days closed must be greater than -1");
- days = -1;
+ /**
+ * Indicates that the number of fetched notes equals the specified limit. Thus there might be more notes to download.
+ */
+ public static class MoreNotesException extends RuntimeException{
+ /**
+ * The downloaded notes
+ */
+ public final List<Note> notes;
+ /**
+ * The download limit sent to the server.
+ */
+ public final int limit;
+
+ public MoreNotesException(List<Note> notes, int limit) {
+ this.notes = notes;
+ this.limit = limit;
}
- Main.debug("returning days closed: " + days);
- return days;
}
}
diff --git a/src/org/openstreetmap/josm/io/NoteReader.java b/src/org/openstreetmap/josm/io/NoteReader.java
index 9839c94..765038b 100644
--- a/src/org/openstreetmap/josm/io/NoteReader.java
+++ b/src/org/openstreetmap/josm/io/NoteReader.java
@@ -5,12 +5,9 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Locale;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
@@ -21,6 +18,7 @@ import org.openstreetmap.josm.data.notes.Note;
import org.openstreetmap.josm.data.notes.NoteComment;
import org.openstreetmap.josm.data.notes.NoteComment.Action;
import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.tools.date.DateUtils;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -49,9 +47,6 @@ public class NoteReader {
*/
private class Parser extends DefaultHandler {
- private final SimpleDateFormat ISO8601_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX", Locale.ENGLISH);
- private final SimpleDateFormat NOTE_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z", Locale.ENGLISH);
-
private NoteParseMode parseMode;
private StringBuffer buffer = new StringBuffer();
private Note thisNote;
@@ -105,9 +100,9 @@ public class NoteReader {
thisNote.setState(Note.State.open);
} else {
thisNote.setState(Note.State.closed);
- thisNote.setClosedAt(parseDate(ISO8601_FORMAT, closedTimeStr));
+ thisNote.setClosedAt(DateUtils.fromString(closedTimeStr));
}
- thisNote.setCreatedAt(parseDate(ISO8601_FORMAT, attrs.getValue("created_at")));
+ thisNote.setCreatedAt(DateUtils.fromString(attrs.getValue("created_at")));
break;
case "comment":
String uidStr = attrs.getValue("uid");
@@ -118,7 +113,7 @@ public class NoteReader {
}
commentUsername = attrs.getValue("user");
noteAction = Action.valueOf(attrs.getValue("action"));
- commentCreateDate = parseDate(ISO8601_FORMAT, attrs.getValue("timestamp"));
+ commentCreateDate = DateUtils.fromString(attrs.getValue("timestamp"));
String isNew = attrs.getValue("is_new");
if(isNew == null) {
commentIsNew = false;
@@ -165,13 +160,13 @@ public class NoteReader {
thisNote.setState(Note.State.valueOf(buffer.toString()));
break;
case "date_created":
- thisNote.setCreatedAt(parseDate(NOTE_DATE_FORMAT, buffer.toString()));
+ thisNote.setCreatedAt(DateUtils.fromString(buffer.toString()));
break;
case "date_closed":
- thisNote.setClosedAt(parseDate(NOTE_DATE_FORMAT, buffer.toString()));
+ thisNote.setClosedAt(DateUtils.fromString(buffer.toString()));
break;
case "date":
- commentCreateDate = parseDate(NOTE_DATE_FORMAT, buffer.toString());
+ commentCreateDate = DateUtils.fromString(buffer.toString());
break;
case "user":
commentUsername = buffer.toString();
@@ -194,25 +189,8 @@ public class NoteReader {
@Override
public void endDocument() throws SAXException {
- Main.info("parsed notes: " + notes.size());
parsedNotes = notes;
}
-
- /**
- * Convenience method to handle the date parsing try/catch. Will return null if
- * there is a parsing exception. This means whatever generated this XML is in error
- * and there isn't anything we can do about it.
- * @param dateStr - String to parse
- * @return Parsed date, null if parsing fails
- */
- private Date parseDate(SimpleDateFormat sdf, String dateStr) {
- try {
- return sdf.parse(dateStr);
- } catch(ParseException e) {
- Main.error("error parsing date in note parser");
- return null;
- }
- }
}
/**
diff --git a/src/org/openstreetmap/josm/io/NoteWriter.java b/src/org/openstreetmap/josm/io/NoteWriter.java
index f186760..250b869 100644
--- a/src/org/openstreetmap/josm/io/NoteWriter.java
+++ b/src/org/openstreetmap/josm/io/NoteWriter.java
@@ -6,13 +6,13 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.util.Locale;
+import java.text.DateFormat;
import org.openstreetmap.josm.data.notes.Note;
import org.openstreetmap.josm.data.notes.NoteComment;
import org.openstreetmap.josm.data.osm.NoteData;
import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.tools.date.DateUtils;
/**
* Class to write a collection of notes out to XML.
@@ -22,7 +22,7 @@ import org.openstreetmap.josm.data.osm.User;
*/
public class NoteWriter extends XmlWriter {
- private final SimpleDateFormat ISO8601_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX", Locale.ENGLISH);
+ private final DateFormat ISO8601_FORMAT = DateUtils.newIsoDateTimeFormat();
/**
* Create a NoteWriter that will write to the given PrintWriter
diff --git a/src/org/openstreetmap/josm/io/OsmServerReader.java b/src/org/openstreetmap/josm/io/OsmServerReader.java
index 0a64d4c..71e2859 100644
--- a/src/org/openstreetmap/josm/io/OsmServerReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerReader.java
@@ -353,13 +353,13 @@ public abstract class OsmServerReader extends OsmConnection {
/**
* Downloads notes from the API, given API limit parameters
*
- * @param noteLimit How many notes to download. Defaults to 1000 if not specified. API has a hard limit of 10000
+ * @param noteLimit How many notes to download.
* @param daysClosed Return notes closed this many days in the past. -1 means all notes, ever. 0 means only unresolved notes.
* @param progressMonitor Progress monitor for user feedback
* @return List of notes returned by the API
* @throws OsmTransferException if any errors happen
*/
- public List<Note> parseNotes(Integer noteLimit, Integer daysClosed, ProgressMonitor progressMonitor) throws OsmTransferException {
+ public List<Note> parseNotes(int noteLimit, int daysClosed, ProgressMonitor progressMonitor) throws OsmTransferException {
return null;
}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java b/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
index b68a8ef..bd001f6 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
@@ -91,8 +91,7 @@ public class RequestProcessor extends Thread {
* @param command The command to handle.
* @param handler The additional request handler.
*/
- static void addRequestHandlerClass(String command,
- Class<? extends RequestHandler> handler) {
+ public static void addRequestHandlerClass(String command, Class<? extends RequestHandler> handler) {
addRequestHandlerClass(command, handler, false);
}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
index bcec095..03d6292 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
@@ -4,7 +4,6 @@ package org.openstreetmap.josm.io.remotecontrol.handler;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.Arrays;
-import java.util.HashMap;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.imagery.ImageryInfo;
@@ -19,7 +18,7 @@ import org.openstreetmap.josm.tools.Utils;
* Adds an imagery (WMS/TMS) layer. For instance, {@code /imagery?title=...&type=...&url=...}.
* @since 3715
*/
-public class ImageryHandler extends RequestHandler {
+public class ImageryHandler extends RequestHandler.RawURLParseRequestHandler {
/**
* The remote control command name used to add an imagery layer.
@@ -115,33 +114,6 @@ public class ImageryHandler extends RequestHandler {
}
@Override
- protected void parseArgs() {
- HashMap<String, String> args = new HashMap<>();
- if (request.indexOf('?') != -1) {
- String query = request.substring(request.indexOf('?') + 1);
- if (query.indexOf("url=") == 0) {
- args.put("url", decodeParam(query.substring(4)));
- } else {
- int urlIdx = query.indexOf("&url=");
- if (urlIdx != -1) {
- args.put("url", decodeParam(query.substring(urlIdx + 5)));
- query = query.substring(0, urlIdx);
- } else if (query.indexOf('#') != -1) {
- query = query.substring(0, query.indexOf('#'));
- }
- String[] params = query.split("&", -1);
- for (String param : params) {
- int eq = param.indexOf('=');
- if (eq != -1) {
- args.put(param.substring(0, eq), decodeParam(param.substring(eq + 1)));
- }
- }
- }
- }
- this.args = args;
- }
-
- @Override
protected void validateRequest() throws RequestHandlerBadRequestException {
String url = args.get("url");
String type = args.get("type");
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java
index c1bf2b8..f9c1849 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java
@@ -6,9 +6,11 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collection;
-import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Set;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.OpenLocationAction;
import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
@@ -17,7 +19,7 @@ import org.openstreetmap.josm.tools.Utils;
/**
* Handler for import request
*/
-public class ImportHandler extends RequestHandler {
+public class ImportHandler extends RequestHandler.RawURLParseRequestHandler {
/**
* The remote control command name used to import data.
@@ -30,9 +32,20 @@ public class ImportHandler extends RequestHandler {
@Override
protected void handleRequest() throws RequestHandlerErrorException {
try {
- if (suitableDownloadTasks != null && !suitableDownloadTasks.isEmpty()) {
- // TODO: handle multiple suitable download tasks ?
- suitableDownloadTasks.iterator().next().loadUrl(isLoadInNewLayer(), url.toExternalForm(), null);
+ if (suitableDownloadTasks.isEmpty()) {
+ // It should maybe be better to reject the request in that case ?
+ // For compatibility reasons with older instances of JOSM, arbitrary choice of DownloadOsmTask
+ // As of 2015-04, Overpass Turbo requires this branch of code ...
+ Main.debug("Remote control, /import: defaulting to DownloadOsmTask");
+ new DownloadOsmTask().loadUrl(isLoadInNewLayer(), url.toExternalForm(), null);
+ } else if (Main.pref.getBoolean("remotecontrol.import.interactive", true)) {
+ // OpenLocationAction queries the user if more than one task is suitable
+ new OpenLocationAction().openUrl(isLoadInNewLayer(), url.toExternalForm());
+ } else {
+ // Otherwise perform all tasks
+ for (DownloadTask task : suitableDownloadTasks) {
+ task.loadUrl(isLoadInNewLayer(), url.toExternalForm(), null);
+ }
}
} catch (Exception ex) {
Main.warn("RemoteControl: Error parsing import remote control request:");
@@ -68,13 +81,14 @@ public class ImportHandler extends RequestHandler {
// Other API instances will however use the import handler to force JOSM to make requests to this API instance.
// (Example with OSM-FR website that makes calls to the OSM-FR API)
// For user-friendliness, let's try to decode these OSM API calls to give a better confirmation message.
- String taskMessage = null;
+ Set<String> taskMessages = new LinkedHashSet<>();
if (suitableDownloadTasks != null && !suitableDownloadTasks.isEmpty()) {
- // TODO: handle multiple suitable download tasks ?
- taskMessage = suitableDownloadTasks.iterator().next().getConfirmationMessage(url);
+ for (DownloadTask task : suitableDownloadTasks) {
+ taskMessages.add(Utils.firstNonNull(task.getConfirmationMessage(url), url.toString()));
+ }
}
return tr("Remote Control has been asked to import data from the following URL:")
- + "<br>" + (taskMessage == null ? url.toString() : taskMessage);
+ + Utils.joinAsHtmlUnorderedList(taskMessages);
}
@Override
@@ -83,35 +97,6 @@ public class ImportHandler extends RequestHandler {
}
@Override
- protected void parseArgs() {
- HashMap<String, String> args = new HashMap<>();
- if (request.indexOf('?') != -1) {
- String query = request.substring(request.indexOf('?') + 1);
- if (query.indexOf("url=") == 0) {
- args.put("url", decodeParam(query.substring(4)));
- } else {
- int urlIdx = query.indexOf("&url=");
- if (urlIdx != -1) {
- args.put("url", decodeParam(query.substring(urlIdx + 5)));
- query = query.substring(0, urlIdx);
- } else {
- if (query.indexOf('#') != -1) {
- query = query.substring(0, query.indexOf('#'));
- }
- }
- String[] params = query.split("&", -1);
- for (String param : params) {
- int eq = param.indexOf('=');
- if (eq != -1) {
- args.put(param.substring(0, eq), param.substring(eq + 1));
- }
- }
- }
- }
- this.args = args;
- }
-
- @Override
protected void validateRequest() throws RequestHandlerBadRequestException {
String urlString = args.get("url");
if (Main.pref.getBoolean("remotecontrol.importhandler.fix_url_query", true)) {
@@ -125,10 +110,5 @@ public class ImportHandler extends RequestHandler {
}
// Find download tasks for the given URL
suitableDownloadTasks = Main.main.menu.openLocation.findDownloadTasks(urlString, true);
- if (suitableDownloadTasks.isEmpty()) {
- // It should maybe be better to reject the request in that case ?
- // For compatibility reasons with older instances of JOSM, arbitrary choice of DownloadOsmTask
- suitableDownloadTasks.add(new DownloadOsmTask());
- }
}
}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
index c289277..9546df1 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
@@ -72,7 +72,7 @@ public class LoadAndZoomHandler extends RequestHandler {
@Override
public String[] getOptionalParams() {
- return new String[] {"new_layer", "addtags", "select", "zoom_mode", "changeset_comment", "changeset_source", "search"};
+ return new String[] {"new_layer", "layer_name", "addtags", "select", "zoom_mode", "changeset_comment", "changeset_source", "search"};
}
@Override
@@ -101,7 +101,11 @@ public class LoadAndZoomHandler extends RequestHandler {
@Override
protected void handleRequest() throws RequestHandlerErrorException {
- DownloadTask osmTask = new DownloadOsmTask();
+ DownloadTask osmTask = new DownloadOsmTask() {
+ {
+ newLayerName = args.get("layer_name");
+ }
+ };
try {
boolean newLayer = isLoadInNewLayer();
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadDataHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadDataHandler.java
index 462aeda..0ad6208 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadDataHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadDataHandler.java
@@ -4,17 +4,17 @@ package org.openstreetmap.josm.io.remotecontrol.handler;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.ByteArrayInputStream;
-import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.HashMap;
-import java.util.Map;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.io.IllegalDataException;
import org.openstreetmap.josm.io.OsmReader;
import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
+import org.openstreetmap.josm.tools.Utils;
/**
* Handler to load data directly from the URL.
@@ -35,24 +35,13 @@ public class LoadDataHandler extends RequestHandler {
private String data;
/**
- * Holds the mime type. Currently only OSM_MIME_TYPE is supported
- * But it could be extended to text/csv, application/gpx+xml, ... or even binary encoded data
+ * Holds the parsed data set
*/
- private String mimeType;
+ private DataSet dataSet;
@Override
protected void handleRequest() throws RequestHandlerErrorException {
- try {
- // Transform data string to inputstream
- InputStream source = new ByteArrayInputStream(data.getBytes("UTF-8"));
- DataSet dataSet = new DataSet();
- if (mimeType != null && mimeType.contains(OSM_MIME_TYPE))
- dataSet = OsmReader.parseDataSet(source, null);
- Main.worker.submit(new LoadDataTask(isLoadInNewLayer(), dataSet, args.get("layer_name")));
- } catch (Exception e) {
- Main.warn("Problem with data: " + data);
- throw new RequestHandlerErrorException(e);
- }
+ Main.worker.submit(new LoadDataTask(isLoadInNewLayer(), dataSet, args.get("layer_name")));
}
@Override
@@ -72,8 +61,13 @@ public class LoadDataHandler extends RequestHandler {
@Override
public String[] getUsageExamples() {
- return new String[] {
- "/load_data?layer_name=extra_layer&new_layer=true&data=%3Cosm%3E%3Cnode%3E...%3C%2Fnode%3E%3C%2Fosm%3E" };
+ try {
+ final String data = URLEncoder.encode("<osm version='0.6'><node id='-1' lat='1' lon='2' /></osm>", "UTF-8");
+ return new String[]{
+ "/load_data?layer_name=extra_layer&new_layer=true&data=" + data};
+ } catch (UnsupportedEncodingException ex) {
+ throw new IllegalStateException(ex);
+ }
}
@Override
@@ -89,37 +83,22 @@ public class LoadDataHandler extends RequestHandler {
}
@Override
- protected void parseArgs() {
- if (request.indexOf('?') == -1)
- return; // nothing to do
-
- Map<String, String> args = new HashMap<>();
-
- // The data itself shouldn't contain any &, = or ? chars.
- // Those are reserved for the URL parsing
- // and should be URL encoded as %26, %3D or %3F
- String query = request.substring(request.indexOf('?') + 1);
- String[] params = query.split("&");
- for (String param : params) {
- String[] kv = param.split("=");
- if (kv.length == 2)
- args.put(kv[0], kv[1]);
- }
- this.args = args;
- }
-
- @Override
protected void validateRequest() throws RequestHandlerBadRequestException {
- if (args.get("data") == null)
- throw new RequestHandlerBadRequestException("RemoteControl: No data defined in URL");
+ this.data = args.get("data");
+ /**
+ * Holds the mime type. Currently only OSM_MIME_TYPE is supported
+ * But it could be extended to text/csv, application/gpx+xml, ... or even binary encoded data
+ */
+ final String mimeType = Utils.firstNonNull(args.get("mime_type"), OSM_MIME_TYPE);
try {
- data = URLDecoder.decode(args.get("data"), "UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new RequestHandlerBadRequestException("RemoteControl: UnsupportedEncodingException: " + e.getMessage(), e);
- }
- mimeType = args.get("mime_type");
- if (mimeType == null) {
- mimeType = OSM_MIME_TYPE;
+ if (OSM_MIME_TYPE.equals(mimeType)) {
+ final ByteArrayInputStream in = new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8));
+ dataSet = OsmReader.parseDataSet(in, null);
+ } else {
+ dataSet = new DataSet();
+ }
+ } catch (IllegalDataException e) {
+ throw new RequestHandlerBadRequestException("Failed to parse " + data + ": " + e.getMessage(), e);
}
}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
index c57e2b3..307d37f 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
@@ -39,7 +39,7 @@ public class LoadObjectHandler extends RequestHandler {
@Override
public String[] getOptionalParams() {
- return new String[] {"new_layer", "addtags", "relation_members", "referrers"};
+ return new String[] {"new_layer", "layer_name", "addtags", "relation_members", "referrers"};
}
@Override
@@ -63,9 +63,9 @@ public class LoadObjectHandler extends RequestHandler {
if (!ps.isEmpty()) {
final boolean newLayer = isLoadInNewLayer();
final boolean relationMembers = Boolean.parseBoolean(args.get("relation_members"));
- final boolean referrers = args.containsKey("referrers") ? Boolean.parseBoolean(args.get("referrers")) : true;
+ final boolean referrers = Boolean.parseBoolean(args.get("referrers"));
final DownloadPrimitivesWithReferrersTask task = new DownloadPrimitivesWithReferrersTask(
- newLayer, ps, referrers, relationMembers, null);
+ newLayer, ps, referrers, relationMembers, args.get("layer_name"), null);
Main.worker.submit(task);
Main.worker.submit(new Runnable() {
@Override
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
index 265eb29..1cf8e51 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
@@ -1,9 +1,15 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io.remotecontrol.handler;
-import static org.openstreetmap.josm.tools.I18n.tr;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
+import org.openstreetmap.josm.tools.Utils;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.text.MessageFormat;
import java.util.Collections;
@@ -13,12 +19,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
-import org.openstreetmap.josm.tools.Utils;
+import static org.openstreetmap.josm.tools.I18n.tr;
/**
* This is the parent of all classes that handle a specific remote control command
@@ -192,25 +193,30 @@ public abstract class RequestHandler {
*/
protected void parseArgs() {
try {
- String req = URLDecoder.decode(this.request, "UTF-8");
- HashMap<String, String> args = new HashMap<>();
- if (req.indexOf('?') != -1) {
- String query = req.substring(req.indexOf('?') + 1);
- if (query.indexOf('#') != -1) {
- query = query.substring(0, query.indexOf('#'));
- }
- String[] params = query.split("&", -1);
- for (String param : params) {
- int eq = param.indexOf('=');
- if (eq != -1) {
- args.put(param.substring(0, eq), param.substring(eq + 1));
- }
- }
+ this.args = getRequestParameter(new URI(this.request));
+ } catch (URISyntaxException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ /**
+ * @see <a href="http://blog.lunatech.com/2009/02/03/what-every-web-developer-must-know-about-url-encoding">
+ * What every web developer must know about URL encoding</a>
+ */
+ static Map<String, String> getRequestParameter(URI uri) {
+ Map<String, String> r = new HashMap<>();
+ if (uri.getRawQuery() == null) {
+ return r;
+ }
+ for (String kv : uri.getRawQuery().split("&")) {
+ try {
+ final String[] kvs = URLDecoder.decode(kv, "UTF-8").split("=", 2);
+ r.put(kvs[0], kvs.length > 1 ? kvs[1] : null);
+ } catch (UnsupportedEncodingException ex) {
+ throw new IllegalStateException(ex);
}
- this.args = args;
- } catch (UnsupportedEncodingException ex) {
- throw new IllegalStateException(ex);
}
+ return r;
}
void checkMandatoryParams() throws RequestHandlerBadRequestException {
@@ -268,7 +274,7 @@ public abstract class RequestHandler {
: Main.pref.getBoolean(loadInNewLayerKey, loadInNewLayerDefault);
}
- protected final String decodeParam(String param) {
+ protected static String decodeParam(String param) {
try {
return URLDecoder.decode(param, "UTF-8");
} catch (UnsupportedEncodingException e) {
@@ -318,4 +324,33 @@ public abstract class RequestHandler {
super(message);
}
}
+
+ public static abstract class RawURLParseRequestHandler extends RequestHandler {
+ @Override
+ protected void parseArgs() {
+ HashMap<String, String> args = new HashMap<>();
+ if (request.indexOf('?') != -1) {
+ String query = request.substring(request.indexOf('?') + 1);
+ if (query.indexOf("url=") == 0) {
+ args.put("url", decodeParam(query.substring(4)));
+ } else {
+ int urlIdx = query.indexOf("&url=");
+ if (urlIdx != -1) {
+ args.put("url", decodeParam(query.substring(urlIdx + 5)));
+ query = query.substring(0, urlIdx);
+ } else if (query.indexOf('#') != -1) {
+ query = query.substring(0, query.indexOf('#'));
+ }
+ String[] params = query.split("&", -1);
+ for (String param : params) {
+ int eq = param.indexOf('=');
+ if (eq != -1) {
+ args.put(param.substring(0, eq), decodeParam(param.substring(eq + 1)));
+ }
+ }
+ }
+ }
+ this.args = args;
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/tools/ExifReader.java b/src/org/openstreetmap/josm/tools/ExifReader.java
index 1f41a21..462d3fe 100644
--- a/src/org/openstreetmap/josm/tools/ExifReader.java
+++ b/src/org/openstreetmap/josm/tools/ExifReader.java
@@ -46,9 +46,10 @@ public final class ExifReader {
OUTER:
for (Directory dirIt : metadata.getDirectories()) {
for (Tag tag : dirIt.getTags()) {
- if (tag.getTagType() == ExifSubIFDDirectory.TAG_DATETIME_ORIGINAL /* 0x9003 */) {
+ if (tag.getTagType() == ExifSubIFDDirectory.TAG_DATETIME_ORIGINAL /* 0x9003 */ &&
+ !tag.getDescription().matches("\\[[0-9]+ .+\\]")) {
dateStr = tag.getDescription();
- break OUTER; // prefer this tag
+ break OUTER; // prefer this tag if known
}
if (tag.getTagType() == ExifIFD0Directory.TAG_DATETIME /* 0x0132 */ ||
tag.getTagType() == ExifSubIFDDirectory.TAG_DATETIME_DIGITIZED /* 0x9004 */) {
@@ -86,7 +87,7 @@ public final class ExifReader {
public static Integer readOrientation(File filename) {
try {
final Metadata metadata = JpegMetadataReader.readMetadata(filename);
- final Directory dir = metadata.getDirectory(ExifIFD0Directory.class);
+ final Directory dir = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
return dir.getInt(ExifIFD0Directory.TAG_ORIENTATION);
} catch (JpegProcessingException | MetadataException | IOException e) {
Main.error(e);
@@ -103,7 +104,7 @@ public final class ExifReader {
public static LatLon readLatLon(File filename) {
try {
final Metadata metadata = JpegMetadataReader.readMetadata(filename);
- final GpsDirectory dirGps = metadata.getDirectory(GpsDirectory.class);
+ final GpsDirectory dirGps = metadata.getFirstDirectoryOfType(GpsDirectory.class);
return readLatLon(dirGps);
} catch (JpegProcessingException e) {
Main.error(e);
@@ -140,7 +141,7 @@ public final class ExifReader {
public static Double readDirection(File filename) {
try {
final Metadata metadata = JpegMetadataReader.readMetadata(filename);
- final GpsDirectory dirGps = metadata.getDirectory(GpsDirectory.class);
+ final GpsDirectory dirGps = metadata.getFirstDirectoryOfType(GpsDirectory.class);
return readDirection(dirGps);
} catch (JpegProcessingException e) {
Main.error(e);
diff --git a/src/org/openstreetmap/josm/tools/I18n.java b/src/org/openstreetmap/josm/tools/I18n.java
index 45389d7..dac36fa 100644
--- a/src/org/openstreetmap/josm/tools/I18n.java
+++ b/src/org/openstreetmap/josm/tools/I18n.java
@@ -65,6 +65,9 @@ public final class I18n {
* <a href="http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#ro">Romanian</a>.*
MODE_RO,*/
/** Special mode for
+ * <a href="http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#lt">Lithuanian</a>. */
+ MODE_LT,
+ /** Special mode for
* <a href="http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#ru">Russian</a>. */
MODE_RU,
/** Special mode for
@@ -345,7 +348,7 @@ public final class I18n {
}
private static URL getTranslationFile(String lang) {
- return Main.class.getResource("/data/"+lang+".lang");
+ return Main.class.getResource("/data/"+lang.replace("@","-")+".lang");
}
/**
@@ -396,6 +399,7 @@ public final class I18n {
languages.put("ast", PluralMode.MODE_NOTONE);
languages.put("bg", PluralMode.MODE_NOTONE);
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);
@@ -416,6 +420,7 @@ public final class I18n {
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);
@@ -657,7 +662,7 @@ public final class I18n {
} else {
if (!"en".equals(l.getLanguage())) {
Main.info(tr("Unable to find translation for the locale {0}. Reverting to {1}.",
- l.getDisplayName(), Locale.getDefault().getDisplayName()));
+ LanguageInfo.getDisplayName(l), LanguageInfo.getDisplayName(Locale.getDefault())));
} else {
strings = null;
pstrings = null;
@@ -705,6 +710,9 @@ public final class I18n {
&& (((n % 100) < 10) || ((n % 100) >= 20))) ? 1 : 2));
//case MODE_RO:
// return ((n == 1) ? 0 : ((((n % 100) > 19) || (((n % 100) == 0) && (n != 0))) ? 2 : 1));
+ case MODE_LT:
+ return (((n % 10) == 1) && ((n % 100) != 11) ? 0 : (((n % 10) >= 2)
+ && (((n % 100) < 10) || ((n % 100) >= 20)) ? 1 : 2));
case MODE_RU:
return ((((n % 10) == 1) && ((n % 100) != 11)) ? 0 : (((((n % 10) >= 2)
&& ((n % 10) <= 4)) && (((n % 100) < 10) || ((n % 100) >= 20))) ? 1 : 2));
diff --git a/src/org/openstreetmap/josm/tools/LanguageInfo.java b/src/org/openstreetmap/josm/tools/LanguageInfo.java
index a1009d5..4106afc 100644
--- a/src/org/openstreetmap/josm/tools/LanguageInfo.java
+++ b/src/org/openstreetmap/josm/tools/LanguageInfo.java
@@ -1,6 +1,8 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
+import static org.openstreetmap.josm.tools.I18n.trc;
+
import java.util.Locale;
public final class LanguageInfo {
@@ -47,8 +49,12 @@ public final class LanguageInfo {
} else {
return null;
}
- } else if(type == LocaleType.DEFAULTNOTENGLISH && "en".equals(code))
+ } else if(type == LocaleType.DEFAULTNOTENGLISH && "en".equals(code)) {
return null;
+ } else if(code.matches(".+ at .+")) {
+ return code.substring(0,1).toUpperCase() + code.substring(1,2)
+ + "-" + code.substring(3,4).toUpperCase() + code.substring(4) + ":";
+ }
return code.substring(0,1).toUpperCase() + code.substring(1) + ":";
}
@@ -90,6 +96,8 @@ public final class LanguageInfo {
return "he";
else if ("in".equals(full))
return "id";
+ else if ("ca__valencia".equals(full))
+ return "ca at valencia";
else if (I18n.hasCode(full)) // catch all non-single codes
return full;
@@ -102,15 +110,52 @@ public final class LanguageInfo {
*
* In most cases JOSM and Java uses the same codes, but for some exceptions this is needed.
*
+ * @param locale the locale. Replies "en" if null.
+ * @return the Java code for the given locale
+ * @since 8232
+ */
+ public static String getJavaLocaleCode(String localeName) {
+ if (localeName == null) return "en";
+ if ("ca at valencia".equals(localeName)) {
+ localeName = "ca__valencia";
+ } else if ("he".equals(localeName)) {
+ localeName = "iw_IL";
+ } else if ("id".equals(localeName)) {
+ localeName = "in";
+ }
+ return localeName;
+ }
+
+ /**
+ * Replies the display string used by JOSM for a given locale.
+ *
+ * In most cases returns text replied by {@link Locale#getDisplayName()}, for some
+ * locales an override is used (i.e. when unsupported by Java).
+ *
+ * @param locale the locale. Replies "en" if null.
+ * @return the display string for the given locale
+ * @since 8232
+ */
+ public static String getDisplayName(Locale locale) {
+ /*String full = locale.toString();
+ if ("ca__valencia".equals(full))
+ return t_r_c("language", "Valencian");*/
+
+ return locale.getDisplayName();
+ }
+
+ /**
+ * Replies the locale used by Java for a given language code.
+ *
+ * Accepts JOSM and Java codes as input.
+ *
* @param localeName the locale code.
* @return the resulting locale
*/
public static Locale getLocale(String localeName) {
- if ("he".equals(localeName)) {
- localeName = "iw_IL";
- }
- else if ("id".equals(localeName)) {
- localeName = "in";
+ localeName = getJavaLocaleCode(localeName);
+ if ("ca__valencia".equals(localeName)) {
+ return new Locale("ca", "", "valencia");
}
Locale l;
int i = localeName.indexOf('_');
@@ -146,7 +191,9 @@ public final class LanguageInfo {
* @see #getJOSMLocaleCode()
*/
public static String getLanguageCodeXML() {
- return getJOSMLocaleCode()+".";
+ String code = getJOSMLocaleCode();
+ code = code.replace("@", "-");
+ return code+".";
}
/**
@@ -156,6 +203,8 @@ public final class LanguageInfo {
* @see #getJOSMLocaleCode()
*/
public static String getLanguageCodeManifest() {
- return getJOSMLocaleCode()+"_";
+ String code = getJOSMLocaleCode();
+ code = code.replace("@", "-");
+ return code+"_";
}
}
diff --git a/styles/standard/elemstyles.mapcss b/styles/standard/elemstyles.mapcss
index f093906..b279008 100644
--- a/styles/standard/elemstyles.mapcss
+++ b/styles/standard/elemstyles.mapcss
@@ -922,6 +922,7 @@ way[cycleway:left=lane]::core_cycleway {
way[cycleway:right=lane]::core_cycleway {
set lR;
}
+way[oneway=no][cycleway=lane]::core_cycleway,
way[!oneway][cycleway=lane]::core_cycleway {
set lL;
set lR;
@@ -951,6 +952,7 @@ way[cycleway:left=track]::core_cycleway {
way[cycleway:right=track]::core_cycleway {
set tR;
}
+way[oneway=no][cycleway=track]::core_cycleway,
way[!oneway][cycleway=track]::core_cycleway {
set tL;
set tR;
@@ -2320,7 +2322,8 @@ node[amenity=clock] {
area[emergency=aed],
area[amenity=toilets],
area[amenity=shower],
-area[amenity=recycling] {
+area[amenity=recycling],
+area[amenity=sanitary_dump_station] {
fill-color: amenity_light#f7efb7;
}
node[emergency=phone] {
@@ -2363,6 +2366,11 @@ node[amenity=waste_disposal] {
set icon_z17;
text: auto;
}
+node[amenity=sanitary_dump_station] {
+ icon-image: "service/recycling/sanitary_dump_station.svg";
+ set icon_z17;
+ text: auto;
+}
area[amenity=public_building],
area[amenity=townhall],
area[amenity=embassy],
@@ -3649,9 +3657,12 @@ area[sport=golf],
area[sport=gymnastics],
area[sport=hockey],
area[sport=horse_racing],
-area[sport=karting],
-area[sport=motocross],
-area[sport=motor] {
+area[sport=karting][highway!=raceway],
+area[sport=karting][highway=raceway][area=yes],
+area[sport=motocross][highway!=raceway],
+area[sport=motocross][highway=raceway][area=yes],
+area[sport=motor][highway!=raceway],
+area[sport=motor][highway=raceway][area=yes] {
fill-color: sport#bde3cb;
}
node[sport=cycling] {
diff --git a/taginfoextract.groovy b/taginfoextract.groovy
index 02a5841..370dfb6 100644
--- a/taginfoextract.groovy
+++ b/taginfoextract.groovy
@@ -4,12 +4,17 @@
*
* Run from the base directory of a JOSM checkout:
*
- * groovy -cp dist/josm-custom.jar taginfoextract.groovy
+ * groovy -cp dist/josm-custom.jar taginfoextract.groovy -t mappaint
+ * groovy -cp dist/josm-custom.jar taginfoextract.groovy -t presets
*/
import java.awt.image.BufferedImage
+import java.nio.file.Files
+import java.nio.file.FileSystems
+import java.nio.file.Path
import javax.imageio.ImageIO
+import groovy.json.JsonBuilder
import org.openstreetmap.josm.Main
import org.openstreetmap.josm.data.Version
import org.openstreetmap.josm.data.coor.LatLon
@@ -28,7 +33,12 @@ import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource
import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.SimpleKeyValueCondition
import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector
import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser
+import org.openstreetmap.josm.gui.tagging.TaggingPreset
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems
+import org.openstreetmap.josm.gui.tagging.TaggingPresetReader
+import org.openstreetmap.josm.gui.tagging.TaggingPresetType
import org.openstreetmap.josm.io.CachedFile
+import org.openstreetmap.josm.tools.Utils
class taginfoextract {
@@ -62,7 +72,6 @@ class taginfoextract {
def env = new Environment(osm, mc, null, style_source)
for (def r in style_source.rules) {
env.clearSelectorMatchingInformation()
- env.layer = r.selector.getSubpart()
if (r.selector.matches(env)) {
// ignore selector range
if (env.layer == null) {
@@ -76,22 +85,6 @@ class taginfoextract {
}
/**
- * Determine full image url (can refer to JOSM or OSM repository).
- */
- def find_image_url(path) {
- def f = new File("${base_dir}/images/styles/standard/${path}")
- if (f.exists()) {
- def rev = osm_svn_revision()
- return "http://trac.openstreetmap.org/export/${rev}/subversion/applications/share/map-icons/classic.small/${path}"
- }
- f = new File("${base_dir}/images/${path}")
- if (f.exists()) {
- return "http://josm.openstreetmap.de/export/${josm_svn_revision}/josm/trunk/images/${path}"
- }
- assert false, "Cannot find image url for ${path}"
- }
-
- /**
* Create image file from ElemStyle.
* @return the URL
*/
@@ -188,7 +181,15 @@ class taginfoextract {
static main(def args) {
parse_command_line_arguments(args)
def script = new taginfoextract()
- script.run()
+ if (!options.t || options.t == 'mappaint') {
+ script.run()
+ } else if (options.t == 'presets') {
+ script.run_presets()
+ } else {
+ System.err.println 'Invalid type ' + options.t
+ System.exit(1)
+ }
+
System.exit(0)
}
@@ -200,9 +201,10 @@ class taginfoextract {
header:"Options:",
footer:"[inputfile] the file to process (optional, default is 'resource://styles/standard/elemstyles.mapcss')")
cli.o(args:1, argName: "file", "output file (json), - prints to stdout (default: -)")
- cli._(longOpt:'svnrev', args:1, argName:"revision", "corresponding revision of the repository http://svn.openstreetmap.org/ (optional, current revision is read from the local checkout or from the web if not given, see --svnweb)")
+ cli.t(args:1, argName: "type", "the project type to be generated")
+ cli._(longOpt:'svnrev', args:1, argName:"revision", "corresponding revision of the repository https://svn.openstreetmap.org/ (optional, current revision is read from the local checkout or from the web if not given, see --svnweb)")
cli._(longOpt:'imgdir', args:1, argName:"directory", "directory to put the generated images in (default: ./taginfo-img)")
- cli._(longOpt:'svnweb', 'fetch revision of the repository http://svn.openstreetmap.org/ from web and not from the local repository')
+ cli._(longOpt:'svnweb', 'fetch revision of the repository https://svn.openstreetmap.org/ from web and not from the local repository')
cli._(longOpt:'imgurlprefix', args:1, argName:'prefix', 'image URLs prefix for generated image files')
cli.h(longOpt:'help', "show this help")
options = cli.parse(args)
@@ -229,73 +231,90 @@ class taginfoextract {
}
}
+ void run_presets() {
+ init()
+ def tags = []
+ def presets = TaggingPresetReader.readAll(input_file, true)
+ for (TaggingPreset preset : presets) {
+ for (TaggingPresetItems.KeyedItem item : Utils.filteredCollection(preset.data, TaggingPresetItems.KeyedItem.class)) {
+ def values
+ switch (TaggingPresetItems.MatchType.ofString(item.match)) {
+ case TaggingPresetItems.MatchType.KEY_REQUIRED: values = item.getValues(); break;
+ case TaggingPresetItems.MatchType.KEY_VALUE_REQUIRED: values = item.getValues(); break;
+ default: values = [];
+ }
+ for (String value : values) {
+ def tag = [
+ description: preset.name,
+ key: item.key,
+ value: value,
+ type: preset.types.collect {it == TaggingPresetType.CLOSEDWAY ? "area" : it.toString().toLowerCase()},
+ ]
+ if (preset.iconName) tag += [icon: find_image_url(preset.iconName)]
+ tags += tag
+ }
+ }
+ }
+
+ write_json("JOSM main presets", "Tags supported by the default presets in the OSM editor JOSM", tags)
+ }
+
void run() {
init()
parse_style_sheet()
collect_tags()
- def datetime = new Date().format("yyyyMMdd'T'hhmmssZ")
- output """{
- | "data_format": 1,
- | "data_updated": "${datetime}",
- | "project": {
- | "name": "JOSM main mappaint style",
- | "description": "Tags supported by the main mappaint style in the OSM editor JOSM",
- | "project_url": "http://josm.openstreetmap.de/",
- | "icon_url": "http://josm.openstreetmap.de/export/7770/josm/trunk/images/logo_16x16x8.png",
- | "contact_name": "JOSM developer team",
- | "contact_email": "josm-dev at openstreetmap.org"
- | },
- | "tags": [
- |""".stripMargin()
- // another optional field is "data_url": ...
-
- def sep = ""
- for (tag in tags) {
+ def tags = tags.collect {
+ def tag = it
def types = []
def final_url = null
def node_url = new NodeChecker(tag).find_url(true)
if (node_url) {
- types += '"node"'
+ types += 'node'
final_url = node_url
}
def way_url = new WayChecker(tag).find_url(final_url == null)
if (way_url) {
- types += '"way"'
+ types += 'way'
if (!final_url) {
final_url = way_url
}
}
def area_url = new AreaChecker(tag).find_url(final_url == null)
if (area_url) {
- types += '"area"'
+ types += 'area'
if (!final_url) {
final_url = area_url
}
}
- output """${sep} {
- | "key": "${tag[0]}",
- | "value": "${tag[1]}",
- | "object_types": ${types}""".stripMargin()
- if (final_url != null) {
- output """,
- | "icon_url": "${final_url}"
- | }""".stripMargin()
- } else {
- output """
- | }""".stripMargin()
- }
- sep = ",\n"
+ def obj = [key: tag[0], value: tag[1]]
+ if (types) obj += [object_types: types]
+ if (final_url) obj += [icon_url: final_url]
+ obj
}
- output """
- | ]
- |}
- |""".stripMargin()
+
+ write_json("JOSM main mappaint style", "Tags supported by the main mappaint style in the OSM editor JOSM", tags)
+ }
+
+ void write_json(name, description, tags) {
+ def json = new JsonBuilder()
+ def project = [
+ name: name,
+ description: description,
+ project_url: "https://josm.openstreetmap.de/",
+ icon_url: "https://josm.openstreetmap.de/export/7770/josm/trunk/images/logo_16x16x8.png",
+ contact_name: "JOSM developer team",
+ contact_email: "josm-dev at openstreetmap.org",
+ ]
+ json data_format: 1, data_updated: new Date().format("yyyyMMdd'T'hhmmssZ"), project: project, tags: tags
if (output_file != null) {
+ json.writeTo(output_file)
output_file.close()
+ } else {
+ print json.toPrettyString()
}
}
@@ -306,12 +325,16 @@ class taginfoextract {
Main.initApplicationPreferences()
Main.pref.enableSaveOnPut(false)
Main.setProjection(Projections.getProjectionByCode("EPSG:3857"))
+ Path tmpdir = Files.createTempDirectory(FileSystems.getDefault().getPath(base_dir), "pref")
+ System.setProperty("josm.home", tmpdir.toString())
josm_svn_revision = Version.getInstance().getVersion()
assert josm_svn_revision != Version.JOSM_UNKNOWN_VERSION
- if (options.arguments().size() == 0) {
+ if (options.arguments().size() == 0 && (!options.t || options.t == 'mappaint')) {
input_file = "resource://styles/standard/elemstyles.mapcss"
+ } else if (options.arguments().size() == 0 && options.t == 'presets') {
+ input_file = "resource://data/defaultpresets.xml"
} else {
input_file = options.arguments()[0]
}
@@ -323,7 +346,23 @@ class taginfoextract {
}
/**
- * Get revision for the repository http://svn.openstreetmap.org.
+ * Determine full image url (can refer to JOSM or OSM repository).
+ */
+ def find_image_url(path) {
+ def f = new File("${base_dir}/images/styles/standard/${path}")
+ if (f.exists()) {
+ def rev = osm_svn_revision()
+ return "https://trac.openstreetmap.org/export/${rev}/subversion/applications/share/map-icons/classic.small/${path}"
+ }
+ f = new File("${base_dir}/images/${path}")
+ if (f.exists()) {
+ return "https://josm.openstreetmap.de/export/${josm_svn_revision}/josm/trunk/images/${path}"
+ }
+ assert false, "Cannot find image url for ${path}"
+ }
+
+ /**
+ * Get revision for the repository https://svn.openstreetmap.org.
*/
def osm_svn_revision() {
if (cached_svnrev != null) return cached_svnrev
@@ -333,7 +372,7 @@ class taginfoextract {
}
def xml
if (options.svnweb) {
- xml = "svn info --xml http://svn.openstreetmap.org/applications/share/map-icons/classic.small".execute().text
+ xml = "svn info --xml https://svn.openstreetmap.org/applications/share/map-icons/classic.small".execute().text
} else {
xml = "svn info --xml ${base_dir}/images/styles/standard/".execute().text
}
@@ -374,24 +413,5 @@ class taginfoextract {
}
}
- /**
- * Write the JSON output (either to file or to command line).
- */
- def output(x) {
- if (output_file != null) {
- output_file.write(x)
- } else {
- print x
- }
- }
-
- static def err_println(s) {
- System.err.println(s);
- }
-
- static def err_print(s) {
- System.err.print(s);
- }
-
}
diff --git a/test/unit/org/openstreetmap/josm/TestUtils.java b/test/unit/org/openstreetmap/josm/TestUtils.java
index dbcdcb0..8b75bd6 100644
--- a/test/unit/org/openstreetmap/josm/TestUtils.java
+++ b/test/unit/org/openstreetmap/josm/TestUtils.java
@@ -1,19 +1,11 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.Arrays;
import java.util.Comparator;
-import org.junit.Test;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmUtils;
-import org.openstreetmap.josm.data.osm.Way;
-
/**
* Various utils, useful for unit tests.
*/
@@ -51,20 +43,6 @@ public class TestUtils {
return getRegressionDataDir(ticketid) + '/' + filename;
}
- @Test
- public void testCreatePrimitive() throws Exception {
- final OsmPrimitive p = OsmUtils.createPrimitive("way name=Foo railway=rail");
- assertTrue(p instanceof Way);
- assertThat(p.keySet().size(), is(2));
- assertThat(p.get("name"), is("Foo"));
- assertThat(p.get("railway"), is("rail"));
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void testCreatePrimitiveFail() throws Exception {
- OsmUtils.createPrimitive("noway name=Foo");
- }
-
/**
* Checks that the given Comparator respects its contract on the given table.
* @param comparator The comparator to test
diff --git a/test/unit/org/openstreetmap/josm/actions/CopyActionTest.java b/test/unit/org/openstreetmap/josm/actions/CopyActionTest.java
new file mode 100644
index 0000000..940c999
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/CopyActionTest.java
@@ -0,0 +1,35 @@
+package org.openstreetmap.josm.actions;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.*;
+
+public class CopyActionTest {
+
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ @Test
+ public void testCopyStringWay() throws Exception {
+ final Way way = new Way(123L);
+ assertThat(CopyAction.getCopyString(Collections.singleton(way)), is("way 123"));
+ }
+
+ @Test
+ public void testCopyStringWayRelation() throws Exception {
+ final Way way = new Way(123L);
+ final Relation relation = new Relation(456);
+ assertThat(CopyAction.getCopyString(Arrays.asList(way, relation)), is("way 123,relation 456"));
+ assertThat(CopyAction.getCopyString(Arrays.asList(relation, way)), is("relation 456,way 123"));
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java b/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java
new file mode 100644
index 0000000..d6f9c71
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java
@@ -0,0 +1,96 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+
+/**
+ * Unit tests for class SplitWayAction.
+ */
+public final class SplitWayActionTest {
+
+ /** Class under test. */
+ private static SplitWayAction action;
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init(true);
+
+ // Enable "Align in line" feature.
+ action = Main.main.menu.splitWay;
+ action.setEnabled(true);
+ }
+
+ /**
+ * Test case: When node is share by multiple ways, split selected way.
+ * see #11184
+ */
+ @Test
+ public void test11184() throws Exception {
+ DataSet dataSet = new DataSet();
+ OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);
+
+ Node n1 = new Node(new EastNorth(0, 0));
+ Node n2 = new Node(new EastNorth(-1, 1));
+ Node n3 = new Node(new EastNorth(1, 1));
+ Node n4 = new Node(new EastNorth(-1, -1));
+ Node n5 = new Node(new EastNorth(1, -1));
+ Node n6 = new Node(new EastNorth(-1, 0));
+ Node n7 = new Node(new EastNorth(1, 0));
+ dataSet.addPrimitive(n1);
+ dataSet.addPrimitive(n2);
+ dataSet.addPrimitive(n3);
+ dataSet.addPrimitive(n4);
+ dataSet.addPrimitive(n5);
+ dataSet.addPrimitive(n6);
+ dataSet.addPrimitive(n7);
+
+ Way w1 = new Way();
+ Node[] w1NodesArray = new Node[] {n6, n1, n7};
+ w1.setNodes(Arrays.asList(w1NodesArray));
+ Way w2 = new Way();
+ w2.setNodes(Arrays.asList(new Node[] {n1, n2, n3, n1, n4, n5, n1}));
+ dataSet.addPrimitive(w1);
+ dataSet.addPrimitive(w2);
+
+ dataSet.addSelected(n1);
+ dataSet.addSelected(w2);
+
+ try {
+ Main.main.addLayer(layer);
+ action.actionPerformed(null);
+ } finally {
+ // Ensure we clean the place before leaving, even if test fails.
+ Main.map.mapView.removeLayer(layer);
+ }
+
+ // Ensures 3 ways.
+ assertTrue(String.format("Found %d ways after split action instead of 3.",
+ dataSet.getWays().size()),
+ dataSet.getWays().size() == 3);
+
+ // Ensures way w1 is unchanged.
+ assertTrue("Unselected ways disappear during split action.",
+ dataSet.getWays().contains(w1));
+ assertTrue("Unselected way seems to have change during split action.",
+ w1.getNodesCount() == 3);
+ for(int i = 0; i < 3; i++) {
+ assertTrue("Node change in unselected way during split action.",
+ w1.getNode(i) == w1NodesArray[i]);
+ }
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java b/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
index 36e89c5..9f9be6b 100644
--- a/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
@@ -1,11 +1,15 @@
package org.openstreetmap.josm.actions.search;
+import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Way;
public class SearchCompilerTest {
@@ -62,4 +66,34 @@ public class SearchCompilerTest {
Assert.assertFalse(c4.match(newPrimitive("start_date", "2000")));
}
+
+ @Test
+ public void testNth() throws Exception {
+ final DataSet dataSet = new DataSet();
+ final Way way = new Way();
+ final Node node0 = new Node(new LatLon(1, 1));
+ final Node node1 = new Node(new LatLon(2, 2));
+ final Node node2 = new Node(new LatLon(3, 3));
+ dataSet.addPrimitive(way);
+ dataSet.addPrimitive(node0);
+ dataSet.addPrimitive(node1);
+ dataSet.addPrimitive(node2);
+ way.addNode(node0);
+ way.addNode(node1);
+ way.addNode(node2);
+ Assert.assertFalse(SearchCompiler.compile("nth:2", false, false).match(node1));
+ Assert.assertTrue(SearchCompiler.compile("nth:1", false, false).match(node1));
+ Assert.assertFalse(SearchCompiler.compile("nth:0", false, false).match(node1));
+ Assert.assertTrue(SearchCompiler.compile("nth:0", false, false).match(node0));
+ Assert.assertTrue(SearchCompiler.compile("nth:2", false, false).match(node2));
+ Assert.assertTrue(SearchCompiler.compile("nth:-1", false, false).match(node2));
+ Assert.assertTrue(SearchCompiler.compile("nth:-2", false, false).match(node1));
+ Assert.assertTrue(SearchCompiler.compile("nth:-3", false, false).match(node0));
+ }
+
+ @Test
+ public void testNthParseNegative() throws Exception {
+ Assert.assertThat(SearchCompiler.compile("nth:-1", false, false).toString(), CoreMatchers.is("Nth{nth=-1, modulo=false}"));
+
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java b/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java
index 682b94a..8f8fd5a 100644
--- a/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java
+++ b/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java
@@ -37,6 +37,8 @@ public class ReverseWayTagCorrectorTest {
assertSwitch(new Tag(k, "down"), new Tag(k, "up"));
assertSwitch(new Tag(k, "something"), new Tag(k, "something"));
}
+ // :left/:right with oneway (see #10977)
+ assertSwitch(new Tag("cycleway:left:oneway", "-1"), new Tag("cycleway:right:oneway", "yes"));
// :forward/:backward (see #8518)
assertSwitch(new Tag("turn:forward", "right"), new Tag("turn:backward", "right"));
assertSwitch(new Tag("change:forward", "not_right"), new Tag("change:backward", "not_right"));
diff --git a/test/unit/org/openstreetmap/josm/data/osm/OsmUtilsTest.java b/test/unit/org/openstreetmap/josm/data/osm/OsmUtilsTest.java
new file mode 100644
index 0000000..a8e0a9b
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/OsmUtilsTest.java
@@ -0,0 +1,40 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.*;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+
+public class OsmUtilsTest {
+
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ @Test
+ public void testCreatePrimitive() throws Exception {
+ final OsmPrimitive p = OsmUtils.createPrimitive("way name=Foo railway=rail");
+ assertTrue(p instanceof Way);
+ assertThat(p.keySet().size(), is(2));
+ assertThat(p.get("name"), is("Foo"));
+ assertThat(p.get("railway"), is("rail"));
+ }
+
+ @Test
+ public void testArea() throws Exception {
+ final OsmPrimitive p = OsmUtils.createPrimitive("area name=Foo railway=rail");
+ assertThat(p.getType(), is(OsmPrimitiveType.WAY));
+ assertTrue(p.getKeys().equals(OsmUtils.createPrimitive("way name=Foo railway=rail").getKeys()));
+
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testCreatePrimitiveFail() throws Exception {
+ OsmUtils.createPrimitive("noway name=Foo");
+ }
+
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/SimplePrimitiveIdTest.groovy b/test/unit/org/openstreetmap/josm/data/osm/SimplePrimitiveIdTest.groovy
index e1a7edc..75205e4 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/SimplePrimitiveIdTest.groovy
+++ b/test/unit/org/openstreetmap/josm/data/osm/SimplePrimitiveIdTest.groovy
@@ -27,4 +27,10 @@ class SimplePrimitiveIdTest extends GroovyTestCase {
assert SimplePrimitiveId.fuzzyParse("foo relation/123 bar").toString() == "[relation 123]"
assert SimplePrimitiveId.fuzzyParse("foo relation/123 and way/345 but also node/789").toString() == "[relation 123, way 345, node 789]"
}
+
+ void testFromCopyAction() {
+ assert SimplePrimitiveId.fromString("node 123") == new SimplePrimitiveId(123, OsmPrimitiveType.NODE)
+ assert SimplePrimitiveId.fromString("way 123") == new SimplePrimitiveId(123, OsmPrimitiveType.WAY)
+ assert SimplePrimitiveId.fromString("relation 123") == new SimplePrimitiveId(123, OsmPrimitiveType.RELATION)
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
index bda56c9..1bf3f35 100644
--- a/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
@@ -7,6 +7,8 @@ import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import java.io.StringReader;
+import java.util.Collection;
+import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -16,10 +18,17 @@ import org.junit.Test;
import org.openstreetmap.josm.JOSMFixture;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.command.ChangePropertyKeyCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.PseudoCommand;
+import org.openstreetmap.josm.command.SequenceCommand;
import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
import org.openstreetmap.josm.data.validation.Severity;
+import org.openstreetmap.josm.data.validation.TestError;
import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.TagCheck;
+import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
/**
* JUnit Test of MapCSS TagChecker.
@@ -34,6 +43,12 @@ public class MapCSSTagCheckerTest {
JOSMFixture.createUnitTestFixture().init();
}
+ static MapCSSTagChecker buildTagChecker(String css) throws ParseException {
+ final MapCSSTagChecker test = new MapCSSTagChecker();
+ test.checks.putAll("test", TagCheck.readMapCSS(new StringReader(css)));
+ return test;
+ }
+
@Test
public void testNaturalMarsh() throws Exception {
@@ -48,9 +63,9 @@ public class MapCSSTagCheckerTest {
final MapCSSTagChecker.TagCheck check = checks.get(0);
assertThat(check, notNullValue());
assertThat(check.getDescription(null), is("{0.key}=null is deprecated"));
- assertThat(check.change.get(0).apply(null), is(new Tag("{0.key}")));
- assertThat(check.change.get(1).apply(null), is(new Tag("natural", "wetland")));
- assertThat(check.change.get(2).apply(null), is(new Tag("wetland", "marsh")));
+ assertThat(check.fixCommands.get(0).toString(), is("fixRemove: {0.key}"));
+ assertThat(check.fixCommands.get(1).toString(), is("fixAdd: natural=wetland"));
+ assertThat(check.fixCommands.get(2).toString(), is("fixAdd: wetland=marsh"));
final Node n1 = new Node();
n1.put("natural", "marsh");
assertTrue(check.evaluate(n1));
@@ -62,11 +77,46 @@ public class MapCSSTagCheckerTest {
final Node n2 = new Node();
n2.put("natural", "wood");
assertFalse(check.evaluate(n2));
- assertThat(MapCSSTagChecker.TagCheck.insertArguments(check.rule.selectors.get(0), "The key is {0.key} and the value is {0.value}"),
+ assertThat(MapCSSTagChecker.TagCheck.insertArguments(check.rule.selectors.get(0), "The key is {0.key} and the value is {0.value}", null),
is("The key is natural and the value is marsh"));
}
@Test
+ public void test10913() throws Exception {
+ final OsmPrimitive p = OsmUtils.createPrimitive("way highway=tertiary construction=yes");
+ final TagCheck check = TagCheck.readMapCSS(new StringReader("way {" +
+ "throwError: \"error\";" +
+ "fixChangeKey: \"highway => construction\";\n" +
+ "fixAdd: \"highway=construction\";\n" +
+ "}")).get(0);
+ final Command command = check.fixPrimitive(p);
+ assertThat(command instanceof SequenceCommand, is(true));
+ final Iterator<PseudoCommand> it = command.getChildren().iterator();
+ assertThat(it.next() instanceof ChangePropertyKeyCommand, is(true));
+ assertThat(it.next() instanceof ChangePropertyCommand, is(true));
+ }
+
+ @Test
+ public void test9782() throws Exception {
+ final MapCSSTagChecker test = buildTagChecker("*[/.+_name/][!name] {" +
+ "throwWarning: tr(\"has {0} but not {1}\", \"{0.key}\", \"{1.key}\");}");
+ final OsmPrimitive p = OsmUtils.createPrimitive("way alt_name=Foo");
+ final Collection<TestError> errors = test.getErrorsForPrimitive(p, false);
+ assertThat(errors.size(), is(1));
+ assertThat(errors.iterator().next().getMessage(), is("has alt_name but not name"));
+ }
+
+ @Test
+ public void test10859() throws Exception {
+ final MapCSSTagChecker test = buildTagChecker("way[highway=footway][foot?!] {\n" +
+ " throwWarning: tr(\"{0} used with {1}\", \"{0.value}\", \"{1.tag}\");}");
+ final OsmPrimitive p = OsmUtils.createPrimitive("way highway=footway foot=no");
+ final Collection<TestError> errors = test.getErrorsForPrimitive(p, false);
+ assertThat(errors.size(), is(1));
+ assertThat(errors.iterator().next().getMessage(), is("footway used with foot=no"));
+ }
+
+ @Test
public void testInit() throws Exception {
MapCSSTagChecker c = new MapCSSTagChecker();
c.initialize();
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java
new file mode 100644
index 0000000..27dd13d
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java
@@ -0,0 +1,61 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.tests;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.validation.TestError;
+
+public class NameMismatchTest {
+
+ @Before
+ public void setUp() throws Exception {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ List<TestError> test(String primitive) {
+ final NameMismatch test = new NameMismatch();
+ test.check(OsmUtils.createPrimitive(primitive));
+ return test.getErrors();
+ }
+
+ @Test
+ public void test0() throws Exception {
+ final List<TestError> errors = test("node name:de=Europa");
+ assertThat(errors.size(), is(1));
+ assertThat(errors.get(0).getMessage(), is("A name is missing, even though name:* exists."));
+ }
+
+ @Test
+ public void test1() throws Exception {
+ final List<TestError> errors = test("node name=Europe name:de=Europa");
+ assertThat(errors.size(), is(1));
+ assertThat(errors.get(0).getMessage(), is("Missing name:*=Europe. Add tag with correct language key."));
+ }
+
+ @Test
+ public void test2() throws Exception {
+ final List<TestError> errors = test("node name=Europe name:de=Europa name:en=Europe");
+ assertThat(errors.size(), is(0));
+ }
+
+ @Test
+ public void test3() throws Exception {
+ List<TestError> errors;
+ errors = test("node \"name\"=\"Italia - Italien - Italy\"");
+ assertThat(errors.size(), is(0));
+ errors = test("node name=\"Italia - Italien - Italy\" name:it=Italia");
+ assertThat(errors.size(), is(2));
+ errors = test("node name=\"Italia - Italien - Italy\" name:it=Italia name:de=Italien");
+ assertThat(errors.size(), is(1));
+ assertThat(errors.get(0).getMessage(), is("Missing name:*=Italy. Add tag with correct language key."));
+ errors = test("node name=\"Italia - Italien - Italy\" name:it=Italia name:de=Italien name:en=Italy");
+ assertThat(errors.size(), is(0));
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy b/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy
index d907c9f..a6a0179 100644
--- a/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy
+++ b/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy
@@ -76,7 +76,7 @@ class KeyConditionTest {
Node n = node(1)
r.addMember(new RelationMember("my_role", n))
- Environment e = new Environment().withPrimitive(n).withParent(r).withIndex(0).withLinkContext()
+ Environment e = new Environment().withPrimitive(n).withParent(r).withIndex(0, r.membersCount).withLinkContext()
Condition cond = Condition.createKeyCondition("my_role", false, null, Context.LINK)
assert cond.applies(e)
@@ -91,7 +91,7 @@ class KeyConditionTest {
Node n = node(1)
r.addMember(new RelationMember("my_role", n))
- Environment e = new Environment().withPrimitive(n).withParent(r).withIndex(0).withLinkContext()
+ Environment e = new Environment().withPrimitive(n).withParent(r).withIndex(0, r.membersCount).withLinkContext()
Condition cond = Condition.createKeyCondition("another_role", false, null, Context.LINK)
assert !cond.applies(e)
diff --git a/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy b/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy
index 7b66d2f..a6acbab 100644
--- a/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy
+++ b/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy
@@ -62,7 +62,7 @@ class KeyValueConditionTest {
Node n = node(1)
r.addMember(new RelationMember("my_role", n))
- Environment e = new Environment().withPrimitive(n).withParent(r).withLinkContext().withIndex(0)
+ Environment e = new Environment().withPrimitive(n).withParent(r).withLinkContext().withIndex(0, r.membersCount)
Condition cond = new Condition.RoleCondition("my_role", Op.EQ)
assert cond.applies(e)
@@ -77,7 +77,7 @@ class KeyValueConditionTest {
Node n = node(1)
r.addMember(new RelationMember("my_role", n))
- Environment e = new Environment().withPrimitive(n).withParent(r).withIndex(0).withLinkContext()
+ Environment e = new Environment().withPrimitive(n).withParent(r).withIndex(0, r.membersCount).withLinkContext()
Condition cond = Condition.createKeyValueCondition("role", "my_role", Op.NEQ, Context.LINK, false)
assert !cond.applies(e)
diff --git a/test/unit/org/openstreetmap/josm/gui/util/RotationAngleTest.java b/test/unit/org/openstreetmap/josm/gui/util/RotationAngleTest.java
new file mode 100644
index 0000000..a3dc509
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/util/RotationAngleTest.java
@@ -0,0 +1,26 @@
+package org.openstreetmap.josm.gui.util;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+public class RotationAngleTest {
+
+ @Test
+ public void testParseCardinal() throws Exception {
+ assertThat(RotationAngle.buildStaticRotation("south").getRotationAngle(null), is(Math.PI));
+ assertThat(RotationAngle.buildStaticRotation("s").getRotationAngle(null), is(Math.PI));
+ assertThat(RotationAngle.buildStaticRotation("northwest").getRotationAngle(null), is(Math.toRadians(315)));
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testParseFail() throws Exception {
+ RotationAngle.buildStaticRotation("bad");
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void testParseNull() throws Exception {
+ RotationAngle.buildStaticRotation(null);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java
new file mode 100644
index 0000000..aaede90
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java
@@ -0,0 +1,19 @@
+package org.openstreetmap.josm.io.remotecontrol.handler;
+
+import org.hamcrest.CoreMatchers;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class ImportHandlerTest {
+
+ @Test
+ public void test7434() throws Exception {
+
+ final ImportHandler req = new ImportHandler();
+ req.setUrl("http://localhost:8111/import?url=http://localhost:8888/relations?relations=19711&mode=recursive");
+ assertThat(req.args.get("url"), CoreMatchers.is("http://localhost:8888/relations?relations=19711&mode=recursive"));
+
+ }
+
+}
diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java
new file mode 100644
index 0000000..e74dded
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java
@@ -0,0 +1,85 @@
+package org.openstreetmap.josm.io.remotecontrol.handler;
+
+import org.junit.Test;
+import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.*;
+
+public class RequestHandlerTest {
+
+ Map<String, String> getRequestParameter(String url) {
+ final RequestHandler req = new RequestHandler() {
+ @Override
+ protected void validateRequest() throws RequestHandlerBadRequestException {
+ }
+
+ @Override
+ protected void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException {
+ }
+
+ @Override
+ public String getPermissionMessage() {
+ return null;
+ }
+
+ @Override
+ public PermissionPrefWithDefault getPermissionPref() {
+ return null;
+ }
+
+ @Override
+ public String[] getMandatoryParams() {
+ return new String[0];
+ }
+ };
+ req.setUrl(url);
+ return req.args;
+ }
+
+
+ @Test
+ public void testRequestParameter1() {
+ final Map<String, String> expected = new HashMap<>();
+ expected.put("query", "a");
+ expected.put("b", "=c");
+ assertThat(getRequestParameter("http://example.com/?query=a&b==c"),
+ is(expected));
+ }
+
+ @Test
+ public void testRequestParameter12() {
+ assertThat(getRequestParameter("http://example.com/?query=a%26b==c"),
+ is(Collections.singletonMap("query", "a&b==c")));
+ }
+
+ @Test
+ public void testRequestParameter3() {
+ assertThat(getRequestParameter("http://example.com/blue+light%20blue?blue%2Blight+blue").keySet(),
+ is((Collections.singleton("blue+light blue"))));
+ }
+
+ /**
+ * @see <a href="http://blog.lunatech.com/2009/02/03/what-every-web-developer-must-know-about-url-encoding">
+ * What every web developer must know about URL encoding</a>
+ */
+ @Test
+ public void testRequestParameter4() {
+ assertThat(getRequestParameter("http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$'()*+,;=/?:@-._~!$'()*+,;==#/?:@-._~!$&'()*+,;="),
+ is(Collections.singletonMap("/?:@-._~!$'()* ,;", "/?:@-._~!$'()* ,;==")));
+ }
+
+ @Test
+ public void testRequestParameter5() {
+ final Map<String, String> expected = new HashMap<>();
+ expected.put("space", " ");
+ expected.put("tab", "\t");
+ assertThat(getRequestParameter("http://example.com/?space=%20&tab=%09"),
+ is(expected));
+ }
+
+}
--
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