[josm] 01/08: Imported Upstream version 0.0.svn9060+dfsg
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Nov 24 09:26:14 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 7e12814805fbb04b1844c4f8e8f3294588eaefac
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Nov 24 09:15:05 2015 +0100
Imported Upstream version 0.0.svn9060+dfsg
---
REVISION | 6 +-
build.xml | 2 +-
data/defaultpresets.xml | 478 +++++-
data/validator/combinations.mapcss | 6 +-
data/validator/deprecated.mapcss | 22 +-
data/validator/geometry.mapcss | 1 +
data/validator/ignoretags.cfg | 274 +---
data/validator/numeric.mapcss | 7 +
i18n/launchpad.pl | 4 +-
i18n/po/af.po | 482 ++++--
i18n/po/am.po | 482 ++++--
i18n/po/ar.po | 488 ++++--
i18n/po/ast.po | 502 +++++--
i18n/po/az.po | 482 ++++--
i18n/po/be.po | 510 +++++--
i18n/po/bg.po | 500 +++++--
i18n/po/bn.po | 484 ++++--
i18n/po/br.po | 484 ++++--
i18n/po/bs.po | 484 ++++--
i18n/po/ca.po | 560 +++++--
i18n/po/ca at valencia.po | 502 +++++--
i18n/po/cs.po | 1555 ++++++++++++--------
i18n/po/cy.po | 484 ++++--
i18n/po/da.po | 1320 ++++++++++-------
i18n/po/de.po | 629 ++++++--
i18n/po/de_DE.po | 484 ++++--
i18n/po/el.po | 500 +++++--
i18n/po/en_AU.po | 500 +++++--
i18n/po/en_CA.po | 482 ++++--
i18n/po/en_GB.po | 1296 ++++++++++------
i18n/po/eo.po | 484 ++++--
i18n/po/es.po | 510 +++++--
i18n/po/et.po | 490 ++++--
i18n/po/eu.po | 496 +++++--
i18n/po/fa.po | 482 ++++--
i18n/po/fi.po | 501 +++++--
i18n/po/fil.po | 482 ++++--
i18n/po/fo.po | 482 ++++--
i18n/po/fr.po | 538 +++++--
i18n/po/ga.po | 482 ++++--
i18n/po/gl.po | 496 +++++--
i18n/po/he.po | 488 ++++--
i18n/po/hi.po | 484 ++++--
i18n/po/hr.po | 484 ++++--
i18n/po/ht.po | 482 ++++--
i18n/po/hu.po | 549 +++++--
i18n/po/hy.po | 482 ++++--
i18n/po/ia.po | 482 ++++--
i18n/po/id.po | 502 +++++--
i18n/po/is.po | 492 +++++--
i18n/po/it.po | 504 +++++--
i18n/po/ja.po | 544 +++++--
i18n/po/ka.po | 484 ++++--
i18n/po/km.po | 498 +++++--
i18n/po/ko.po | 486 ++++--
i18n/po/ky.po | 482 ++++--
i18n/po/lo.po | 484 ++++--
i18n/po/lt.po | 679 ++++++---
i18n/po/lv.po | 484 ++++--
i18n/po/mk.po | 484 ++++--
i18n/po/mr.po | 484 ++++--
i18n/po/ms.po | 484 ++++--
i18n/po/nb.po | 490 ++++--
i18n/po/nds.po | 482 ++++--
i18n/po/nl.po | 782 +++++++---
i18n/po/nn.po | 484 ++++--
i18n/po/oc.po | 486 ++++--
i18n/po/pa.po | 482 ++++--
i18n/po/pl.po | 605 ++++++--
i18n/po/pt.po | 654 ++++++--
i18n/po/pt_BR.po | 539 +++++--
i18n/po/rm.po | 482 ++++--
i18n/po/ro.po | 486 ++++--
i18n/po/ru.po | 566 +++++--
i18n/po/sk.po | 656 ++++++---
i18n/po/sl.po | 498 +++++--
i18n/po/sq.po | 484 ++++--
i18n/po/sr.po | 484 ++++--
i18n/po/sv.po | 839 +++++++----
i18n/po/ta.po | 484 ++++--
i18n/po/te.po | 482 ++++--
i18n/po/th.po | 482 ++++--
i18n/po/tr.po | 500 +++++--
i18n/po/ug.po | 482 ++++--
i18n/po/uk.po | 648 ++++++--
i18n/po/ur.po | 482 ++++--
i18n/po/vi.po | 504 +++++--
i18n/po/zh_CN.po | 496 +++++--
i18n/po/zh_TW.po | 497 +++++--
i18n/specialmessages.java | 1 +
linux/latest/usr/bin/josm-latest | 64 +-
linux/tested/usr/bin/josm | 64 +-
.../disk/block/BlockDiskCacheFactory.java | 3 +-
.../disk/indexed/IndexedDiskCacheFactory.java | 3 +-
.../jcs/auxiliary/disk/jdbc/JDBCDiskCache.java | 164 +--
.../disk/jdbc/JDBCDiskCacheAttributes.java | 49 +-
.../auxiliary/disk/jdbc/JDBCDiskCacheFactory.java | 160 +-
.../disk/jdbc/JDBCDiskCachePoolAccess.java | 271 ----
.../jdbc/JDBCDiskCachePoolAccessAttributes.java | 179 ---
.../disk/jdbc/JDBCDiskCachePoolAccessManager.java | 211 ---
.../disk/jdbc/dsfactory/DataSourceFactory.java | 85 ++
.../disk/jdbc/dsfactory/JndiDataSourceFactory.java | 185 +++
.../dsfactory/SharedPoolDataSourceFactory.java | 150 ++
.../auxiliary/disk/jdbc/mysql/MySQLDiskCache.java | 13 +-
.../disk/jdbc/mysql/MySQLDiskCacheFactory.java | 27 +-
.../disk/jdbc/mysql/MySQLTableOptimizer.java | 31 +-
.../engine/control/CompositeCacheConfigurator.java | 24 +-
.../engine/logging/behavior/ICacheEventLogger.java | 1 +
.../commons/jcs/engine/stats/StatElement.java | 2 +-
src/org/openstreetmap/josm/Main.java | 4 +-
.../openstreetmap/josm/actions/AboutAction.java | 43 +-
.../josm/actions/DialogsToggleAction.java | 6 +-
.../josm/actions/DuplicateAction.java | 9 +-
.../josm/actions/ImageryAdjustAction.java | 2 +-
.../josm/actions/PasteTagsAction.java | 5 +-
.../openstreetmap/josm/actions/PurgeAction.java | 27 +-
.../openstreetmap/josm/actions/SplitWayAction.java | 45 +-
.../josm/actions/UnselectAllAction.java | 5 +-
.../openstreetmap/josm/actions/UploadAction.java | 2 +-
.../josm/actions/mapmode/DrawAction.java | 1 +
.../josm/actions/mapmode/ExtrudeAction.java | 1 +
.../josm/actions/mapmode/MapMode.java | 1 +
.../josm/actions/mapmode/SelectAction.java | 48 +-
.../actions/relation/DownloadMembersAction.java | 6 +-
.../DownloadSelectedIncompleteMembersAction.java | 3 +-
.../josm/actions/search/SearchAction.java | 36 +-
.../josm/actions/search/SearchCompiler.java | 115 +-
.../josm/command/ChangePropertyCommand.java | 4 +-
src/org/openstreetmap/josm/data/Version.java | 82 +-
.../josm/data/cache/HostLimitQueue.java | 4 +-
.../josm/data/cache/JCSCacheManager.java | 6 +-
.../josm/data/cache/JCSCachedTileLoaderJob.java | 2 +
.../josm/data/conflict/ConflictCollection.java | 1 +
.../josm/data/imagery/ImageryInfo.java | 2 +-
.../josm/data/imagery/TMSCachedTileLoader.java | 23 +-
.../openstreetmap/josm/data/notes/NoteComment.java | 7 +-
.../josm/data/osm/ChangesetCache.java | 2 +-
.../josm/data/osm/DefaultChangesetCacheEvent.java | 2 +-
src/org/openstreetmap/josm/data/osm/Node.java | 2 +-
.../josm/data/osm/PrimitiveDeepCopy.java | 2 +-
src/org/openstreetmap/josm/data/osm/Storage.java | 1 +
.../openstreetmap/josm/data/osm/WaySegment.java | 16 +
.../osm/event/AbstractDatasetChangedEvent.java | 12 +-
.../josm/data/osm/event/DatasetEventManager.java | 6 +-
.../josm/data/osm/history/HistoryDataSet.java | 2 +-
.../josm/data/osm/history/HistoryRelation.java | 2 +-
.../josm/data/osm/visitor/Visitor.java | 3 +
.../data/osm/visitor/paint/StyledMapRenderer.java | 120 +-
.../osm/visitor/paint/relations/Multipolygon.java | 8 +-
.../josm/data/validation/tests/TagChecker.java | 120 +-
src/org/openstreetmap/josm/gui/ExtendedDialog.java | 2 +-
.../josm/gui/HelpAwareOptionPane.java | 4 +-
.../josm/gui/JosmUserIdentityManager.java | 2 +-
src/org/openstreetmap/josm/gui/MainMenu.java | 4 +
src/org/openstreetmap/josm/gui/MapFrame.java | 1 +
src/org/openstreetmap/josm/gui/MapStatus.java | 12 +-
.../openstreetmap/josm/gui/SelectionManager.java | 1 +
.../josm/gui/bbox/TileSelectionBBoxChooser.java | 6 +-
.../relation/RelationMemberListColumnModel.java | 2 +-
.../tags/CombinePrimitiveResolverDialog.java | 24 +-
.../gui/conflict/tags/MultiValueCellEditor.java | 1 +
.../tags/TagConflictResolverColumnModel.java | 2 +-
.../josm/gui/dialogs/ChangesetDialog.java | 6 +-
.../josm/gui/dialogs/CommandStackDialog.java | 5 +-
.../josm/gui/dialogs/ConflictDialog.java | 2 +-
.../DeleteFromRelationConfirmationDialog.java | 26 +-
.../josm/gui/dialogs/DialogsPanel.java | 1 +
.../josm/gui/dialogs/FilterDialog.java | 3 +-
.../josm/gui/dialogs/LayerListDialog.java | 4 +-
.../josm/gui/dialogs/NotesDialog.java | 3 +-
.../josm/gui/dialogs/RelationListDialog.java | 39 +-
.../josm/gui/dialogs/UserListDialog.java | 2 +-
.../dialogs/changeset/ChangesetCacheManager.java | 8 +-
.../changeset/ChangesetCacheManagerModel.java | 2 +-
.../changeset/ChangesetContentDownloadTask.java | 2 +-
.../dialogs/changeset/ChangesetContentPanel.java | 6 +-
.../changeset/ChangesetContentTableModel.java | 2 +-
.../dialogs/changeset/ChangesetDetailPanel.java | 6 +-
.../dialogs/changeset/ChangesetDownloadTask.java | 2 +-
.../changeset/ChangesetHeaderDownloadTask.java | 2 +-
.../changeset/ChangesetInSelectionListModel.java | 3 +-
.../gui/dialogs/changeset/ChangesetTagsPanel.java | 2 +-
.../changeset/SingleChangesetDownloadPanel.java | 2 +-
.../changeset/query/ChangesetQueryTask.java | 2 +-
.../gui/dialogs/properties/PropertiesDialog.java | 57 +-
.../dialogs/properties/SearchBasedRowFilter.java | 88 ++
.../gui/dialogs/relation/ChildRelationBrowser.java | 2 +-
.../dialogs/relation/GenericRelationEditor.java | 6 +-
.../josm/gui/dialogs/relation/MemberTable.java | 37 +-
.../gui/dialogs/relation/MemberTableModel.java | 9 +-
.../relation/ParentRelationLoadingTask.java | 2 +-
.../dialogs/relation/RelationDialogManager.java | 3 +-
.../josm/gui/dialogs/relation/RelationEditor.java | 1 +
.../gui/dialogs/relation/SelectionTableModel.java | 2 +-
.../gui/dialogs/relation/sort/RelationNodeMap.java | 2 +-
.../gui/dialogs/relation/sort/RelationSorter.java | 4 +-
.../relation/sort/WayConnectionTypeCalculator.java | 1 +
.../josm/gui/download/BookmarkSelection.java | 2 +-
.../josm/gui/download/BoundingBoxSelection.java | 2 +-
.../josm/gui/download/DownloadDialog.java | 3 +-
.../josm/gui/history/CoordinateInfoViewer.java | 2 +-
.../josm/gui/history/HistoryBrowserDialog.java | 2 +-
.../josm/gui/history/TwoColumnDiff.java | 2 +-
.../josm/gui/history/VersionInfoPanel.java | 2 +-
.../josm/gui/history/VersionTable.java | 2 +-
.../josm/gui/io/ChangesetManagementPanel.java | 4 +-
.../josm/gui/io/CredentialDialog.java | 2 +-
.../josm/gui/io/DownloadFileTask.java | 2 +-
.../josm/gui/io/UploadParameterSummaryPanel.java | 2 +-
.../josm/gui/layer/AbstractTileSourceLayer.java | 6 +-
.../gui/layer/gpx/ConvertToDataLayerAction.java | 4 +-
.../josm/gui/mappaint/AreaElemStyle.java | 16 +-
.../gui/mappaint/LabelCompositionStrategy.java | 17 +-
.../openstreetmap/josm/gui/mappaint/StyleKeys.java | 1 +
.../gui/mappaint/mapcss/ExpressionFactory.java | 1 +
.../josm/gui/mappaint/mapcss/Selector.java | 2 +-
.../gui/oauth/FullyAutomaticAuthorizationUI.java | 2 +-
.../josm/gui/oauth/ManualAuthorizationUI.java | 2 +-
.../josm/gui/oauth/OsmPrivilegesPanel.java | 2 +-
.../gui/oauth/SemiAutomaticAuthorizationUI.java | 2 +-
.../josm/gui/preferences/PreferenceTabbedPane.java | 9 +-
.../josm/gui/preferences/ToolbarPreferences.java | 17 +-
.../gui/preferences/map/MapPaintPreference.java | 9 +-
.../projection/CustomProjectionChoice.java | 3 +-
.../server/AuthenticationPreferencesPanel.java | 2 +-
.../josm/gui/progress/AbstractProgressMonitor.java | 7 +-
.../josm/gui/tagging/TagCellEditor.java | 2 +-
.../josm/gui/tagging/TagEditorModel.java | 2 +
.../openstreetmap/josm/gui/tagging/TagTable.java | 7 +-
.../josm/gui/tagging/presets/TaggingPresets.java | 6 +
.../tagging/presets/items/ComboMultiSelect.java | 2 +
.../widgets/AbstractTextComponentValidator.java | 2 +-
.../gui/widgets/BoundingBoxSelectionPanel.java | 2 +-
.../gui/widgets/CompileSearchTextDecorator.java | 74 +
.../josm/gui/widgets/QuadStateCheckBox.java | 1 +
.../widgets/SelectAllOnFocusGainedDecorator.java | 2 +-
.../josm/io/BoundingBoxDownloader.java | 2 +-
src/org/openstreetmap/josm/io/CachedFile.java | 1 +
src/org/openstreetmap/josm/io/GpxReader.java | 14 +-
.../josm/io/MultiFetchServerObjectReader.java | 2 +-
src/org/openstreetmap/josm/io/NoteReader.java | 5 +-
.../josm/io/auth/CredentialsAgentResponse.java | 7 +
.../josm/io/session/ImagerySessionExporter.java | 5 +
.../josm/plugins/PluginDownloadTask.java | 2 +-
.../openstreetmap/josm/plugins/PluginHandler.java | 3 +-
src/org/openstreetmap/josm/tools/Diff.java | 8 +
.../openstreetmap/josm/tools/GeoPropertyIndex.java | 1 +
src/org/openstreetmap/josm/tools/Geometry.java | 25 +-
src/org/openstreetmap/josm/tools/I18n.java | 14 +-
.../openstreetmap/josm/tools/ImageProvider.java | 4 +-
src/org/openstreetmap/josm/tools/Shortcut.java | 3 +
src/org/openstreetmap/josm/tools/Utils.java | 49 +
.../openstreetmap/josm/tools/date/DateUtils.java | 1 +
styles/standard/elemstyles.mapcss | 181 ++-
test/data/regress/12038/data.osm | 655 +++++++++
.../pair/properties/PropertiesMergerTest.java | 2 +-
.../josm/actions/PurgeActionTest.java | 61 +
.../josm/data/cache/JCSCacheManagerTest.java | 25 +
.../josm/data/imagery/ImageryInfoTest.java | 35 +
.../org/openstreetmap/josm/data/osm/NodeTest.java | 44 +
.../josm/data/osm/WaySegmentTest.java | 48 +
.../josm/data/validation/tests/TagCheckerTest.java | 19 +
262 files changed, 37388 insertions(+), 11488 deletions(-)
diff --git a/REVISION b/REVISION
index ba85c09..89e0219 100644
--- a/REVISION
+++ b/REVISION
@@ -2,7 +2,7 @@
<info>
<entry
path="trunk"
- revision="8969"
+ revision="9060"
kind="dir">
<url>https://josm.openstreetmap.de/svn/trunk</url>
<relative-url>^/trunk</relative-url>
@@ -11,9 +11,9 @@
<uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
</repository>
<commit
- revision="8969">
+ revision="9060">
<author>Don-vip</author>
-<date>2015-10-29T21:15:23.556649Z</date>
+<date>2015-11-23T23:04:12.027055Z</date>
</commit>
</entry>
</info>
diff --git a/build.xml b/build.xml
index c10a2b5..e42ffe9 100644
--- a/build.xml
+++ b/build.xml
@@ -603,7 +603,7 @@ Build-Date: ${build.tstamp}
<target name="checkstyle">
<taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
- classpath="tools/checkstyle/checkstyle-6.11.2-all.jar"/>
+ classpath="tools/checkstyle/checkstyle-6.12.1-all.jar"/>
<checkstyle config="tools/checkstyle/josm_checks.xml">
<fileset dir="${basedir}/src/org/openstreetmap/josm" includes="**/*.java"
excludes="gui/mappaint/mapcss/parsergen/*.java"/>
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index b243c24..80c5a44 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -33,9 +33,16 @@
<combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
</chunk>
<chunk id="highway_base">
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3"/>
- <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3"/>
- <text key="maxspeed" text="Max. speed (km/h)"/>
+ <space />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+ <combo key="lanes:forward" text="Lanes in way direction" values="1,2,3,4,5" length="3" />
+ <combo key="lanes:backward" text="Lanes opposed to way direction" values="1,2,3,4,5" length="3" />
+ <space />
+ <text key="maxspeed" text="Max. speed (km/h)" />
+ <text key="maxspeed:forward" text="Max. speed in way direction" />
+ <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
+ <space />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<reference ref="surface_smoothness" />
</chunk>
<chunk id="highway_yesno_incline">
@@ -62,7 +69,7 @@
<combo key="sidewalk" text="Sidewalk" values="both,left,right,no" values_context="sidewalk" />
</chunk>
<chunk id="railway_service">
- <combo key="service" text="Service type" values="yard,siding,spur" />
+ <combo key="service" text="Service type" values="yard,siding,spur,crossover" />
</chunk>
<chunk id="railway_electrified">
<combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
@@ -153,7 +160,7 @@
</chunk>
<chunk id="internet_smoking">
<reference ref="internet" />
- <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+ <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,outside,no" />
</chunk>
<chunk id="optional_height">
<optional>
@@ -307,7 +314,11 @@
<optional>
<text key="name" text="Name" />
<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="1" length="3" />
+ <space />
<text key="maxspeed" text="Max. speed (km/h)" />
+ <text key="maxspeed:forward" text="Max. speed in way direction" />
+ <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
+ <space />
<text key="maxweight" text="Max. weight (tonnes)" />
<combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<text key="width" text="Width (meters)" />
@@ -317,6 +328,7 @@
<chunk id="waterway">
<reference ref="name_layer" />
<check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
+ <check key="tidal" text="In the tidal range" disable_off="true" />
<combo key="tunnel" text="Tunnel" values="culvert,yes" />
<text key="width" text="Width (meters)" />
</chunk>
@@ -332,6 +344,22 @@
<combo key="canoe" text="Canoe" values="yes,designated,destination,delivery,permissive,private,no" />
</optional>
</chunk>
+ <chunk id="operator_substance">
+ <text key="operator" text="Operator" />
+ <combo key="substance" text="Substance" values="water,gas,heat,oil,sewage" />
+ </chunk>
+ <chunk id="support">
+ <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" values_context="mounting/support" />
+ </chunk>
+ <chunk id="aerodrome">
+ <key key="aeroway" value="aerodrome" match="keyvalue" />
+ <text key="name" text="Name" />
+ <optional>
+ <text key="iata" text="IATA" />
+ <text key="icao" text="ICAO" />
+ <text key="wikipedia" text="Wikipedia" />
+ </optional>
+ </chunk>
<!-- Link chunks -->
<chunk id="link_contact_address">
<preset_link preset_name="Contact (Common Schema)" />
@@ -367,6 +395,7 @@
<text key="name" text="Name" />
<reference ref="highway_base" />
<text key="width" text="Width (meters)" />
+ <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
<checkgroup columns="4">
<check key="oneway" text="Oneway" default="on" />
<check key="bridge" text="Bridge" disable_off="true" />
@@ -393,6 +422,7 @@
<optional>
<reference ref="highway_base" />
<text key="width" text="Width (meters)" />
+ <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
<checkgroup columns="4">
<check key="oneway" text="Oneway" default="on" />
<check key="bridge" text="Bridge" disable_off="true" />
@@ -426,6 +456,7 @@
<text key="name" text="Name" />
<reference ref="highway_base" />
<text key="width" text="Width (meters)" />
+ <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
<checkgroup columns="4">
<check key="oneway" text="Oneway" default="on" />
<check key="motorroad" text="Motorroad" default="on" />
@@ -448,6 +479,7 @@
<optional>
<reference ref="highway_base" />
<text key="width" text="Width (meters)" />
+ <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
<checkgroup columns="4">
<check key="oneway" text="Oneway" default="on" />
<check key="motorroad" text="Motorroad" default="on" />
@@ -483,6 +515,7 @@
<reference ref="highway_base" />
<check key="motorroad" text="Motorroad" />
<reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+ <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
</optional>
<preset_link preset_name="Road Restrictions" />
</item> <!-- Primary -->
@@ -499,6 +532,7 @@
<reference ref="highway_base" />
<check key="motorroad" text="Motorroad" />
<reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+ <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
</optional>
<preset_link preset_name="Road Restrictions" />
</item> <!-- Primary Link -->
@@ -523,6 +557,7 @@
<text key="name" text="Name" />
<reference ref="highway_base" />
<reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+ <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
</optional>
<preset_link preset_name="Road Restrictions" />
</item> <!-- Secondary -->
@@ -538,6 +573,7 @@
<optional>
<reference ref="highway_base" />
<reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+ <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
</optional>
<preset_link preset_name="Road Restrictions" />
</item> <!-- Secondary Link -->
@@ -563,6 +599,7 @@
<text key="name" text="Name" />
<reference ref="highway_base" />
<reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+ <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
</optional>
<preset_link preset_name="Road Restrictions" />
</item> <!-- Tertiary -->
@@ -600,6 +637,7 @@
<text key="ref" text="Reference" />
<reference ref="highway_base" />
<reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+ <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
<check key="passing_places" text="Passing Places" />
</optional>
<preset_link preset_name="Road Restrictions" />
@@ -641,8 +679,8 @@
<combo key="vehicle" text="Vehicle access" values="yes,no,destination" default="no" />
<text key="maxspeed" text="Max. speed (km/h)" default="30" />
<optional>
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
<reference ref="surface_smoothness" />
<check key="oneway" text="Oneway" />
<check key="oneway:bicycle" text="Oneway for bicycle" />
@@ -666,8 +704,8 @@
<key key="highway" value="living_street" />
<text key="name" text="Name" />
<optional>
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<reference ref="surface_smoothness" />
<reference ref="highway_yesno_incline_oneway_lit_width" />
</optional>
@@ -689,7 +727,6 @@
<text key="name" text="Name" />
<optional>
<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
- <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
<reference ref="surface_smoothness" />
<check key="area" text="Area" />
<reference ref="highway_yesno_incline" />
@@ -712,7 +749,7 @@
vi.href="http://wiki.openstreetmap.org/wiki/Vi:Tag:highway=service" />
<space />
<key key="highway" value="service" />
- <combo key="service" text="Service way type" values="alley,driveway,parking_aisle,drive-through" />
+ <combo key="service" text="Service way type" values="alley,driveway,parking_aisle,drive-through,emergency_access" />
<optional>
<text key="name" text="Name" />
<reference ref="highway_base" />
@@ -767,6 +804,7 @@
</item> <!-- Raceway -->
<item name="Road (Unknown Type)" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=road"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=road"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=road"
@@ -842,7 +880,10 @@
<combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" match="key" />
<combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,private,no" match="key" />
<combo key="tourist_bus" text="Tourist buses" values="yes,no" match="key" />
+ <space />
<text key="maxspeed" text="Max. speed (km/h)" />
+ <text key="maxspeed:forward" text="Max. speed in way direction" />
+ <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
<text key="minspeed" text="Min. speed (km/h)" match="key" />
<text key="maxweight" text="Max. weight (tonnes)" match="key" />
<text key="maxaxleload" text="Max. axleload (tonnes)" match="key" />
@@ -1048,6 +1089,7 @@
</item> <!-- Combined Foot- and Cycleway -->
<item name="Dedicated Footway" icon="presets/footway.png" type="way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=footway"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=footway"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=footway"
@@ -1269,8 +1311,8 @@
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=turning_loop" />
<key key="highway" value="turning_loop" />
</item> <!-- Turning Loop -->
- <item name="City Limit" icon="presets/citylimit.png" type="node" preset_name_label="true">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign=city_limit"
+ <item name="City Limit Sign" icon="presets/citylimit.png" type="node" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_sign"
de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_sign"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:traffic_sign"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:traffic_sign"
@@ -1282,6 +1324,18 @@
<text key="name" text="Name" />
<text key="alt_name" text="Second Name" />
</item> <!-- City Limit -->
+ <item name="Speed Limit Sign" icon="styles/standard/vehicle/restriction/speed.png" type="node" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_sign"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_sign"
+ fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:traffic_sign"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:traffic_sign"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:traffic_sign"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_sign"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:traffic_sign" />
+ <space />
+ <key key="traffic_sign" value="maxspeed" />
+ <text key="maxspeed" text="Max. speed (km/h)" />
+ </item> <!-- Speed Limit -->
<item name="Speed Camera" icon="presets/speed_camera.png" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=speed_camera"
az.href="http://wiki.openstreetmap.org/wiki/Az:Tag:highway=speed_camera"
@@ -1492,6 +1546,7 @@
zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:barrier=wall" />
<key key="barrier" value="wall" />
<reference ref="optional_height" />
+ <combo key="wall" text="Type" values="dry_stone,noise_barrier" />
</item> <!-- Wall -->
<item name="City Wall" icon="presets/city_wall.png" type="way,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall"
@@ -1670,7 +1725,11 @@
<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" />
<text key="width" text="Width (meters)" />
<text key="maxheight" text="Max. height (meters)" />
+ <space />
<text key="maxspeed" text="Max. speed (km/h)" />
+ <text key="maxspeed:forward" text="Max. speed in way direction" />
+ <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
+ <space />
<combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="toll" text="Toll" />
</optional>
@@ -1756,6 +1815,7 @@
<group name="Water" name_context="sub group" icon="presets/waterway.png">
<item name="Drain" icon="presets/waterway.png" type="way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=drain"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=drain"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=drain"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=drain"
@@ -1770,6 +1830,7 @@
</item> <!-- Drain -->
<item name="Ditch" icon="presets/waterway.png" type="way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=ditch"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=ditch"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=ditch"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=ditch"
@@ -1783,6 +1844,7 @@
</item> <!-- Ditch -->
<item name="Stream" icon="presets/waterway.png" type="way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=stream"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=stream"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=stream"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=stream"
@@ -1801,6 +1863,7 @@
</item> <!-- Stream -->
<item name="River" icon="presets/river.png" type="way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=river"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=river"
@@ -1818,6 +1881,7 @@
</item> <!-- River -->
<item name="Canal" icon="presets/waterway.png" type="way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=canal"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=canal"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=canal"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=canal"
@@ -1837,6 +1901,7 @@
<separator/>
<item name="Spring" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=spring"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=spring"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=spring"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:natural=spring"
@@ -1851,6 +1916,7 @@
</item> <!-- Spring -->
<item name="Waterfall" icon="presets/waterfall.png" type="node,way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=waterfall"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=waterfall"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=waterfall"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=waterfall" />
<space />
@@ -1859,6 +1925,7 @@
</item> <!-- Waterfall -->
<item name="Weir" icon="presets/weir.png" type="node,way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=weir"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=weir"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=weir"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=weir"
@@ -1871,6 +1938,7 @@
</item> <!-- Weir -->
<item name="Dam" icon="presets/dam.png" type="node,way,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=dam"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=dam"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=dam"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=dam"
@@ -1904,6 +1972,7 @@
<separator/>
<item name="Culvert" icon="presets/tunnel.png" type="way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tunnel=culvert"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tunnel=culvert"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tunnel=culvert"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tunnel=culvert"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tunnel=culvert"
@@ -1970,11 +2039,13 @@
<combo key="water" text="Water Body" values="canal,lake,lagoon,oxbow,pond,reservoir,river" match="key" values_searchable="true" />
<check key="salt" text="Salt Water" disable_off="true" />
<check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
+ <check key="tidal" text="In the tidal range" disable_off="true" />
<text key="wikipedia" text="Wikipedia" />
<reference ref="water_access" />
</item> <!-- Water -->
<item name="Coastline" icon="presets/coastline.png" type="way,closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=coastline"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=coastline"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=coastline"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=coastline"
@@ -1988,6 +2059,7 @@
</item> <!-- Coastline -->
<item name="Riverbank" icon="presets/waterway.png" type="closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=riverbank"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:waterway=riverbank"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=riverbank"
@@ -2001,10 +2073,12 @@
<key key="waterway" value="riverbank" />
<text key="name" text="Name" />
<check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
+ <check key="tidal" text="In the tidal range" disable_off="true" />
</item> <!-- Riverbank -->
<separator/>
<item name="Wetland" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=wetland"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wetland"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=wetland"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=wetland"
@@ -2022,6 +2096,7 @@
</item> <!-- Wetland -->
<item name="Mud" icon="presets/mud.png" type="closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=mud"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=mud"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=mud"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=mud"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=mud" />
@@ -2032,6 +2107,7 @@
</item> <!-- Mud -->
<item name="Beach" icon="presets/beach.png" type="closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=beach"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=beach"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=beach"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=beach"
@@ -2051,6 +2127,7 @@
</item> <!-- Beach -->
<item name="Bay" icon="presets/bay.png" type="node,closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=bay"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=bay"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=bay"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=bay"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=bay"
@@ -2063,6 +2140,7 @@
</item> <!-- Bay -->
<item name="Cliff" icon="presets/cliff.png" type="node,way,closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=cliff"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=cliff"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=cliff"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=cliff"
@@ -2155,9 +2233,12 @@
<space />
<key key="man_made" value="pier" />
<text key="name" text="Name" />
+ <combo key="mooring" text="Mooring" values="yes,no,private,commercial" />
+ <check key="floating" text="Floating" />
</item> <!-- Pier -->
<item name="Lock Gate" icon="presets/lock_gate.png" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=lock_gate"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=lock_gate"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=lock_gate"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=lock_gate"
@@ -2168,6 +2249,7 @@
</item> <!-- Lock Gate -->
<item name="Turning Point" icon="presets/turning.png" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=turning_point"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=turning_point" />
<key key="waterway" value="turning_point" />
</item> <!-- Turning Point -->
@@ -2186,6 +2268,7 @@
</item> <!-- Slipway -->
<item name="Boatyard" icon="presets/boatyard.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=boatyard"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=boatyard"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=boatyard"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:waterway=boatyard"
@@ -2197,6 +2280,7 @@
</item> <!-- Boatyard -->
<item name="Dock" icon="presets/boatyard.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=dock"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=dock"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=dock"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=dock"
@@ -2331,6 +2415,7 @@
<item name="Level Crossing" icon="presets/level_crossing.png" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing"
bg.href="http://wiki.openstreetmap.org/wiki/Bg:Tag:railway=level_crossing"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:railway=level_crossing"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=level_crossing"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:railway=level_crossing"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:railway=level_crossing"
@@ -2457,7 +2542,8 @@
</item> <!-- Mixed Lift -->
<item name="Drag Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift"
- de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aerialway=drag_lift" />
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aerialway=drag_lift"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aerialway=drag_lift" />
<space />
<combo key="aerialway" text="Type" values="drag_lift,t-bar,j-bar,platter,rope_tow" display_values="drag_lift (general type - use only if exact type (see values below) is unknown),t-bar,j-bar,platter,rope_tow" match="keyvalue" />
<reference ref="name_ref" />
@@ -3146,13 +3232,7 @@
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=aerodrome"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=aerodrome" />
<space />
- <key key="aeroway" value="aerodrome" />
- <text key="name" text="Name" />
- <optional>
- <text key="iata" text="IATA" />
- <text key="icao" text="ICAO" />
- <text key="wikipedia" text="Wikipedia" />
- </optional>
+ <reference ref="aerodrome" />
</item> <!-- Airport Ground -->
<separator/>
<item name="Runway" icon="presets/runway.png" type="way,closedway" preset_name_label="true">
@@ -3255,6 +3335,7 @@
<group name="Accommodation" icon="presets/bed.png">
<item name="Hotel" icon="styles/standard/accommodation/hotel.svg" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=hotel"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=hotel"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=hotel"
@@ -3276,6 +3357,7 @@
</item> <!-- Hotel -->
<item name="Motel" icon="styles/standard/accommodation/motel.svg" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=motel"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=motel"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=motel"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=motel"
@@ -3296,6 +3378,7 @@
</item> <!-- Motel -->
<item name="Guest House/Bed & Breakfast" icon="styles/standard/accommodation/guest_house.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=guest_house"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=guest_house"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=guest_house"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=guest_house"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=guest_house"
@@ -3315,6 +3398,7 @@
</item> <!-- Guest House/Bed & Breakfast -->
<item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=chalet"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=chalet"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=chalet"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:tourism=chalet"
@@ -3335,6 +3419,7 @@
</item> <!-- Chalet -->
<item name="Hostel" icon="styles/standard/accommodation/hostel.svg" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=hostel"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=hostel"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=hostel"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=hostel"
@@ -3355,6 +3440,7 @@
</item> <!-- Hostel -->
<item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut_blue.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=alpine_hut"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=alpine_hut"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=alpine_hut"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=alpine_hut"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=alpine_hut"
@@ -3373,6 +3459,7 @@
</item> <!-- Alpine Hut -->
<item name="Wilderness Hut" icon="styles/standard/accommodation/wilderness_hut_blue.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=wilderness_hut"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=wilderness_hut"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=wilderness_hut"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=wilderness_hut" />
<space />
@@ -3393,6 +3480,7 @@
<separator/>
<item name="Caravan Site/RV Park" icon="styles/standard/accommodation/camping/caravan.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=caravan_site"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=caravan_site"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=caravan_site"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=caravan_site"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=caravan_site"
@@ -3415,6 +3503,7 @@
</item> <!-- Caravan Site/RV Park -->
<item name="Camping Site" icon="styles/standard/accommodation/camping.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=camp_site"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=camp_site"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=camp_site"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=camp_site"
@@ -3451,6 +3540,7 @@
<multiselect key="cuisine" text="Cuisine" values="italian;chinese;pizza;burger;greek;german;indian;regional;kebab;turkish;asian;thai;mexican;japanese;french;sandwich;sushi;steak_house" values_searchable="true" />
<check key="microbrewery" text="Microbrewery" />
<check key="outdoor_seating" text="Outdoor seating" />
+ <combo key="takeaway" text="Takeaway" values="yes,no,only" />
<reference ref="oh_wheelchair" />
<combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
<space />
@@ -3471,6 +3561,7 @@
<reference ref="name_operator" />
<combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese,french,sandwich,sushi,fish_and_chips,chicken" />
<check key="outdoor_seating" text="Outdoor seating" />
+ <combo key="takeaway" text="Takeaway" values="yes,no,only" />
<reference ref="oh_wheelchair" />
<space />
<reference ref="internet_smoking" />
@@ -3487,6 +3578,7 @@
<key key="amenity" value="food_court" />
<reference ref="name_operator" />
<check key="outdoor_seating" text="Outdoor seating" />
+ <combo key="takeaway" text="Takeaway" values="yes,no,only" />
<reference ref="oh_wheelchair" />
<space />
<reference ref="internet_smoking" />
@@ -3510,6 +3602,7 @@
<reference ref="name_operator" />
<combo key="cuisine" text="Cuisine" values="ice_cream" />
<check key="outdoor_seating" text="Outdoor seating" />
+ <combo key="takeaway" text="Takeaway" values="yes,no,only" />
<reference ref="oh_wheelchair" />
<space />
<reference ref="internet_smoking" />
@@ -3529,6 +3622,7 @@
<reference ref="name_operator" />
<check key="microbrewery" text="Microbrewery" />
<check key="outdoor_seating" text="Outdoor seating" />
+ <combo key="takeaway" text="Takeaway" values="yes,no,only" />
<reference ref="oh_wheelchair" />
<space />
<reference ref="internet_smoking" />
@@ -3576,6 +3670,7 @@
<group name="Tourism" icon="presets/sightseeing.png">
<item name="Attraction" icon="presets/sightseeing.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=attraction"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=attraction"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=attraction"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=attraction"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=attraction"
@@ -3586,6 +3681,7 @@
</item> <!-- Attraction -->
<item name="Viewpoint" icon="styles/standard/sightseeing/viewpoint.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=viewpoint"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=viewpoint"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=viewpoint"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=viewpoint"
@@ -3750,6 +3846,7 @@
</item> <!-- Movie Theater/Cinema -->
<item name="Zoo" icon="presets/zoo.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=zoo"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=zoo"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zoo"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=zoo"
@@ -3783,6 +3880,7 @@
</item> <!-- Dog Park -->
<item name="Amusement/Theme Park" icon="presets/theme_park.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=theme_park"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=theme_park"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=theme_park"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=theme_park"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=theme_park"
@@ -3847,6 +3945,7 @@
</item> <!-- Playground -->
<item name="Picnic Site" icon="styles/standard/leisure/picnic.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=picnic_site"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=picnic_site"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=picnic_site"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=picnic_site"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=picnic_site"
@@ -3975,6 +4074,7 @@
<group name="Culture" icon="presets/theater.png">
<item name="Museum" icon="styles/standard/sightseeing/museum.svg" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=museum"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=museum"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=museum"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=museum"
@@ -4654,6 +4754,7 @@
</item> <!-- Emergency Phone -->
<item name="Internet Access" icon="presets/network-wireless.svg" type="node,closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Key:internet_access"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:internet_access"
de.href="http://wiki.openstreetmap.org/wiki/DE:Key:internet_access"
it.href="http://wiki.openstreetmap.org/wiki/IT:Key:internet_access"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:internet_access"
@@ -4691,7 +4792,7 @@
<key key="amenity" value="clock" />
<optional>
<combo key="display" text="Display" values="analog,digital,sundial,unorthodox" />
- <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" values_context="mounting/support" />
+ <reference ref="support" />
<combo key="visibility" text="Visibility/readability" values="house,street,area" display_values="house (up to 5m),street (up to 20m),area (more than 20m)" />
<check key="date" text="Shows current date" />
<check key="thermometer" text="Shows temperature" />
@@ -5417,7 +5518,7 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
<space />
- <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,barn,farm_auxiliary,transportation,greenhouse,office,university,hospital,warehouse,retail,shed,storage_tank,supermarket,gasometer,cowshed,construction" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
+ <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,barn,stable,cabin,farm_auxiliary,transportation,greenhouse,office,university,hospital,warehouse,retail,shed,storage_tank,supermarket,gasometer,cowshed,construction" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
<text key="name" text="Name" />
<combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
<text key="height" text="Height (meters)" />
@@ -5460,6 +5561,7 @@
</item> <!-- Building part -->
<item name="Entrance" icon="styles/standard/misc/entrance-yes.png" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Key:entrance"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:entrance"
de.href="http://wiki.openstreetmap.org/wiki/DE:Key:entrance"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:entrance"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:entrance"
@@ -5573,18 +5675,6 @@
<reference ref="name_operator" />
</optional>
</item> <!-- Bunker Silo -->
- <item name="Pipeline" icon="presets/path.png" type="way" preset_name_label="true">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
- cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=pipeline"
- de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=pipeline"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=pipeline" />
- <space />
- <key key="man_made" value="pipeline" />
- <text key="operator" text="Operator" />
- <combo key="type" text="Type" values="water,gas,heat,oil,sewage" />
- <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" />
- </item> <!-- Pipeline -->
<item name="Crane" icon="presets/crane.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=crane"
@@ -5641,6 +5731,38 @@
<key key="man_made" value="embankment" />
</item> <!-- Embankment -->
<separator/>
+ <item name="Pipeline" icon="presets/path.png" type="way" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=pipeline"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=pipeline"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=pipeline" />
+ <space />
+ <key key="man_made" value="pipeline" />
+ <text key="name" text="Name" />
+ <text key="ref" text="Reference" />
+ <reference ref="operator_substance" />
+ <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" />
+ </item> <!-- Pipeline -->
+ <item name="Pipeline Marker" icon="styles/standard/misc/pipeline_marker.svg" type="node" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:pipeline=marker"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:pipeline=marker"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:pipeline=marker" />
+ <space />
+ <key key="pipeline" value="marker" />
+ <text key="ref" text="Reference" />
+ <reference ref="operator_substance" />
+ <reference ref="support" />
+ </item> <!-- Pipeline Marker -->
+ <item name="Pipeline Valve" icon="styles/standard/misc/valve.svg" type="node" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:pipeline=valve"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:pipeline=valve" />
+ <space />
+ <key key="pipeline" value="valve" />
+ <text key="ref" text="Reference" />
+ <reference ref="operator_substance" />
+ </item> <!-- Pipeline Valve -->
+ <separator/>
<item name="Water Tower" icon="styles/standard/misc/landmark/water_tower.svg" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_tower"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=water_tower"
@@ -5801,6 +5923,8 @@
<space />
<key key="man_made" value="survey_point" />
<text key="name" text="Name" />
+ <text key="ref" text="Reference" />
+ <text key="ele" text="Elevation" />
</item> <!-- Survey Point -->
<item name="Surveillance Camera" icon="presets/surveillance.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance"
@@ -5869,7 +5993,8 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=bridge"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=bridge"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=bridge"
- ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=bridge" />
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=bridge"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=bridge" />
<space />
<key key="man_made" value="bridge" />
<optional>
@@ -5877,10 +6002,49 @@
</optional>
</item> <!-- Bridge outline -->
</group> <!-- Bridges -->
+ <group name="Military" name_context="preset group" icon="presets/military.png">
+ <item name="Airfield" icon="styles/standard/transport/airport/airfield.png" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:military=airfield"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:military=airfield"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:military=airfield"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:military=airfield" />
+ <space />
+ <key key="military" value="airfield" match="keyvalue!" />
+ <reference ref="aerodrome" />
+ </item>
+ <item name="Barracks" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:military=barracks"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:military=barracks"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:military=barracks" />
+ <space />
+ <key key="military" value="barracks" />
+ </item>
+ <item name="Bunker" icon="styles/standard/misc/landmark/bunker.png" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:military=bunker"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:military=bunker"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:military=bunker"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:military=bunker"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:military=bunker"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:military=bunker" />
+ <space />
+ <key key="military" value="bunker" />
+ <combo key="bunker_type" text="Type" values="pillbox,munitions,hardened_aircraft_shelter" match="key" />
+ <text key="name" text="Name" />
+ <check key="historic" text="Historic" />
+ </item>
+ <item name="Range" icon="styles/standard/misc/landmark/range.png" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:military=range"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:military=range"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:military=range" />
+ <space />
+ <key key="military" value="range" />
+ </item>
+ </group> <!-- Military -->
<group name="Power" icon="presets/power.png">
<item name="Power Plant" icon="icons/power_station.png" type="closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:power=plant"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=plant"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=plant"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=plant"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=plant" />
<space />
@@ -6215,7 +6379,8 @@
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=pole"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:power=pole"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=pole"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=pole" />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=pole"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=pole" />
<space />
<key key="power" value="pole" />
<text key="height" text="Height (meters)" />
@@ -6381,7 +6546,8 @@
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=wayside_cross"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:historic=wayside_cross"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=wayside_cross"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=wayside_cross" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=wayside_cross"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:historic=wayside_cross" />
<space />
<key key="historic" value="wayside_cross" />
<text key="name" text="Name" />
@@ -6659,6 +6825,7 @@
<item name="Clothes" icon="styles/standard/shop/clothes.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=clothes"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=clothes"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=clothes"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=clothes"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=clothes"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=clothes"
@@ -6841,6 +7008,7 @@
<group name="Cash" icon="styles/standard/money/dollar.svg">
<item name="Bank" icon="styles/standard/money/bank.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=bank"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bank"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=bank"
hr.href="http://wiki.openstreetmap.org/wiki/Hr:Tag:amenity=bank"
@@ -6871,6 +7039,7 @@
</item> <!-- Money Exchange -->
<item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=atm"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=atm"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=atm"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=atm"
@@ -6924,6 +7093,7 @@
</item> <!-- Kitchen -->
<item name="Curtain" icon="presets/curtain.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=curtain"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=curtain"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=curtain"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=curtain" />
<space />
@@ -6965,6 +7135,7 @@
</item> <!-- Bed -->
<item name="Interior Decoration" icon="styles/standard/shop/interior_decoration.svg" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=interior_decoration"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=interior_decoration"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=interior_decoration"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=interior_decoration" />
<space />
@@ -6974,6 +7145,7 @@
</item> <!-- Interior Decoration -->
<item name="Antiques" icon="styles/standard/shop/antique.svg" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=antiques"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=antiques"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=antiques"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=antiques"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:shop=antiques" />
@@ -7373,6 +7545,7 @@
de.href="http://wiki.openstreetmap.org/wiki/DE:Key:payment"
es.href="http://wiki.openstreetmap.org/wiki/ES:Key:payment"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:payment"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:payment"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:payment" />
<space />
<combo key="payment:cash" text="Cash" values="yes,no" match="keyvalue" />
@@ -7426,6 +7599,222 @@
</checkgroup>
</item> <!-- Payment Methods -->
</group> <!-- Shops -->
+ <group name="Offices" icon="icons/office_blue.png">
+ <item name="Accountant" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=accountant"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=accountant"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=accountant"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:office=accountant"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:office=accountant" />
+ <space />
+ <key key="office" value="accountant" />
+ <reference ref="name_operator_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Administrative" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=administrative"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=administrative"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=administrative"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:office=administrative" />
+ <space />
+ <key key="office" value="administrative" />
+ <reference ref="name_operator_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Advertising agency" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=advertising_agency" />
+ <space />
+ <key key="office" value="advertising_agency" />
+ <reference ref="name_operator_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Architect" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=architect"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=architect"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:office=architect"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:office=architect" />
+ <space />
+ <key key="office" value="architect" />
+ <reference ref="name_operator_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Association" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=association" />
+ <space />
+ <key key="office" value="association" />
+ <reference ref="name_operator_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Private company" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=company"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=company"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:office=company"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:office=company" />
+ <space />
+ <key key="office" value="company" />
+ <reference ref="name_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Educational institution" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=educational_institution"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=educational_institution"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:office=educational_institution" />
+ <space />
+ <key key="office" value="educational_institution" />
+ <reference ref="name_operator_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Employment agency" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=employment_agency"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=employment_agency"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:office=employment_agency"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=employment_agency"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:office=employment_agency"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:office=employment_agency" />
+ <space />
+ <key key="office" value="employment_agency" />
+ <reference ref="name_brand_operator_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Estate agent" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=estate_agent"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=estate_agent"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:office=estate_agent"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=estate_agent"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:office=estate_agent"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:office=estate_agent" />
+ <space />
+ <key key="office" value="estate_agent" />
+ <reference ref="name_operator_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Foundation" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=foundation" />
+ <space />
+ <key key="office" value="foundation" />
+ <reference ref="name_brand_operator_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Government" icon="icons/office_pink.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=government"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=government"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:office=government"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:office=government" />
+ <space />
+ <key key="office" value="government" />
+ <reference ref="name_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Insurance" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=insurance"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=insurance"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=insurance"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:office=insurance"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:office=insurance" />
+ <space />
+ <key key="office" value="insurance" />
+ <reference ref="name_brand_operator_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="It specialist" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=it"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=it"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:office=it"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:office=it" />
+ <space />
+ <key key="office" value="it" />
+ <reference ref="name_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Lawyer" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=lawyer"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=lawyer"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:office=lawyer"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=lawyer"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:office=lawyer"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:office=lawyer" />
+ <space />
+ <key key="office" value="lawyer" />
+ <reference ref="name_operator_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Newspaper" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=newspaper"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=newspaper"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:office=newspaper"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:office=newspaper" />
+ <space />
+ <key key="office" value="newspaper" />
+ <reference ref="name_operator_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Non-governmental organisation (NGO)" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=ngo"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:office=ngo"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=ngo"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:office=ngo"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:office=ngo" />
+ <space />
+ <key key="office" value="ngo" />
+ <reference ref="name_brand_operator_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Notary" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=notary" />
+ <space />
+ <key key="office" value="notary" />
+ <reference ref="name_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Political party" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=political_party"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=political_party"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:office=political_party" />
+ <space />
+ <key key="office" value="political_party" />
+ <reference ref="name_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Religion" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=religion"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=religion"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:office=religion" />
+ <space />
+ <key key="office" value="religion" />
+ <reference ref="religious" />
+ <reference ref="oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Research" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=research"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:office=research"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=research"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:office=research"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:office=research" />
+ <space />
+ <key key="office" value="research" />
+ <reference ref="name_operator_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Tax advisor" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=tax_advisor"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=tax_advisor" />
+ <space />
+ <key key="office" value="tax_advisor" />
+ <reference ref="name_brand_operator_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ <item name="Telecommunication" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:office=telecommunication"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=telecommunication"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:office=telecommunication"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:office=telecommunication" />
+ <space />
+ <key key="office" value="telecommunication" />
+ <reference ref="name_brand_operator_oh_wheelchair" />
+ <reference ref="link_contact_address" />
+ </item>
+ </group> <!-- Offices -->
<group name="Geography" icon="presets/peak.svg">
<group name="Boundaries" icon="presets/boundaries.png">
<item name="Administrative" icon="presets/boundaries.png" type="way,closedway,relation" preset_name_label="true">
@@ -7439,7 +7828,7 @@
<space />
<key key="boundary" value="administrative" />
<text key="name" text="Name" />
- <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10" />
+ <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10,11" />
<check key="maritime" text="Maritime" disable_off="true" />
</item> <!-- Administrative -->
<item name="Political" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
@@ -7682,6 +8071,7 @@
</item> <!-- Peak -->
<item name="Saddle" icon="presets/saddle.svg" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=saddle"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=saddle"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=saddle"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=saddle"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=saddle"
@@ -7693,8 +8083,9 @@
<reference ref="name_wikipedia" />
<text key="ele" text="Elevation" />
</item> <!-- Saddle -->
- <item name="Glacier" icon="presets/glacier.png" type="node,closedway,relation" preset_name_label="true">
+ <item name="Glacier" icon="presets/glacier.png" type="closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=glacier"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=glacier"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=glacier"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=glacier"
@@ -7708,6 +8099,7 @@
</item> <!-- Glacier -->
<item name="Volcano" icon="presets/volcano.png" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=volcano"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=volcano"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=volcano"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=volcano"
@@ -7739,6 +8131,7 @@
</item> <!-- Ridge -->
<item name="Valley" icon="presets/valley.svg" type="way,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=valley"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=valley"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=valley"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=valley"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=valley" />
@@ -7875,6 +8268,7 @@
</item> <!-- Cutline -->
<item name="Grassland" icon="styles/standard/misc/landuse/meadow.svg" type="closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=grassland"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=grassland"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=grassland"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=grassland"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:natural=grassland"
@@ -7903,6 +8297,7 @@
<separator/>
<item name="Scree" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scree"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=scree"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scree"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=scree"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:natural=scree"
@@ -7917,6 +8312,7 @@
</item> <!-- Scree -->
<item name="Fell" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=fell"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=fell"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=fell"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=fell"
@@ -7928,6 +8324,7 @@
</item> <!-- Fell -->
<item name="Scrub" icon="presets/scrub.svg" type="closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scrub"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=scrub"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scrub"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=scrub"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=scrub"
@@ -7946,6 +8343,7 @@
<item name="Heath" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath"
bg.href="http://wiki.openstreetmap.org/wiki/Bg:Tag:natural=heath"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=heath"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=heath"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=heath"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=heath"
@@ -7959,6 +8357,7 @@
</item> <!-- Heath -->
<item name="Sand" icon="styles/standard/misc/sand.svg" type="closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=sand"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=sand"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=sand"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=sand"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=sand" />
@@ -8036,6 +8435,7 @@
<space />
<key key="landuse" value="farmland" />
<text key="name" text="Name" />
+ <combo key="crop" text="Crop" values="corn,grass,rice,wheat,hop" values_context="crop" />
</item> <!-- Farmland -->
<item name="Meadow" icon="styles/standard/misc/landuse/meadow.svg" type="closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=meadow"
@@ -8603,7 +9003,7 @@
<text key="name" text="Name" />
<combo key="boundary" text="Boundary type" values="administrative,maritime,national_park,political,postal_code,protected_area" values_searchable="true" />
<optional>
- <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10" />
+ <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10,11" />
</optional>
<roles>
<role key="outer" text="outer segment" requisite="required" type="way,closedway" />
diff --git a/data/validator/combinations.mapcss b/data/validator/combinations.mapcss
index de8ef0e..869f5ed 100644
--- a/data/validator/combinations.mapcss
+++ b/data/validator/combinations.mapcss
@@ -132,8 +132,7 @@ way[junction ][!highway][junction!=yes],
/* {0.key} without {1.key} or {2.tag} */
*[smoothness ][!highway][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/],
-*[segregated ][!highway][railway!=crossing],
-*[boat ][!waterway][natural!=water] {
+*[segregated ][!highway][railway!=crossing] {
throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.key}", "{2.tag}");
}
@@ -149,7 +148,8 @@ way[junction ][!highway][junction!=yes],
}
/* {0.key} without {1.key}, {2.tag} or {3.tag} */
-*[intermittent ][!waterway][natural!~/^(water|spring)$/][ford!=yes] {
+*[intermittent ][!waterway][natural!~/^(water|spring)$/][ford!=yes],
+*[boat ][!waterway][natural!=water][landuse!=basin] {
throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.key}", "{2.tag}", "{3.tag}");
}
diff --git a/data/validator/deprecated.mapcss b/data/validator/deprecated.mapcss
index 0b8176d..4127767 100644
--- a/data/validator/deprecated.mapcss
+++ b/data/validator/deprecated.mapcss
@@ -533,4 +533,24 @@ relation[/^..$/][!to] {
throwWarning: tr("{0} is deprecated", "{0.key}");
suggestAlternative: "addr:postcode";
suggestAlternative: "postal_code";
-}
\ No newline at end of file
+}
+
+*[water=intermittent] {
+ throwWarning: tr("{0} is deprecated", "{0.tag}");
+ suggestAlternative: "intermittent=yes";
+ fixRemove: "water";
+ fixAdd: "intermittent=yes";
+}
+
+*[type][man_made=pipeline],
+*[type][pipeline=marker] {
+ throwWarning: tr("{0} is deprecated", "{0.key}");
+ suggestAlternative: "substance";
+ fixChangeKey: "type => substance";
+}
+
+*[landuse=farm] {
+ throwWarning: tr("{0} is deprecated", "{0.tag}");
+ suggestAlternative: "landuse=farmland";
+ suggestAlternative: "landuse=farmyard";
+}
diff --git a/data/validator/geometry.mapcss b/data/validator/geometry.mapcss
index 1029dc2..318b51f 100644
--- a/data/validator/geometry.mapcss
+++ b/data/validator/geometry.mapcss
@@ -60,6 +60,7 @@ node[natural=beach],
node[natural=sand],
node[natural=wood],
node[natural=bare_rock],
+node[natural=glacier],
node[waterway=riverbank],
node[man_made=bridge],
node[man_made=breakwater],
diff --git a/data/validator/ignoretags.cfg b/data/validator/ignoretags.cfg
index 4b12612..429dc43 100644
--- a/data/validator/ignoretags.cfg
+++ b/data/validator/ignoretags.cfg
@@ -12,22 +12,36 @@ S:opengeodb
S:openGeoDB
S:name:
S:note:
+S:ref:
+S:CLC:
S:tiger:
S:gnis:
S:census:
+S:local_authority:
S:au.gov.abs:
S:qroti:
S:is_in
S:wikipedia
S:source:
S:source_ref:
+S:historic:
+S:proposed:
+S:planned:
+S:construction:
+S:disused:
+S:abandoned:
+S:removed:
+S:demolished:
+S:TMC:
+S:tmc:
+S:parking:lane
;
; Ignore valid and semi-valid keys that equal...
;
E:name
E:loc_name
E:attribution
-E:admin_level
+E:heritage
E:old_name
E:operator
E:usage
@@ -61,6 +75,28 @@ E:level
E:brand
E:network
E:incline
+E:wikidata
+E:zone:maxspeed
+E:osmc:symbol
+E:de:amtlicher_gemeindeschluessel
+E:de:regionalschluessel
+E:building:colour
+E:building:material
+E:roof:colour
+E:roof:material
+E:roof:height
+E:roof:orientation
+E:roof:shape
+E:turn:lanes
+E:turn:lanes:forward
+E:turn:lanes:backward
+E:area:highway
+E:tmc
+E:memorial:addr
+E:memorial:text
+E:memorial:ref
+E:wheelchair:description
+E:denotation
;
; Ignore valid and semi-valid keys that end with...
;
@@ -74,164 +110,66 @@ F::conditional
; Misc Tags
;
K:type=is_in
-K:bridge=viaduct
-K:bridge=aqueduct
K:bridge=swing
+K:residential=rural
+K:residential=urban
+K:surface=earth
+K:waterway=rapids
+K:bicycle=dismount
+K:wall=no
+K:man_made=petroleum_well
+K:railway=construction
+K:office=yes
+K:pilgrimage=yes
+K:bdouble=yes
+K:bdouble=no
+K:memorial:type=stolperstein
+K:toilets:wheelchair=yes
+K:toilets:wheelchair=no
;
; Highway Key/Value Pairs
;
-K:highway=motorway_link
-K:highway=trunk_link
-K:highway=primary_link
-K:highway=secondary_link
K:oneway=-1
-;
-; traffic_calming Tags
-;
-K:traffic_calming=yes
-K:traffic_calming=bump
-K:traffic_calming=chicane
-K:traffic_calming=cushion
-K:traffic_calming=hump
-K:traffic_calming=rumble_strip
-K:traffic_calming=table
-K:traffic_calming=choker
-;
-; Aeroway Key/Value Pairs
-;
-K:aeroway=apron
-K:aeroway=hanger
-K:aeroway=helipad
-K:aeroway=runway
-K:aeroway=taxiway
-K:aeroway=terminal
-K:aeroway=aerodrome
+K:highway=proposed
+K:living_street=yes
;
; Amenity Key/Value Pairs
;
-K:amenity=arts_centre
-K:amenity=atm
-K:amenity=baby_hatch
-K:amenity=bank
-K:amenity=bbq
-K:amenity=bench
-K:amenity=biergarten
-K:amenity=bicycle_parking
-K:amenity=bicycle_rental
-K:amenity=bureau_de_change
-K:amenity=bus_station
-K:amenity=brothel
-K:amenity=cafe
-K:amenity=car_rental
-K:amenity=car_sharing
-K:amenity=cinema
-K:amenity=college
-K:amenity=courthouse
K:amenity=crematorium
-K:amenity=dentist
-K:amenity=doctors
-K:amenity=drinking_water
-K:amenity=embassy
K:amenity=emergency_phone
-K:amenity=fast_food
-K:amenity=ferry_terminal
-K:amenity=fire_station
-K:amenity=food_court
-K:amenity=fountain
-K:amenity=fuel
K:amenity=gallery
-K:amenity=grave_yard
-K:amenity=grit_bin
K:amenity=gym
-K:amenity=hospital
-K:amenity=hunting_stand
-K:amenity=kindergarten
-K:amenity=library
-K:amenity=marketplace
-K:amenity=nightclub
-K:amenity=parking
-K:amenity=pharmacy
-K:amenity=place_of_worship
-K:amenity=police
-K:amenity=post_box
-K:amenity=post_office
-K:amenity=prison
-K:amenity=pub
-K:amenity=public_building
-K:amenity=recycling
-K:amenity=restaurant
-K:amenity=school
-K:amenity=shelter
K:amenity=signpost
-K:amenity=studio
-K:amenity=taxi
-K:amenity=telephone
-K:amenity=theatre
-K:amenity=toilets
-K:amenity=townhall
-K:amenity=university
-K:amenity=vending_machine
-K:amenity=veterinary
-K:amenity=waste_basket
-K:amenity=waste_disposal
+K:amenity=swimming_pool
;
; Cuisine Tags
;
K:cuisine=coffee_shop
-K:cuisine=fish_and_chips
K:cuisine=pie
;
-; Cycleway Tags
-;
-K:cycleway=lane
-K:cycleway=track
-K:cycleway=opposite_lane
-K:cycleway=opposite
-K:cycleway=opposite_track
-;
; Historic Tags
;
-K:historic=castle
-K:historic=monument
-K:historic=memorial
-K:historic=archaeological_site
-K:historic=ruins
-K:historic=battlefield
K:historic=wreck
-K:historic=yes
+;
+; Lifecycle Tags
+;
+;K:historic=yes
+K:proposed=yes
+K:planned=yes
+K:construction=yes
+;K:disused=yes
+K:abandoned=yes
+K:removed=yes
+K:demolished=yes
;
; Military Tags
;
-K:military=airfield
-K:military=bunker
-K:military=barracks
K:military=danger_area
-K:military=range
K:military=naval_base
;
; Natural Tags
;
-K:natural=bay
-K:natural=beach
-K:natural=cave_entrance
-K:natural=cliff
-K:natural=fell
-K:natural=glacier
-K:natural=heath
K:natural=marsh
-K:natural=mud
-K:natural=peak
-K:natural=scree
-K:natural=scrub
-K:natural=spring
-K:natural=tree
-K:natural=volcano
-K:natural=wetland
-;
-; Surface Key/Value Pairs
-;
-K:surface=dirt
-K:surface=wood
;
; Relation Tags
;
@@ -240,40 +178,21 @@ K:relation=from
;
; Christian Denominations
;
-K:denomination=anglican
K:denomination=apostolic
-K:denomination=baptist
-K:denomination=catholic
K:denomination=christian_community
K:denomination=christian_scientist
K:denomination=coptic_orthodox
K:denomination=czechoslovak_hussite
K:denomination=dutch_reformed
-K:denomination=evangelical
K:denomination=foursquare
-K:denomination=greek_orthodox
-K:denomination=jehovahs_witness
K:denomination=kabbalah
K:denomination=karaite
K:denomination=living_waters_church
-K:denomination=lutheran
K:denomination=maronite
K:denomination=mennonite
-K:denomination=methodist
-K:denomination=mormon
-K:denomination=new_apostolic
K:denomination=nondenominational
-K:denomination=old_catholic
-K:denomination=orthodox
-K:denomination=pentecostal
-K:denomination=presbyterian
-K:denomination=protestant
-K:denomination=quaker
-K:denomination=roman_catholic
-K:denomination=russian_orthodox
K:denomination=salvation_army
K:denomination=serbian_orthodox
-K:denomination=seventh_day_adventist
K:denomination=united
K:denomination=united_reformed
K:denomination=uniting
@@ -282,17 +201,14 @@ K:denomination=uniting
;
K:denomination=alternative
K:denomination=ashkenazi
-K:denomination=conservative
K:denomination=hasidic
K:denomination=humanistic
K:denomination=liberal
K:denomination=modern_orthodox
K:denomination=neo_orthodox
K:denomination=nondenominational
-K:denomination=orthodox
K:denomination=progressive
K:denomination=reconstructionist
-K:denomination=reform
K:denomination=renewal
K:denomination=samaritan
K:denomination=ultra_orthodox
@@ -301,11 +217,8 @@ K:denomination=ultra_orthodox
;
K:denomination=alaouite
K:denomination=druze
-K:denomination=ibadi
K:denomination=ismaili
K:denomination=nondenominational
-K:denomination=shia
-K:denomination=sunni
;
; Pastafarian Denominations
;
@@ -317,44 +230,7 @@ K:denomination=masonic
;
; Shop Key/Value Pairs
;
-K:shop=alcohol
-K:shop=bakery
-K:shop=beverages
-K:shop=bicycle
-K:shop=books
-K:shop=butcher
-K:shop=car
-K:shop=car_repair
-K:shop=chemist
-K:shop=clothes
-K:shop=computer
-K:shop=confectionery
-K:shop=convenience
-K:shop=department_store
-K:shop=dry_cleaning
-K:shop=doityourself
-K:shop=electronics
-K:shop=florist
-K:shop=furniture
-K:shop=garden_centre
-K:shop=greengrocer
-K:shop=hairdresser
-K:shop=hardware
-K:shop=hifi
-K:shop=kiosk
-K:shop=laundry
-K:shop=mall
-K:shop=motorcycle
-K:shop=optician
K:shop=organic
-K:shop=outdoor
-K:shop=sports
-K:shop=stationery
-K:shop=supermarket
-K:shop=shoes
-K:shop=toys
-K:shop=travel_agency
-K:shop=video
;
; Sports Tags
;
@@ -363,24 +239,10 @@ K:sport=netball
;
; Tourism Tags
;
-K:tourism=alpine_hut
-K:tourism=attraction
-K:tourism=artwork
-K:tourism=camp_site
-K:tourism=caravan_site
-K:tourism=chalet
-K:tourism=guest_house
-K:tourism=hostel
-K:tourism=hotel
-K:tourism=information
-K:tourism=motel
-K:tourism=museum
-K:tourism=picnic_site
-K:tourism=theme_park
-K:tourism=viewpoint
-K:tourism=zoo
K:tourism=yes
;
; Type Key/Value Pairs
;
K:type=collection
+K:type=tmc
+K:type=TMC
diff --git a/data/validator/numeric.mapcss b/data/validator/numeric.mapcss
index 306b23a..93c7c23 100644
--- a/data/validator/numeric.mapcss
+++ b/data/validator/numeric.mapcss
@@ -174,3 +174,10 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
assertMatch: "node amenity=cinema screen=led";
assertNoMatch: "node amenity=cinema screen=8";
}
+*[admin_level][admin_level !~ /^(1|2|3|4|5|6|7|8|9|10|11|12)$/] {
+ throwWarning: tr("unusual value of {0}", "{1.key}");
+ assertMatch: "node admin_level=0";
+ assertMatch: "node admin_level=-1";
+ assertMatch: "node admin_level=13";
+ assertNoMatch: "node admin_level=5";
+}
\ No newline at end of file
diff --git a/i18n/launchpad.pl b/i18n/launchpad.pl
index 63f417b..0848f73 100755
--- a/i18n/launchpad.pl
+++ b/i18n/launchpad.pl
@@ -17,11 +17,11 @@ $pwd = '';
my %lang = map {$_ => 1} (
"ast", "bg", "be", "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",
+"it", "ja", "km", "lt", "nb", "nl", "pl", "pt", "pt_BR", "ru", "sk",
"sv", "uk", "vi", "zh_CN", "zh_TW"
);
-my $revision = '$Revision: 31139 $';
+my $revision = '$Revision: 31724 $';
$revision =~ s/^.*?(\d+).*$/$1/;
my $agent = "JOSM_Launchpad/1.$revision";
diff --git a/i18n/po/af.po b/i18n/po/af.po
index a098520..f36bc16 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2011-10-13 02:39+0000\n"
"Last-Translator: Grant Slater <Unknown>\n"
"Language-Team: Afrikaans <af at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:31+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:30+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: af\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,10 +3171,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/am.po b/i18n/po/am.po
index 9e799b7..c963832 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2010-03-30 12:09+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Amharic <am at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:32+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:31+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: am\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,10 +3171,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/ar.po b/i18n/po/ar.po
index 51eb4b9..fff54ac 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-10-08 23:09+0000\n"
"Last-Translator: mourad101ee <mourad101ee 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-10-30 04:32+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:32+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: ar\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -170,6 +170,12 @@ msgstr "إضافات"
msgid "About JOSM..."
msgstr "حول JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2149,13 +2155,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2169,6 +2171,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2363,6 +2374,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2381,9 +2395,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3179,12 +3190,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "مجهول"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4792,6 +4803,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "اللائحة: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4964,7 +4982,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5770,20 +5788,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7015,14 +7028,17 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr "<مختلف>"
+
msgid "Member Of"
msgstr "عضو من"
msgid "Position"
msgstr ""
-msgid "<different>"
-msgstr "<مختلف>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -11989,6 +12005,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12151,6 +12170,9 @@ msgstr "جاري تحميل النقاط {0} إلى {1}..."
msgid "Contacting OSM Server..."
msgstr "جاري الإتصال بالخادم أو.أس.أم"
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13989,6 +14011,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14595,6 +14621,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14622,7 +14651,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15198,6 +15230,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15343,6 +15378,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15381,6 +15421,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15814,9 +15859,21 @@ msgstr "طين"
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15884,6 +15941,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15978,6 +16038,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16518,6 +16581,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16539,12 +16605,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "الماء"
+
+msgid "gas"
+msgstr "غاز"
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16646,6 +16788,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17185,12 +17330,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
-msgstr "حدود المدينة"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "الإسم الثاني"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "كاميرا مراقبة السير"
@@ -17308,6 +17456,12 @@ msgstr ""
msgid "Wall"
msgstr "حائط/جدار"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "حائط/جدار مدينة"
@@ -17712,6 +17866,15 @@ msgstr ""
msgid "Pier"
msgstr "رصيف ميناء"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18350,12 +18513,6 @@ msgstr "مطار"
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18539,6 +18696,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "وجبات سريعة"
@@ -19201,25 +19361,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19799,6 +19940,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19997,32 +20146,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "خط أنابيب"
-
-msgid "water"
-msgstr "الماء"
-
-msgid "gas"
-msgstr "غاز"
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr "ونش"
@@ -20107,6 +20230,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr "خط أنابيب"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "خزان / برج مياه"
@@ -20347,6 +20487,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21512,6 +21680,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21851,6 +22110,29 @@ msgstr "فناء مزرعة"
msgid "Farmland"
msgstr "أرض زراعية"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "مرج"
@@ -22834,6 +23116,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22889,6 +23174,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24863,7 +25154,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24906,9 +25200,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27493,6 +27787,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27502,6 +27799,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27541,6 +27841,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27654,7 +27957,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27891,9 +28194,6 @@ msgstr "دولة/ولاية"
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/ast.po b/i18n/po/ast.po
index 5bff796..1b43118 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-08-19 16:42+0000\n"
"Last-Translator: Simon Legner <Unknown>\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-10-30 04:33+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:33+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: ast\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -172,6 +172,12 @@ msgstr "Complementos"
msgid "About JOSM..."
msgstr "Tocante a JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Fallu al cargar el recursu \"{0}\", l`erru ye: {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2310,14 +2316,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Seleicionar, mover, escalar y xirar los oxetos"
-msgid "Move elements"
-msgstr "Mover elementos"
-
-msgid "Move them"
-msgstr "Movelos"
-
-msgid "Undo move"
-msgstr "Desfacer movimientu"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2336,6 +2338,15 @@ msgstr[1] ""
"xeneral un erru.\n"
"¿Realmente deseya movelos?"
+msgid "Move elements"
+msgstr "Mover elementos"
+
+msgid "Move them"
+msgstr "Movelos"
+
+msgid "Undo move"
+msgstr "Desfacer movimientu"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Soltar el botón del mure pa escoyer los oxetos nel rectángulu."
@@ -2542,6 +2553,9 @@ msgstr ""
msgid "add toolbar button"
msgstr "añedir botón a la barra de ferramientes"
+msgid "Invalid search expression"
+msgstr "Espresión de gueta non válida"
+
msgid "Filter"
msgstr "Peñera"
@@ -2563,9 +2577,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Espresión de gueta non válida"
-
msgid "basic examples"
msgstr "exemplos básicos"
@@ -3451,12 +3462,12 @@ msgstr "Anglosajón"
msgid "Nautical Mile"
msgstr "Milla náutica"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Fallu al cargar el recursu \"{0}\", l`erru ye: {1}."
-
msgid "UNKNOWN"
msgstr "DESCONOCÍU"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
"Númberu de versión JOSM inesperáu nel arquivu de revisión, el valor ye "
@@ -5175,6 +5186,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "Menú: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "Editar barra de ferramientes"
@@ -5355,14 +5373,10 @@ msgstr "fasta la tesela"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Alternativamente puede introducir una <strong>dirección de "
-"tesela</strong> pa una única tesela nel formatu <i>zoomlevel/x/y</i>, esto "
-"ye, <i>15/256/223</i>. Les direcciones de teselas nel formatu "
-"<i>zoom,x,y</i> o <i>zoom;x;y</i> son válides tamién.<html>"
msgid "Tile address:"
msgstr "Direición de la tesela:"
@@ -6258,26 +6272,15 @@ msgstr "Resolver conflictos"
msgid "Resolve conflicts for ''{0}''"
msgstr "Resolver los conflictos de ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Confirme''l borráu de <strong>1 oxetu</strong> de <strong>1 "
-"relación</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Confirme´l borráu de <strong>1 oxetu</strong> de <strong>{0} "
-"relaciones</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Confirme´l borráu de <strong>{0} oxetos</strong> de <strong>{1} "
-"relaciones</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7601,14 +7604,17 @@ msgstr "Etiquetes/Miembros"
msgid "Tags for selected objects."
msgstr "Etiquetes pa los oxetos escoyíos."
+msgid "<different>"
+msgstr "<diferente>"
+
msgid "Member Of"
msgstr "Miembru de"
msgid "Position"
msgstr "Allugamientu"
-msgid "<different>"
-msgstr "<diferente>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Oxetos: {2} / Etiquetes: {0} / Pertenencies: {1}"
@@ -13183,6 +13189,9 @@ msgstr ""
"Etiquetáu predetermináu rotu ''{0}-{1}'' - el númberu d''oxetos en "
"''display_values'' tien de coincidir con ''values''"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13373,6 +13382,9 @@ msgstr "Baxando puntos {0} a {1}..."
msgid "Contacting OSM Server..."
msgstr "Contautando col Sirvidor d''OSM..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Fallu al abrir canal de llectura pal recursu ''{0}''"
@@ -15557,6 +15569,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "monte baxu (marrotales, carba o maleza)"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "associatedStreet (Cai Acomuñada)"
@@ -16168,6 +16184,9 @@ msgstr "Drone Imagery (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Imagery 2014 (Haiti)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16195,7 +16214,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -16771,6 +16793,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -16943,6 +16968,11 @@ msgstr ""
"Dexa al usuariu que la marca de tiempu sía anónima y borrar les partes más "
"grandes del GPX que suelen corresponder a traces bien rápides."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
"Amuesa''l perfil d''elevación y dellos datos estadísticos d''una traza GPX"
@@ -16992,6 +17022,11 @@ msgstr "Dexa peñerar traces GPS innecesaries"
msgid "Visualizes routing information as a routing graph."
msgstr "Visualiza la información de enrutamiento como un grafu de rede."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "Cenciella ferramienta pa etiquetar númberos de cases."
@@ -17508,9 +17543,21 @@ msgstr "barru"
msgid "Lanes"
msgstr "Carriles"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Velocidá max. (km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Ponte"
@@ -17578,6 +17625,9 @@ msgstr "vía muerta"
msgid "spur"
msgstr "ramal"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Electrificáu"
@@ -17672,6 +17722,9 @@ msgstr "separáu"
msgid "isolated"
msgstr "aislláu"
+msgid "outside"
+msgstr "afora"
+
msgid "Height (meters)"
msgstr "Altor (en metros)"
@@ -18212,6 +18265,9 @@ msgstr "Peaxe"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "¿Ye la masa d''agua intermitente (sumi estacionalmente)?"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -18233,12 +18289,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "agua"
+
+msgid "gas"
+msgstr "gas"
+
+msgid "heat"
+msgstr "vapor o agua caliente"
+
+msgid "oil"
+msgstr "petróleu"
+
+msgid "sewage"
+msgstr "agües residuales"
+
+msgid "Support"
+msgstr "Soporte"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "poste"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "montáu na paré"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "cartelera"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "tierra"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Cais"
msgid "Motorway"
msgstr "Autopista"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Enllaz d''autopista"
@@ -18342,6 +18474,9 @@ msgstr ""
"carril de serviciu pa usuarios (comida rápida, banca, colexos, aeropuertu, "
"etc.)"
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Pasiellu d''aparcamientu"
@@ -18895,12 +19030,15 @@ msgstr "Círculu de xiru"
msgid "Turning Loop"
msgstr "Bucle de xiru"
-msgid "City Limit"
-msgstr "Llende de ciudá"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Nome alternativu"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Rádar de tráficu"
@@ -19018,6 +19156,12 @@ msgstr "Guardarraíl, bionda o quitamieos"
msgid "Wall"
msgstr "Muriu"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Muralla"
@@ -19432,6 +19576,15 @@ msgstr "CNG (Gas Natural Estruyíu)"
msgid "Pier"
msgstr "Embarcaeru"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Esclusa"
@@ -20072,12 +20225,6 @@ msgstr "Aeropuertu"
msgid "Airport Ground"
msgstr "Campu d''aviación"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Pista"
@@ -20261,6 +20408,9 @@ msgstr "Cervecería artesanal"
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Establecimientu de comida rápida"
@@ -20925,25 +21075,6 @@ msgstr "reló de sol"
msgid "unorthodox"
msgstr "pocu ortodoxu"
-msgid "Support"
-msgstr "Soporte"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "poste"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "montáu na paré"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "cartelera"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "tierra"
-
msgid "Visibility/readability"
msgstr "Visibilidá/lexibilidad"
@@ -21523,6 +21654,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -21721,32 +21860,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "Tubería"
-
-msgid "water"
-msgstr "agua"
-
-msgid "gas"
-msgstr "gas"
-
-msgid "heat"
-msgstr "vapor o agua caliente"
-
-msgid "oil"
-msgstr "petróleu"
-
-msgid "sewage"
-msgstr "agües residuales"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "submarín"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "en superficie"
-
msgid "Crane"
msgstr "Grúa"
@@ -21831,6 +21944,23 @@ msgstr "Entrada a galería"
msgid "Length in meters"
msgstr "Llargor en metros"
+msgid "Pipeline"
+msgstr "Tubería"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "submarín"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "en superficie"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Torre d''agua"
@@ -22071,6 +22201,34 @@ msgstr "muelle pivot"
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "Planta xeneradora d''enerxía"
@@ -23238,6 +23396,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Xeografía"
@@ -23593,6 +23842,29 @@ msgstr "Edificiu agrariu"
msgid "Farmland"
msgstr "Tierra de llabranza"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Prau"
@@ -24589,6 +24861,9 @@ msgstr "{0} ten de ser un valor numbéricu"
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr "relation ensin tipu"
@@ -24646,6 +24921,12 @@ msgstr "Amosar etiquetes de les víes (con zoom altu)"
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Arquivos CSV Columbus V-900"
@@ -26848,7 +27129,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -26891,9 +27175,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -29661,6 +29945,9 @@ msgstr "Imaxes ensin etiquetar"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "¿Deseya guardar la calibración de la capa actual {0}?"
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "Cargar calibración d''imaxes..."
@@ -29670,6 +29957,9 @@ msgstr "Carga datos de calibración d''un ficheru"
msgid "Loading file failed: {0}"
msgstr "Falló la carga´l ficheru: {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr "Cargar la Calibración del Arquivu Mundial..."
@@ -29713,6 +30003,9 @@ msgstr ""
"Por favor utilice {0} pa xubir los sos KML que fueren cubicaos "
"incorrectamente."
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "Mover Capa d''Imaxe(PicLayer)"
@@ -29829,8 +30122,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "¿Deseya aplicalo?"
-msgid "Load calibration file ?"
-msgstr "¿Cargar arquivu de calibración?"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr "Va aplicase automáticamente."
@@ -30071,9 +30364,6 @@ msgstr "Estáu/Provincia"
msgid "pending"
msgstr "pendiente"
-msgid "outside"
-msgstr "afora"
-
msgid "[incomplete]"
msgstr "[incompletu]"
diff --git a/i18n/po/az.po b/i18n/po/az.po
index 3063bde..dff904c 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2013-01-12 17:56+0000\n"
"Last-Translator: iAZISS <iss-sash at mail.ru>\n"
"Language-Team: Azerbaijani <az at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:33+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:33+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -168,6 +168,12 @@ msgstr "Qoşmalar"
msgid "About JOSM..."
msgstr ""
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2130,13 +2136,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2150,6 +2152,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2344,6 +2355,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2362,9 +2376,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3159,10 +3170,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4756,6 +4767,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4928,7 +4946,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5730,20 +5748,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6975,13 +6988,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11938,6 +11954,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12100,6 +12119,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13936,6 +13958,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14542,6 +14568,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14569,7 +14598,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15145,6 +15177,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15290,6 +15325,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15328,6 +15368,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15761,9 +15806,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15831,6 +15888,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15925,6 +15985,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16465,6 +16528,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16486,12 +16552,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16593,6 +16735,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17132,12 +17277,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17255,6 +17403,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17659,6 +17813,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18297,12 +18460,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18486,6 +18643,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19148,25 +19308,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19746,6 +19887,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19944,32 +20093,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20054,6 +20177,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20294,6 +20434,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21459,6 +21627,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21798,6 +22057,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22781,6 +23063,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22836,6 +23121,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24810,7 +25101,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24853,9 +25147,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27440,6 +27734,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27449,6 +27746,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27488,6 +27788,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27601,7 +27904,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27838,9 +28141,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/be.po b/i18n/po/be.po
index 4076d56..3cfd578 100644
--- a/i18n/po/be.po
+++ b/i18n/po/be.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-29 14:00+0000\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-02 12:07+0000\n"
"Last-Translator: Viktar Palstsiuk <Unknown>\n"
"Language-Team: Belarusian <i18n at mova.org>\n"
"MIME-Version: 1.0\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-10-30 04:34+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:34+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: be\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -177,6 +177,12 @@ msgstr "Плагіны"
msgid "About JOSM..."
msgstr "Пра JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Збой загрузкі рэсурсу ''{0}'', памылка {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2336,14 +2342,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Выдзяляць, перамяшчаць, маштабаваць і круціць аб’екты"
-msgid "Move elements"
-msgstr "Перамясціць элементы?"
-
-msgid "Move them"
-msgstr "Перамясціць"
-
-msgid "Undo move"
-msgstr "Адмена перамяшчэння"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2366,6 +2368,15 @@ msgstr[2] ""
"часта адбываецца па памылцы.\n"
"Сапраўды перамясціць іх?"
+msgid "Move elements"
+msgstr "Перамясціць элементы?"
+
+msgid "Move them"
+msgstr "Перамясціць"
+
+msgid "Undo move"
+msgstr "Адмена перамяшчэння"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Адпусціце кнопку мышы, каб вылучыць аб’екты ў прамавугольніку."
@@ -2576,6 +2587,9 @@ msgstr "MapCSS-селектар"
msgid "add toolbar button"
msgstr "дадаць кнопку на панэлі інструмэнтаў"
+msgid "Invalid search expression"
+msgstr "Няправільны выраз для пошуку"
+
msgid "Filter"
msgstr "Фільтар"
@@ -2597,9 +2611,6 @@ msgstr ""
"\n"
"{0}"
-msgid "Invalid search expression"
-msgstr "Няправільны выраз для пошуку"
-
msgid "basic examples"
msgstr "простыя прыклады"
@@ -3497,12 +3508,12 @@ msgstr "Ангельская сістэма мер"
msgid "Nautical Mile"
msgstr "Марская міля"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Збой загрузкі рэсурсу ''{0}'', памылка {1}."
-
msgid "UNKNOWN"
msgstr "НЕВЯДОМА"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
"Неспадзяваны нумар версіі JOSM у файле рэвізій, значэнне роўна ''{0}''"
@@ -5201,6 +5212,13 @@ msgstr "Дапамога"
msgid "Menu: {0}"
msgstr "Меню: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "Панэль прылад рэдагавання"
@@ -5378,14 +5396,10 @@ msgstr "да квадрата"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Таксама можна ўвесці <strong>адрас квадрата</strong> для аднаго "
-"квадрата ў фармаце <i>zoomlevel/x/y</i>, напрыклад <i>15/256/223</i>. Адрасы "
-"квадратаў у фармаце <i>zoom,x,y</i> ці <i>zoom;x;y</i> таксама "
-"дакладныя.</html>"
msgid "Tile address:"
msgstr "Адрас квадрата:"
@@ -6288,26 +6302,15 @@ msgstr "Уладзіць канфлікты"
msgid "Resolve conflicts for ''{0}''"
msgstr "Уладзіць канфлікты для ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Калі ласка, пацвердзіце выдаленне <strong>1 аб''екта</strong> з "
-"<strong>1 адносін</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Калі ласка, пацвердзіце выдаленне <strong>1 аб’екта</strong> з "
-"<strong>{0} адносін</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Калі ласка, пацвердзіце выдаленне <strong>{0} аб’ектаў</strong> з "
-"<strong>{1} адносін</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7641,14 +7644,17 @@ msgstr "Тэгі/Удзел"
msgid "Tags for selected objects."
msgstr "Тэгі для вылучаных аб’ектаў."
+msgid "<different>"
+msgstr "<розныя>"
+
msgid "Member Of"
msgstr "Удзельнік"
msgid "Position"
msgstr "Размяшчэнне"
-msgid "<different>"
-msgstr "<розныя>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Аб’екты: {2} / Тэгі: {0} / Удзел: {1}"
@@ -13219,6 +13225,9 @@ msgstr ""
"Сапсаваная нарыхтоўка тэгаў \"{0}-{1}\" - колькасць элементаў у "
"''display_values'' павінна быць такое ж, як і ў ''values''"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13406,6 +13415,9 @@ msgstr "Спампоўка кропак з {0} да {1}..."
msgid "Contacting OSM Server..."
msgstr "Падлучэнне да сервера OSM..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Немагчыма адкрыць уваходны струмень для рэсурсу ''{0}''"
@@ -15625,6 +15637,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "хмызняк"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "Вуліца"
@@ -16232,6 +16248,9 @@ msgstr "Здымкі дронаў (Гаіці)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Здымкі з дрону 2014 (Гаіці)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ірландыя Міністэрства абароны Вялікабрытаніі 1:25000 GSGS 3906"
@@ -16260,8 +16279,11 @@ msgstr "OSMIE: абшчыны"
msgid "OSMIE Baronies"
msgstr "OSMIE Баронствы"
-msgid "OSMIE Political"
-msgstr "OSMIE Палітычная мапа"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
+msgstr ""
msgid "Lodi - Italy"
msgstr "Лодзі - Італія"
@@ -16639,7 +16661,7 @@ msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-цалевая карта Шатландыі 1842-82"
msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
+msgstr "NLS - OS 6-дзюймаў County Series 1888-1913"
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - ОС 1:25000 1-й серыі 1937-61"
@@ -16836,6 +16858,9 @@ msgstr "Планы гарадоў ад OS, Наірн 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "Планы гарадоў ад OS, Обан 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "Планы гарадоў ад OS, Піблз 1856 (NLS)"
@@ -17012,6 +17037,11 @@ msgstr ""
"Дазваляе карыстальніку рабіць ананімнымі часовыя пазнакі і выдаляць часткі "
"вялікіх GPX трэкаў"
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr "Паказвае профіль вышынь і некаторыя статыстычныя дадзеныя трэка GPX."
@@ -17058,6 +17088,11 @@ msgstr "Фільтраванне непатрэбных GPS трэкаў"
msgid "Visualizes routing information as a routing graph."
msgstr "Візуалізуе інфармацыю аб маршрутызацыі ў выглядзе графа."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "Просты інструмент для нумарацыі дамоў"
@@ -17578,9 +17613,21 @@ msgstr "бруд"
msgid "Lanes"
msgstr "Колькасць палос"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Макс. хуткасць (км/г)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Мост"
@@ -17648,6 +17695,9 @@ msgstr "бакавы шлях"
msgid "spur"
msgstr "адгалінаванне"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Электрыфікаваная"
@@ -17742,6 +17792,9 @@ msgstr "падзелены"
msgid "isolated"
msgstr "ізаляваны"
+msgid "outside"
+msgstr "знадворку"
+
msgid "Height (meters)"
msgstr "Вышыня (у метрах)"
@@ -18286,6 +18339,9 @@ msgstr "Платная"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "Ці вадаём перасыхае (перыядычна знікае)?"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr "дрэнажная труба"
@@ -18307,12 +18363,88 @@ msgstr "Маторныя лодкі"
msgid "Canoe"
msgstr "Каноэ"
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "вада"
+
+msgid "gas"
+msgstr "газ"
+
+msgid "heat"
+msgstr "цеплатраса"
+
+msgid "oil"
+msgstr "нафта"
+
+msgid "sewage"
+msgstr "каналізацыя"
+
+msgid "Support"
+msgstr "Мацаванне"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "на слупе"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "на сцяне"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "на рэкламным шчыце"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "наземныя"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Вуліцы"
msgid "Motorway"
msgstr "Аўтамагістраль"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "З’езд з аўтамагістралі"
@@ -18414,6 +18546,9 @@ msgstr "паркавальны праезд"
msgid "drive-through"
msgstr "абслугоўванне ў аўта"
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Праезд на паркоўцы"
@@ -18970,12 +19105,15 @@ msgstr "Развароная пляцоўка"
msgid "Turning Loop"
msgstr "Разваротнае кола"
-msgid "City Limit"
-msgstr "Мяжа населенага пункта"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Другая назва"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Камера-хуткасцямер"
@@ -19095,6 +19233,12 @@ msgstr "Дарожная агароджа"
msgid "Wall"
msgstr "Сцяна"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Гарадская сцяна"
@@ -19503,6 +19647,15 @@ msgstr "прыродны газ"
msgid "Pier"
msgstr "Пірс"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Вароты шлюза"
@@ -20144,12 +20297,6 @@ msgstr "Аэрапорт"
msgid "Airport Ground"
msgstr "Тэрыторыя аэрапорта"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Узлётна-пасадкавая паласа"
@@ -20333,6 +20480,9 @@ msgstr "Бровар"
msgid "Outdoor seating"
msgstr "Столікі на вуліцы"
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Фаст-фуд"
@@ -20995,25 +21145,6 @@ msgstr "сонечны"
msgid "unorthodox"
msgstr "нестандартны"
-msgid "Support"
-msgstr "Мацаванне"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "на слупе"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "на сцяне"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "на рэкламным шчыце"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "наземныя"
-
msgid "Visibility/readability"
msgstr "Кантраснасць/выразнасць"
@@ -21593,6 +21724,14 @@ msgid "barn"
msgstr "свіран"
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "нежылы будынак фермы"
@@ -21791,32 +21930,6 @@ msgstr "віно"
msgid "Bunker Silo"
msgstr "Сіласная яма"
-msgid "Pipeline"
-msgstr "Трубаправод"
-
-msgid "water"
-msgstr "вада"
-
-msgid "gas"
-msgstr "газ"
-
-msgid "heat"
-msgstr "цеплатраса"
-
-msgid "oil"
-msgstr "нафта"
-
-msgid "sewage"
-msgstr "каналізацыя"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "падводны"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "наземны"
-
msgid "Crane"
msgstr "Кран"
@@ -21901,6 +22014,23 @@ msgstr "Ходня"
msgid "Length in meters"
msgstr "Даўжыня ў метрах"
+msgid "Pipeline"
+msgstr "Трубаправод"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "падводны"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "наземны"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Воданапорная вежа"
@@ -22141,6 +22271,34 @@ msgstr "апора разводнага пралёта"
msgid "Bridge outline"
msgstr "Контур моста"
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "Электрастанцыя"
@@ -23308,6 +23466,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Геаграфія"
@@ -23660,6 +23909,29 @@ msgstr "Двор фермы"
msgid "Farmland"
msgstr "Сельскагаспадарчыя ўгоддзі"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Сенажаць"
@@ -24672,6 +24944,9 @@ msgstr "{0} павінна быць лікавым значэннем"
msgid "{0} must be a positive integer number"
msgstr "{0} павінен быць дадатным цэлым лікам"
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr "адносіны без тыпу"
@@ -24729,6 +25004,12 @@ msgstr "Паказваць назвы вуліц (пры буйных машт
msgid "Use alternative turn restriction icon set"
msgstr "Выкарыстоўваць альтэрнатыўны набор значкоў"
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Файлы Columbus V-900 CSV"
@@ -26893,7 +27174,7 @@ msgid "Invalid reference or subject"
msgstr "Няслушны аб''ект даведкавага або мэтавага пласта"
msgid "Download OSM data continuously"
-msgstr ""
+msgstr "Бесперапынна загружаць дадзеныя з OSM"
msgid "Download map data continuously when paning and zooming."
msgstr ""
@@ -26920,7 +27201,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -26963,9 +27247,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -29711,6 +29995,9 @@ msgstr "Не адзначаныя малюнкі"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Вы жадаеце захаваць каліброўку пласта {0}?"
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "Загрузіць каліброўку малюнка..."
@@ -29720,6 +30007,9 @@ msgstr "Загрузіць калібравальныя дадзеныя з фа
msgid "Loading file failed: {0}"
msgstr "Загрузка файла не атрымалася: {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr "Загрузіць калібравальныя дадзеныя з world-файла..."
@@ -29763,6 +30053,9 @@ msgstr ""
"Выкарыстоўвайце {0}, каб загрузіць свае KML, якія былі прывязаныя "
"няправільна."
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "Перамяшчэнне PicLayer"
@@ -29879,8 +30172,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "Жадаеце ўжыць?"
-msgid "Load calibration file ?"
-msgstr "Загрузіць калібравальны файл?"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr "Ён будзе ўжыты аўтаматычна."
@@ -30119,9 +30412,6 @@ msgstr "Даступныя"
msgid "pending"
msgstr "у чаканні"
-msgid "outside"
-msgstr "знадворку"
-
msgid "[incomplete]"
msgstr "[няпоўны]"
diff --git a/i18n/po/bg.po b/i18n/po/bg.po
index c926053..3bbd9bd 100644
--- a/i18n/po/bg.po
+++ b/i18n/po/bg.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-08-17 01:50+0000\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-16 12:29+0000\n"
"Last-Translator: pl <Unknown>\n"
"Language-Team: Bulgarian <bg at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:36+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:36+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: bg\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -175,6 +175,12 @@ msgstr "Разширения"
msgid "About JOSM..."
msgstr "За JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -1100,10 +1106,10 @@ msgid "<html>The Overpass wizard could not parse the following query:"
msgstr ""
msgid "Parse error"
-msgstr ""
+msgstr "Грешка при обработка"
msgid "Overpass query: "
-msgstr ""
+msgstr "Грешка при обработка: "
msgid "Overpass server: "
msgstr ""
@@ -1264,7 +1270,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 ""
@@ -1965,7 +1971,7 @@ msgid "Click <strong>{0}</strong> to ignore.</html>"
msgstr ""
msgid "Deleted or moved objects"
-msgstr ""
+msgstr "Изтрити или преместени обекти"
msgid "The following errors occurred during mass download: {0}"
msgstr ""
@@ -2227,14 +2233,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr "Преместване на елементи"
-
-msgid "Move them"
-msgstr "Премести"
-
-msgid "Undo move"
-msgstr "Отмени преместването"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2253,6 +2255,15 @@ msgstr[1] ""
"елементи често се явява грешка.\n"
"Наистина ли искате да преместите елементите?"
+msgid "Move elements"
+msgstr "Преместване на елементи"
+
+msgid "Move them"
+msgstr "Премести"
+
+msgid "Undo move"
+msgstr "Отмени преместването"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Отпуснете бутона на мишката за да изберете обектите в правоъгълника."
@@ -2456,6 +2467,9 @@ msgstr ""
msgid "add toolbar button"
msgstr "добавяне на бутон към ленатата"
+msgid "Invalid search expression"
+msgstr "Невалиден израз за търсен"
+
msgid "Filter"
msgstr "Филтър"
@@ -2477,9 +2491,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Невалиден израз за търсен"
-
msgid "basic examples"
msgstr "основни примери"
@@ -3299,12 +3310,12 @@ msgstr "Имперски"
msgid "Nautical Mile"
msgstr "Морска миля"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "НЕИЗВЕСТНО"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4913,6 +4924,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "Меню: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -5085,7 +5103,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5889,20 +5907,15 @@ msgstr "Разрешаване на конфликти"
msgid "Resolve conflicts for ''{0}''"
msgstr "Разрешаване на конфликти за ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7136,14 +7149,17 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr "<различни>"
+
msgid "Member Of"
msgstr "Член на"
msgid "Position"
msgstr "Позиция"
-msgid "<different>"
-msgstr "<различни>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -12196,6 +12212,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12360,6 +12379,9 @@ msgstr "Зареждане на точки от следи: {0} - {1}..."
msgid "Contacting OSM Server..."
msgstr "Свързване с OSM Сървър..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -14219,6 +14241,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14830,6 +14856,9 @@ msgstr "Drone Imagery (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Imagery 2014 (Haiti)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -14857,7 +14886,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15433,6 +15465,9 @@ msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "OS Town Plans, Peebles 1856 (NLS)"
@@ -15580,6 +15615,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15618,6 +15658,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -16068,9 +16113,21 @@ msgstr "кал"
msgid "Lanes"
msgstr "Брой платна"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Макс. скорост (км/ч)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Мост"
@@ -16138,6 +16195,9 @@ msgstr "ЖП стрелка"
msgid "spur"
msgstr "скоростна"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -16232,6 +16292,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr "Височина (в метри)"
@@ -16772,6 +16835,9 @@ msgstr "Пътна такса"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16793,12 +16859,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "вода"
+
+msgid "gas"
+msgstr "газ"
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr "нефт"
+
+msgid "sewage"
+msgstr "отходна тръба"
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "стълб"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Автомобилни"
msgid "Motorway"
msgstr "Магистрала"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Автомагистрална връзка"
@@ -16900,6 +17042,9 @@ msgstr "паркинг"
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Улица паркинг"
@@ -17439,12 +17584,15 @@ msgstr "Обръщало"
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
-msgstr "Знак указващ начало/край на населено място"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Второ име"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Пътна камера"
@@ -17562,6 +17710,12 @@ msgstr ""
msgid "Wall"
msgstr "Стена"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Градска стена"
@@ -17966,6 +18120,15 @@ msgstr "CNG (природен газ под налягане)"
msgid "Pier"
msgstr "Кей"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Шлюзова врата"
@@ -18604,12 +18767,6 @@ msgstr "Летище"
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Писта за излитане"
@@ -18793,6 +18950,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Заведение за бързо хранене"
@@ -19455,25 +19615,6 @@ msgstr "слънчев"
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "стълб"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -20053,6 +20194,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -20251,32 +20400,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "Тръбопровод"
-
-msgid "water"
-msgstr "вода"
-
-msgid "gas"
-msgstr "газ"
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr "нефт"
-
-msgid "sewage"
-msgstr "отходна тръба"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "подводна"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr "Кран"
@@ -20361,6 +20484,23 @@ msgstr "Минна галерия"
msgid "Length in meters"
msgstr "Дължина (м)"
+msgid "Pipeline"
+msgstr "Тръбопровод"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "подводна"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Водонапорна кула"
@@ -20601,6 +20741,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "Електроцентрала"
@@ -21766,6 +21934,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "География"
@@ -22107,6 +22366,29 @@ msgstr "Двор ферма"
msgid "Farmland"
msgstr "Обработваема земя"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Ливада"
@@ -23090,6 +23372,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -23145,6 +23430,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -25142,7 +25433,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -25185,9 +25479,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27799,6 +28093,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27808,6 +28105,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27847,6 +28147,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27960,7 +28263,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -28197,9 +28500,6 @@ msgstr "Област/Щат"
msgid "pending"
msgstr "чакащ"
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/bn.po b/i18n/po/bn.po
index b912c03..89f6cc4 100644
--- a/i18n/po/bn.po
+++ b/i18n/po/bn.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-04-03 09:24+0000\n"
"Last-Translator: Md Alamgir <alamgircu at hotmail.com>\n"
"Language-Team: Bengali <bn at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:35+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:34+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: bn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr "প্লাগ-ইন"
msgid "About JOSM..."
msgstr "JOSMএর সম্বন্ধে।"
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2134,13 +2140,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2154,6 +2156,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2348,6 +2359,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2366,9 +2380,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3163,12 +3174,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "অজ্ঞাত"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4760,6 +4771,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4932,7 +4950,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5734,20 +5752,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6979,13 +6992,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11942,6 +11958,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12104,6 +12123,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13940,6 +13962,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14546,6 +14572,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14573,7 +14602,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15149,6 +15181,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15294,6 +15329,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15332,6 +15372,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15765,9 +15810,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15835,6 +15892,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15929,6 +15989,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16469,6 +16532,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16490,12 +16556,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16597,6 +16739,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17136,12 +17281,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17259,6 +17407,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17663,6 +17817,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18301,12 +18464,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18490,6 +18647,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19152,25 +19312,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19750,6 +19891,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19948,32 +20097,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20058,6 +20181,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20298,6 +20438,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21463,6 +21631,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21802,6 +22061,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22785,6 +23067,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22840,6 +23125,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24814,7 +25105,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24857,9 +25151,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27444,6 +27738,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27453,6 +27750,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27492,6 +27792,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27605,7 +27908,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27842,9 +28145,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/br.po b/i18n/po/br.po
index 880ed83..eba7e2c 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2011-10-17 12:11+0000\n"
"Last-Translator: Fulup <Unknown>\n"
"Language-Team: Breton <br at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:36+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:35+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: br\n"
msgid "License"
@@ -169,6 +169,12 @@ msgstr "Adveziantoù"
msgid "About JOSM..."
msgstr "Diwar-benn JOSM"
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,12 +3171,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "DIANAV"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr "O vont e darempred gant servijer OSM"
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/bs.po b/i18n/po/bs.po
index 4c920ee..537e913 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2012-11-03 23:07+0000\n"
"Last-Translator: Alen Mahovic <eyeofthestorm at windowslive.com>\n"
"Language-Team: Bosnian <bs at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:35+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:35+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: bs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -170,6 +170,12 @@ msgstr "Priključci"
msgid "About JOSM..."
msgstr "O JOSM-u..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2134,13 +2140,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2154,6 +2156,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2348,6 +2359,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2366,9 +2380,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3163,12 +3174,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "NEPOZNAT"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4760,6 +4771,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4932,7 +4950,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5734,20 +5752,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6979,13 +6992,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11942,6 +11958,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12104,6 +12123,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13940,6 +13962,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14546,6 +14572,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14573,7 +14602,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15149,6 +15181,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15294,6 +15329,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15332,6 +15372,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15765,9 +15810,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15835,6 +15892,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15929,6 +15989,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16469,6 +16532,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16490,12 +16556,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16597,6 +16739,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17136,12 +17281,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17259,6 +17407,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17663,6 +17817,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18301,12 +18464,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18490,6 +18647,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19152,25 +19312,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19750,6 +19891,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19948,32 +20097,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20058,6 +20181,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20298,6 +20438,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21463,6 +21631,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21802,6 +22061,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22785,6 +23067,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22840,6 +23125,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24814,7 +25105,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24857,9 +25151,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27444,6 +27738,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27453,6 +27750,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27492,6 +27792,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27605,7 +27908,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27842,9 +28145,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/ca.po b/i18n/po/ca.po
index 1d79818..3a66293 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-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-29 13:54+0000\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-19 13:46+0000\n"
"Last-Translator: pitort <pitort at eclipso.eu>\n"
"Language-Team: el_libre - - www.catmidia.cat\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:36+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:36+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: ca\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -175,6 +175,12 @@ msgstr "Connectors"
msgid "About JOSM..."
msgstr "Quant al JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr "Ha fallat la localització del recurs ''{0}''."
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "El recurs ''{0}'' no ha pogut ser carregat. Error: {1}"
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2334,14 +2340,14 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Selecciona, mou, escala i rota objectes"
-msgid "Move elements"
-msgstr "Mou elements"
-
-msgid "Move them"
-msgstr "Mou-los"
-
-msgid "Undo move"
-msgstr "Desfés el moviment"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?\r\n"
+"Esteu segur de moure elements que tenen connexió amb vies ocultes pels "
+"filtres aplicats?"
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2360,6 +2366,15 @@ msgstr[1] ""
"error\n"
"N''esteu segur de voler-ho fer?"
+msgid "Move elements"
+msgstr "Mou elements"
+
+msgid "Move them"
+msgstr "Mou-los"
+
+msgid "Undo move"
+msgstr "Desfés el moviment"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
"Deixeu anar el botó del ratolí per seleccionar objectes en el rectangle"
@@ -2568,6 +2583,9 @@ msgstr "Selector de MapCSS"
msgid "add toolbar button"
msgstr "afegeix un botó a la barra d''eines"
+msgid "Invalid search expression"
+msgstr "L''expressió de cerca no és vàlida"
+
msgid "Filter"
msgstr "Filtre"
@@ -2589,9 +2607,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "L''expressió de cerca no és vàlida"
-
msgid "basic examples"
msgstr "exemples bàsics"
@@ -3472,12 +3487,12 @@ msgstr "Imperial"
msgid "Nautical Mile"
msgstr "Milla nàutica"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "El recurs ''{0}'' no ha pogut ser carregat. Error: {1}"
-
msgid "UNKNOWN"
msgstr "Desconegut"
+msgid "Error reading revision info from revision file: {0}"
+msgstr "Error en llegir la informació de revisió al fitxer de revisió: {0}"
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
"Número inesperat de la versió del JOSM al fitxer de revisió, el valor és "
@@ -5211,6 +5226,15 @@ msgstr "Ajuda"
msgid "Menu: {0}"
msgstr "Menú: {0}"
+msgid "Main toolbar"
+msgstr "Barra d''eines principal"
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+"Canvia la visibilitat de la barra d''eines principal (p.ex., barra d''eines "
+"horitzontal)"
+
msgid "Edit toolbar"
msgstr "Barra d''eines d''edició"
@@ -5391,14 +5415,14 @@ msgstr "fins la tessel·la"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Alternativament podeu introduir una <strong>adreça d''una "
-"tessel·la</strong> particular en el format <i>ampliació/x/y</i>, i.e. "
-"<i>15/256/223</i>. També són vàlides les adreces de tessel·la en els formats "
-"<i>ampliació,x,y</i> i <i>ampliació;x;y</i>.</html>"
+"<html>Alternativament podeu entra una <strong>adreça de tesel·la</strong> "
+"per a una tessel·la en particular utilitzant el format <i>zoomlevel/x/y</i>, "
+"p.ex. <i>15/256/223</i>. Les adreces de tessel·les en format <i>zoom,x,y</i> "
+"or <i>zoom;x;y</i> també són vàlides.</html>"
msgid "Tile address:"
msgstr "Adreça de la tessel·la:"
@@ -6301,26 +6325,17 @@ msgstr "Resol conflictes"
msgid "Resolve conflicts for ''{0}''"
msgstr "Resoldre els conflictes per ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Si us plau confirmeu la supressió d''<strong>1 objecte</strong> "
-"d''<strong>1 relació</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Si us plau confirmeu la supressió d''<strong>1 objecte</strong> de "
-"<strong>{0} relacions</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+"Si us plau confirmeu la supressió d'' <strong>{0} objecte</strong>."
+msgstr[1] ""
+"Si us plau confirmeu la supressió de <strong>{0} objectes</strong>."
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Si us plau confirmeu la supressió de <strong>{0} objectes</strong> de "
-"<strong>{1} relacions</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] "{0} relació afectada."
+msgstr[1] "{0} relacions afectades."
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7663,14 +7678,17 @@ msgstr "Etiquetes/Pertinença"
msgid "Tags for selected objects."
msgstr "Etiquetes pels objectes seleccionats"
+msgid "<different>"
+msgstr "<diferent>"
+
msgid "Member Of"
msgstr "Membre de"
msgid "Position"
msgstr "Posició"
-msgid "<different>"
-msgstr "<diferent>"
+msgid "Tag filter"
+msgstr "Etiqueta de filtre"
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Objectes: {2} / Etiquetes: {0} / Membres: {1}"
@@ -13262,6 +13280,9 @@ msgstr ""
"El nombre d''etiquetes predefinides \"{0}-{1}\" no és coherent. El nombre "
"d''elements ''display_values'' ha de ser el mateix que el de ''values''"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13452,6 +13473,9 @@ msgstr "S''estan baixant punts del {0} al {1}..."
msgid "Contacting OSM Server..."
msgstr "Contactant amb el servidor OSM..."
+msgid "Downloading notes"
+msgstr "Descarregant notes"
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Ha fallat l''obertura d''un fux d''entrada pel recurs ''{0}''"
@@ -15662,6 +15686,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "matolls"
+msgctxt "natural"
+msgid "wood"
+msgstr "bosc"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "carrer associat"
@@ -16276,6 +16304,9 @@ msgstr "Imatgeria de drones (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Imatgeria de drones 2014 (Haiti)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16303,8 +16334,11 @@ msgstr "OSMIE Parròquies civils"
msgid "OSMIE Baronies"
msgstr "OSMIE Baronies"
-msgid "OSMIE Political"
-msgstr "OSMIE Política"
+msgid "OSMIE Local Election Areas"
+msgstr "OSMIE Local Election Areas"
+
+msgid "OSMIE Dail Election Areas"
+msgstr "OSMIE Dail Election Areas"
msgid "Lodi - Italy"
msgstr "Lodi - Itàlia"
@@ -16682,7 +16716,7 @@ msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-82"
msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
+msgstr "NLS - OS 6-inch County Series 1888-1913"
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -16691,7 +16725,7 @@ msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
-msgstr ""
+msgstr "NLS - OS 25-inch (Escòcia) 1892-1905"
msgid "OS 1:25k historic (OSM-Best)"
msgstr "OS 1:25k històric (OSM-Best)"
@@ -16879,6 +16913,9 @@ msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr "OS Town Plans, Paisley 1858 (NLS)"
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "OS Town Plans, Peebles 1856 (NLS)"
@@ -16955,11 +16992,15 @@ msgid ""
"Provides Apache Commons library components. Not meant to be installed "
"directly by users, but rather as a dependency for other plugins."
msgstr ""
+"Proporciona components de la llibreria \"Apache Commons\". No és per a ser "
+"instal·lat directament pels usuaris sinó com una dependència d''altes"
msgid ""
"Provides Apache HTTP library. Not meant to be installed directly by users, "
"but rather as a dependency for other plugins."
msgstr ""
+"Proporciona una llibreria \"Apache HTTP\". No és per a ser instal·lat "
+"directament pels usuaris sinó com una dependència d''altes connectors."
msgid ""
"Allows selection of areas in an layer and automatic creation of a way as "
@@ -17050,6 +17091,14 @@ msgstr ""
"Permet l''usuari d''anonimitzar la data i hora i esborrar parts de grans "
"tracks GPX de manera molt ràpida."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Proveeix la llibreria EJML per a d''altres connectors de JOSM. Aquest "
+"element no està destinat a ser instal·lat directament pels usuaris sinó com "
+"una dependència per altres connectors."
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
"Mostra el perfil vertical i d''altres dades estadístiques d''un track GPX."
@@ -17097,6 +17146,11 @@ msgstr "Permet de filtrar tracks GPX innecessaris"
msgid "Visualizes routing information as a routing graph."
msgstr "Visualitza informació de càlcul de rutes gràficament."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "Eina simple per posar nombre a les cases"
@@ -17621,9 +17675,21 @@ msgstr "fangar"
msgid "Lanes"
msgstr "Carrils"
+msgid "Lanes in way direction"
+msgstr "Carrils en la direcció de la via"
+
+msgid "Lanes opposed to way direction"
+msgstr "Carrils en sentit oposat a la direcció de la via"
+
msgid "Max. speed (km/h)"
msgstr "Velocitat màxima (km/h)"
+msgid "Max. speed in way direction"
+msgstr "Velocitat màxima en el sentit de la via"
+
+msgid "Max. speed opposed to way direction"
+msgstr "Velocitat màxima en sentit oposat a la direcció de la via"
+
msgid "Bridge"
msgstr "Pont"
@@ -17691,6 +17757,9 @@ msgstr "revestiment"
msgid "spur"
msgstr "línia secundària"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Electrificada"
@@ -17785,6 +17854,9 @@ msgstr "separat"
msgid "isolated"
msgstr "aïllat"
+msgid "outside"
+msgstr "exterior"
+
msgid "Height (meters)"
msgstr "Altura (metres)"
@@ -18329,6 +18401,9 @@ msgstr "Peatge"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "El cos d''aigua és intermintent? (desapareix estacionalment?)"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr "canonada"
@@ -18350,12 +18425,88 @@ msgstr "Barca a motot"
msgid "Canoe"
msgstr "Canoa"
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "aigua"
+
+msgid "gas"
+msgstr "gas"
+
+msgid "heat"
+msgstr "calor"
+
+msgid "oil"
+msgstr "oli"
+
+msgid "sewage"
+msgstr "aigües residuals"
+
+msgid "Support"
+msgstr "Suport"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "pal"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "mural"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "tanca publicitària"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "sòl"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Carrers"
msgid "Motorway"
msgstr "Autopista"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Enllaç d''autopista"
@@ -18457,6 +18608,9 @@ msgstr "via d''aparcament"
msgid "drive-through"
msgstr "accés a servei amb cotxe (drive-through)"
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Via d''aparcament"
@@ -19015,12 +19169,15 @@ msgstr "Cercle de gir"
msgid "Turning Loop"
msgstr "Bucle de gir"
-msgid "City Limit"
-msgstr "Límit de població"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Segon nom"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Radar"
@@ -19140,6 +19297,12 @@ msgstr "Guarda-rail"
msgid "Wall"
msgstr "Mur"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Muralla"
@@ -19552,6 +19715,15 @@ msgstr "GNC (Gas Natural Comprimit)"
msgid "Pier"
msgstr "Embarcador"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Resclosa"
@@ -20194,12 +20366,6 @@ msgstr "Aeroport"
msgid "Airport Ground"
msgstr "Aeròdrom"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Pista"
@@ -20383,6 +20549,9 @@ msgstr "Microcerveseria"
msgid "Outdoor seating"
msgstr "Seients a l''aire lliure"
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Menjar ràpid"
@@ -21047,25 +21216,6 @@ msgstr "rellotge de sol"
msgid "unorthodox"
msgstr "no ortodox"
-msgid "Support"
-msgstr "Suport"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "pal"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "mural"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "tanca publicitària"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "sòl"
-
msgid "Visibility/readability"
msgstr "Visibilitat/llegibilitat"
@@ -21645,6 +21795,14 @@ msgid "barn"
msgstr "graner"
msgctxt "building"
+msgid "stable"
+msgstr "estable"
+
+msgctxt "building"
+msgid "cabin"
+msgstr "cabanya"
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "auxiliar de granja"
@@ -21843,32 +22001,6 @@ msgstr "vi"
msgid "Bunker Silo"
msgstr "Sitja oberta"
-msgid "Pipeline"
-msgstr "Canonada"
-
-msgid "water"
-msgstr "aigua"
-
-msgid "gas"
-msgstr "gas"
-
-msgid "heat"
-msgstr "calor"
-
-msgid "oil"
-msgstr "oli"
-
-msgid "sewage"
-msgstr "aigües residuals"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "submarí"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "en superfície"
-
msgid "Crane"
msgstr "Grua"
@@ -21953,6 +22085,23 @@ msgstr "Boca mina"
msgid "Length in meters"
msgstr "Longitud en metres"
+msgid "Pipeline"
+msgstr "Canonada"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "submarí"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "en superfície"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Torre d''aigua"
@@ -22193,6 +22342,34 @@ msgstr "pilar pivotable"
msgid "Bridge outline"
msgstr "Contorn del pont"
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "Central elèctrica"
@@ -23360,6 +23537,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr "Oficines"
+
+msgctxt "office"
+msgid "Accountant"
+msgstr "Comptable"
+
+msgctxt "office"
+msgid "Administrative"
+msgstr "Administratiu"
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr "Agència de publicitat"
+
+msgctxt "office"
+msgid "Architect"
+msgstr "Arquitecte"
+
+msgctxt "office"
+msgid "Association"
+msgstr "Associació"
+
+msgctxt "office"
+msgid "Private company"
+msgstr "Companyia privada"
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr "Institució educativa"
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr "Agència d''ocupació"
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr "Agent estatal"
+
+msgctxt "office"
+msgid "Foundation"
+msgstr "Fundació"
+
+msgctxt "office"
+msgid "Government"
+msgstr "Institució governamental"
+
+msgctxt "office"
+msgid "Insurance"
+msgstr "Assegurances"
+
+msgctxt "office"
+msgid "It specialist"
+msgstr "Especialista en informàtica"
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr "Advocat"
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr "Diari"
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr "ONG"
+
+msgctxt "office"
+msgid "Notary"
+msgstr "Notaria"
+
+msgctxt "office"
+msgid "Political party"
+msgstr "Partit polític"
+
+msgctxt "office"
+msgid "Religion"
+msgstr "Religió"
+
+msgctxt "office"
+msgid "Research"
+msgstr "Recerca"
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr "Pagaments"
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr "Telecomunicacions"
+
msgid "Geography"
msgstr "Geografia"
@@ -23713,6 +23981,29 @@ msgstr "Granja"
msgid "Farmland"
msgstr "Terres de cultiu"
+msgid "Crop"
+msgstr "Conreu"
+
+msgctxt "crop"
+msgid "corn"
+msgstr "dacsa"
+
+msgctxt "crop"
+msgid "grass"
+msgstr "herba"
+
+msgctxt "crop"
+msgid "rice"
+msgstr "arròs"
+
+msgctxt "crop"
+msgid "wheat"
+msgstr "blat"
+
+msgctxt "crop"
+msgid "hop"
+msgstr "llúpol"
+
msgid "Meadow"
msgstr "Prat"
@@ -24724,6 +25015,9 @@ msgstr "{0} ha de ser un valor numèric"
msgid "{0} must be a positive integer number"
msgstr "{0} ha de ser un nombre sencer i positiu"
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr "relació sense tipus"
@@ -24782,6 +25076,12 @@ msgid "Use alternative turn restriction icon set"
msgstr ""
"Utilitzeu alternativament el conjunt d''icones de prohibicions de gir"
+msgid "Display fill colour of areas with place=*"
+msgstr "Mostra el color d''emplenat d''àrees amb place=*"
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 fitxers CSV"
@@ -26966,25 +27266,25 @@ msgid "Invalid reference or subject"
msgstr "Referència o objecte no vàlid."
msgid "Download OSM data continuously"
-msgstr ""
+msgstr "Descàrrega continuada de dades OSM"
msgid "Download map data continuously when paning and zooming."
msgstr ""
msgid "Toggle the continuous download on/off"
-msgstr ""
+msgstr "Commuta la descàrrega contínua activada/desactivada"
msgid "Download Settings"
-msgstr ""
+msgstr "Paràmetres de baixada"
msgid "Settings for the continuous download."
-msgstr ""
+msgstr "Paràmetre per a la descàrrega contínua"
msgid "Activate continuous downloads at startup."
-msgstr ""
+msgstr "Activa la descàrrega contínua en iniciar."
msgid "Supress the default modal progress monitor when downloading."
-msgstr ""
+msgstr "Suprimeix el monitor modal de progrés durant una descàrrega."
msgid ""
"If this plugin is active at startup. This default state will not change when "
@@ -26993,11 +27293,17 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
msgstr ""
+"Nombre màxim de fills d''execució utilitzats per a descàrregues, "
+"l''increment d''aquest valor farà que el client enviï més peticions "
+"concurrents al servidor."
+
+msgid "Requires restart"
+msgstr "Requereix reiniciar"
msgid "Max threads"
-msgstr ""
+msgstr "Nombre màxim de fils d''execució"
msgid "Maximum number of boxes to download for each pan/zoom."
msgstr ""
@@ -27011,7 +27317,7 @@ msgid ""
msgstr ""
msgid "Wait time (milliseconds)"
-msgstr ""
+msgstr "Temps d''espera (milisegons)"
msgid ""
"How much extra area around the viewport is it going to download. Setting "
@@ -27019,7 +27325,7 @@ msgid ""
msgstr ""
msgid "Extra download area"
-msgstr ""
+msgstr "Àrea de descàrrega addicional"
msgid ""
"Max area to download in degrees^2. Increasing this number will cause the "
@@ -27027,19 +27333,23 @@ msgid ""
msgstr ""
msgid "Max download area"
-msgstr ""
+msgstr "Àrea de descàrrega màxima"
msgid "The strategy for finding what areas to request from the server."
msgstr ""
+"L''estratègia per trobar quines són les àrees que cal demanar al servidor."
msgid "Download strategy"
-msgstr ""
+msgstr "Estratègia de descàrrega"
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
+"Suprimeix la monitorització del progrés de la descàrrega. Si hom selecciona "
+"aquesta opció no hi haurà cap tipus d''indicació del que fa el procés de "
+"descàrrega i no podrà ser anul·lat."
msgid "Address"
msgstr "Adreça"
@@ -29835,6 +30145,9 @@ msgstr "Imatges no etiquetades"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Voleu desar el calibratge de la capa {0}?"
+msgid "Select an option"
+msgstr "Seleccioneu una opció"
+
msgid "Load Picture Calibration..."
msgstr "Carrega el calibratge de la fotografia..."
@@ -29844,6 +30157,9 @@ msgstr "Carrega dades de calibratge d''un fitxer"
msgid "Loading file failed: {0}"
msgstr "Ha fallat la càrrega del fitxer: {0}"
+msgid "Problem occurred"
+msgstr "Ha hagut un problema"
+
msgid "Load World File Calibration..."
msgstr "Carrega l''arxiu de calibració mundial"
@@ -29886,6 +30202,9 @@ msgstr ""
"incorrecta!\n"
"Utilitza {0} per pujar els teus KLM que han estat calibrats incorrectament."
+msgid "Notification"
+msgstr "Notificació"
+
msgid "PicLayer move"
msgstr "Desplaçament de PicLayer"
@@ -30004,8 +30323,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "Voleu aplicar-ho?"
-msgid "Load calibration file ?"
-msgstr "Carregar fitxer de calibració?"
+msgid "Load calibration file?"
+msgstr "S''ha de carregar el fitxer de calibratge?"
msgid "It will be applied automatically."
msgstr "Serà aplicat automàticament."
@@ -30244,9 +30563,6 @@ msgstr "Comunitat autònoma/Estat federal"
msgid "pending"
msgstr "pendent"
-msgid "outside"
-msgstr "exterior"
-
msgid "[incomplete]"
msgstr "[incomplet]"
@@ -31287,6 +31603,8 @@ msgid ""
"<html>Something went wrong, please update the plugin or report an issue at "
"<a href=\"\">josm-tofix-plugin/issues</a></html>"
msgstr ""
+"<html>Alguna cosa no ha funcionat, si us plau, actualitzeu el connector o "
+"informeu d''un problema a <a href=\"\">josm-tofix-plugin/issues</a></html>"
msgid "Something went wrong, try again"
msgstr "Alguna cosa ha anat malament, torneu a provar"
diff --git a/i18n/po/ca at valencia.po b/i18n/po/ca at valencia.po
index 8ab0cec..ce6b5f0 100644
--- a/i18n/po/ca at valencia.po
+++ b/i18n/po/ca at valencia.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-04-25 18:52+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: el_libre - - www.catmidia.cat\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 05:06+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 05:06+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: ca at valencia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -171,6 +171,12 @@ msgstr "Connectors"
msgid "About JOSM..."
msgstr "Quant al JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "El recurs ''{0}'' no ha pogut ser carregat. Error: {1}"
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2315,14 +2321,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Selecciona, mou, escala i rota objectes"
-msgid "Move elements"
-msgstr "Mou elements"
-
-msgid "Move them"
-msgstr "Mou-los"
-
-msgid "Undo move"
-msgstr "Desfés el moviment"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2335,6 +2337,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr "Mou elements"
+
+msgid "Move them"
+msgstr "Mou-los"
+
+msgid "Undo move"
+msgstr "Desfés el moviment"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
"Deixeu anar el botó del ratolí per seleccionar objectes en el rectangle"
@@ -2537,6 +2548,9 @@ msgstr ""
msgid "add toolbar button"
msgstr "afig un botó a la barra d''eines"
+msgid "Invalid search expression"
+msgstr "L''expressió de cerca no és vàlida"
+
msgid "Filter"
msgstr "Filtre"
@@ -2558,9 +2572,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "L''expressió de cerca no és vàlida"
-
msgid "basic examples"
msgstr "exemples bàsics"
@@ -3434,12 +3445,12 @@ msgstr "Imperial"
msgid "Nautical Mile"
msgstr "Milla nàutica"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "El recurs ''{0}'' no ha pogut ser carregat. Error: {1}"
-
msgid "UNKNOWN"
msgstr "Desconegut"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
"Número inesperat de la versió de JOSM al fitxer de revisió, el valor és "
@@ -5111,6 +5122,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "Menú: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "Barra d''eines d''edició"
@@ -5289,14 +5307,10 @@ msgstr "fins la tessel·la"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Alternativament podeu introduir una <strong>adreça d''una "
-"tessel·la</strong> particular en el format <i>ampliació/x/y</i>, i.e. "
-"<i>15/256/223</i>. També són vàlides les adreces de tessel·la en els formats "
-"<i>ampliació,x,y</i> i <i>ampliació;x;y</i>.</html>"
msgid "Tile address:"
msgstr "Adreça de la tessel·la:"
@@ -6158,26 +6172,15 @@ msgstr "Resol conflictes"
msgid "Resolve conflicts for ''{0}''"
msgstr "Resoldre els conflictes per ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Per favor confirmeu la supressió d''<strong>1 objecte</strong> "
-"d''<strong>1 relació</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Per favor confirmeu la supressió d''<strong>1 objecte</strong> de "
-"<strong>{0} relacions</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Per favor confirmeu la supressió de <strong>{0} objectes</strong> de "
-"<strong>{1} relacions</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7504,14 +7507,17 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr "<diferent>"
+
msgid "Member Of"
msgstr "Membre de"
msgid "Position"
msgstr "Posició"
-msgid "<different>"
-msgstr "<diferent>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -13075,6 +13081,9 @@ msgstr ""
"El nombre d''etiquetes predefinides \"{0}-{1}\" no és coherent. El nombre "
"d''elements ''display_values'' ha de ser el mateix que el de ''values''"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13265,6 +13274,9 @@ msgstr "Descarregant punts del {0} al {1}..."
msgid "Contacting OSM Server..."
msgstr "Contactant amb el servidor OSM..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Ha fallat l''obertura d''un fux d''entrada pel recurs ''{0}''"
@@ -15451,6 +15463,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "matolls"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "carrer associat"
@@ -16058,6 +16074,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -16085,7 +16104,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -16661,6 +16683,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -16826,6 +16851,11 @@ msgstr ""
"Permet l''usuari d''anonimitzar la data i hora i esborrar parts de grans "
"tracks GPX de manera molt ràpida."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
"Mostra el perfil vertical i d''altres dades estadístiques d''un track GPX."
@@ -16873,6 +16903,11 @@ msgstr "Permet de filtrar tracks GPX innecessaris"
msgid "Visualizes routing information as a routing graph."
msgstr "Visualitza informació de càlcul de rutes gràficament."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "Eina simple per posar nombre a les cases"
@@ -17375,9 +17410,21 @@ msgstr "fangar"
msgid "Lanes"
msgstr "Carrils"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Velocitat màxima (km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Pont"
@@ -17445,6 +17492,9 @@ msgstr "revestiment"
msgid "spur"
msgstr "línia secundària"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Electrificada"
@@ -17539,6 +17589,9 @@ msgstr "separat"
msgid "isolated"
msgstr "aïllat"
+msgid "outside"
+msgstr "exterior"
+
msgid "Height (meters)"
msgstr "Altura (metres)"
@@ -18079,6 +18132,9 @@ msgstr "Peatge"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -18100,12 +18156,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "aigua"
+
+msgid "gas"
+msgstr "gas"
+
+msgid "heat"
+msgstr "calor"
+
+msgid "oil"
+msgstr "oli"
+
+msgid "sewage"
+msgstr "aigües residuals"
+
+msgid "Support"
+msgstr "Suport"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "pal"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "mural"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "tanca publicitària"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "sòl"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Carrers"
msgid "Motorway"
msgstr "Autopista/Autovia"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Enllaç d''autopista"
@@ -18207,6 +18339,9 @@ msgstr "via d''aparcament"
msgid "drive-through"
msgstr "accés a servei amb cotxe (drive-through)"
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Via d''aparcament"
@@ -18760,12 +18895,15 @@ msgstr "Cercle de gir"
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
-msgstr "Límit de població"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Segon nom"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Radar"
@@ -18883,6 +19021,12 @@ msgstr "Guarda-rail"
msgid "Wall"
msgstr "Mur"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Muralla"
@@ -19288,6 +19432,15 @@ msgstr "GNC (Gas Natural Comprimit)"
msgid "Pier"
msgstr "Embarcador"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Resclosa"
@@ -19928,12 +20081,6 @@ msgstr "Aeroport"
msgid "Airport Ground"
msgstr "Aeròdrom"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Pista"
@@ -20117,6 +20264,9 @@ msgstr "Microcerveseria"
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Menjar ràpid"
@@ -20779,25 +20929,6 @@ msgstr "rellotge de sol"
msgid "unorthodox"
msgstr "no ortodox"
-msgid "Support"
-msgstr "Suport"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "pal"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "mural"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "tanca publicitària"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "sòl"
-
msgid "Visibility/readability"
msgstr "Visibilitat/llegibilitat"
@@ -21377,6 +21508,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -21575,32 +21714,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "Canonada"
-
-msgid "water"
-msgstr "aigua"
-
-msgid "gas"
-msgstr "gas"
-
-msgid "heat"
-msgstr "calor"
-
-msgid "oil"
-msgstr "oli"
-
-msgid "sewage"
-msgstr "aigües residuals"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "submarí"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "en superfície"
-
msgid "Crane"
msgstr "Grua"
@@ -21685,6 +21798,23 @@ msgstr "Boca mina"
msgid "Length in meters"
msgstr "Longitud en metres"
+msgid "Pipeline"
+msgstr "Canonada"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "submarí"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "en superfície"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Torre d''aigua"
@@ -21925,6 +22055,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "Central elèctrica"
@@ -23090,6 +23248,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Geografia"
@@ -23429,6 +23678,29 @@ msgstr "Corral"
msgid "Farmland"
msgstr "Terres de cultiu"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Prat"
@@ -24412,6 +24684,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr "relació sense tipus"
@@ -24469,6 +24744,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 fitxers CSV"
@@ -26657,7 +26938,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -26700,9 +26984,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -29494,6 +29778,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Voleu guardar el calibratge de la capa {0}?"
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "Carrega el calibratge de la fotografia..."
@@ -29503,6 +29790,9 @@ msgstr "Carrega dades de calibratge d''un fitxer"
msgid "Loading file failed: {0}"
msgstr "Ha fallat la càrrega del fitxer: {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr "Carrega l''arxiu de calibració mundial"
@@ -29542,6 +29832,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "Desplaçament de PicLayer"
@@ -29660,8 +29953,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "Voleu aplicar-ho?"
-msgid "Load calibration file ?"
-msgstr "Carregar fitxer de calibració?"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr "Serà aplicat automàticament."
@@ -29900,9 +30193,6 @@ msgstr "Comunitat autònoma/Estat federal"
msgid "pending"
msgstr "pendent"
-msgid "outside"
-msgstr "exterior"
-
msgid "[incomplete]"
msgstr "[incomplet]"
diff --git a/i18n/po/cs.po b/i18n/po/cs.po
index 7a6fc30..ac6e5ef 100644
--- a/i18n/po/cs.po
+++ b/i18n/po/cs.po
@@ -1,22 +1,23 @@
# Czech translation for josm
# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
# This file is distributed under the same license as the josm package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
#
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2008, 2015.
+# Marian Kyral <mkyral at email.cz>, 2015.
msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-19 09:50+0000\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-19 06:29+0000\n"
"Last-Translator: Dalibor Jelínek <launchpad.net at dalibor.cz>\n"
-"Language-Team: Czech <cs at li.org>\n"
+"Language-Team: Czech <kde-i18n-doc at kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:37+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:37+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: cs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -47,7 +48,7 @@ msgid "{0}: option requires an argument -- {1}"
msgstr "{0}: volba vyžaduje argument -- {1}"
msgid "Invalid value {0} for parameter ''has_arg''"
-msgstr "Neplatná hodnota {0} parameteru ''has_arg''"
+msgstr "Neplatná hodnota {0} parametru ''has_arg''"
msgid "Background Terms of Use"
msgstr "Podmínky použití podkladové mapy"
@@ -115,7 +116,7 @@ msgid ""
"compatible) version of JOSM.</li></ul>More Info:"
msgstr ""
"<h2>JOSM potřebuje Javu verze {0}.</h2>Zjištěná verze Javy: {1}.<br>Můžete "
-"<ul><li>aktualizovat vaši Javu (JRE), nebo</li><li>použít starší vezi JOSM "
+"<ul><li>aktualizovat vaši Javu (JRE), nebo</li><li>použít starší verzi JOSM "
"(kompatibilní s Javou {2}).</li></ul>Více informací:"
msgid "Exit JOSM"
@@ -172,6 +173,12 @@ msgstr "Doplňky"
msgid "About JOSM..."
msgstr "O JOSM…"
+msgid "Failed to locate resource ''{0}''."
+msgstr "Nepodařilo se najít zdroj ''{0}''."
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Nepodařilo se načíst zdroj ''{0}'', chyba je {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -236,7 +243,7 @@ msgid "Add imagery layer {0}"
msgstr "Přidat vrstvu podkladových map {0}"
msgid "Select image format for WMS layer"
-msgstr "Zvolit fomát obrazu vrstvy WMS"
+msgstr "Zvolit formát obrazu vrstvy WMS"
msgid "Select WMS layers"
msgstr "Vybrat WMS vrstvy"
@@ -280,7 +287,7 @@ msgid "Not enough nodes in selected ways."
msgstr "Ve vybraných cestách není dostatek uzlů."
msgid "Please select at least four nodes."
-msgstr "Vyberte mininálně čtyří uzly."
+msgstr "Vyberte minimálně čtyři uzly."
msgid "Cannot determine center of selected nodes."
msgstr "Nelze určit střed vybraných uzlů."
@@ -746,7 +753,7 @@ msgid "Move Node onto Way"
msgstr "Přesunout uzel na cestu"
msgid "Move the node onto the nearest way segments and include it"
-msgstr "Přesunout uzel na nejbližsí segment cesty a vložit ho do něj"
+msgstr "Přesunout uzel na nejbližší segment cesty a vložit ho do něj"
msgid "No Shortcut"
msgstr "Žádná zkratka"
@@ -894,7 +901,7 @@ msgid "Merge the currently selected objects into another layer"
msgstr "Spojit vybrané objekty do jiné vrstvy."
msgid "Merging too many objects with different upload policies"
-msgstr "Slučení mnoha objektů s rozličnými metodami uploadu"
+msgstr "Sloučení mnoha objektů s rozličnými metodami uploadu"
msgid ""
"You are about to merge more than 1 object between layers ''{0}'' and "
@@ -1483,7 +1490,7 @@ msgid "Segment {0}: {1}"
msgstr "Část {0}: {1}"
msgid "You must select two or more nodes to split a circular way."
-msgstr "Musíte zvolit dva nebo více uzlů pro rozdělění kruhové cesty."
+msgstr "Musíte zvolit dva nebo více uzlů pro rozdělení kruhové cesty."
msgid ""
"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1683,7 +1690,7 @@ msgid ""
msgstr "Aktualizuje vybrané objekty ze serveru (znovu stáhne data)"
msgid "There are no selected objects to update."
-msgstr "Nejsou vybrány žádne objekty k aktualizaci."
+msgstr "Nejsou vybrány žádné objekty k aktualizaci."
msgid "Selection empty"
msgstr "Prázdný výběr"
@@ -1919,7 +1926,7 @@ 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"
+msgstr "Stáhnout poznámku OSM podle ID"
msgid "Download Compressed OSM Change"
msgstr "Stáhnout komprimovanou změnu OSM"
@@ -1956,7 +1963,7 @@ msgid "Request details: {0}"
msgstr "Detaily dotazu: {0}"
msgid "Download OSM URL"
-msgstr "Stiahnuť OSM URL"
+msgstr "Stáhnout OSM URL"
msgid "There was {0} conflict during import."
msgid_plural "There were {0} conflicts during import."
@@ -2188,7 +2195,7 @@ msgid "Dual alignment"
msgstr "Dvojité zarovnávání"
msgid "Switch dual alignment mode while extruding"
-msgstr "Zapnout režim dvojitého zarovnávání pri vytahování"
+msgstr "Zapnout režim dvojitého zarovnávání při vytahování"
msgid "Extrude"
msgstr "Tažení"
@@ -2304,26 +2311,25 @@ msgstr ""
"Vybrané cesty musí tvořit jedinou nerozvětvenou dráhu"
msgid "Drag play head"
-msgstr "Posunout symbol přehrávání"
+msgstr "Posunout ukazatel přehrávání"
msgid ""
"Drag play head and release near track to play audio from there; "
"SHIFT+release to synchronize audio at that point."
msgstr ""
-"Pro přehrání zvuku od určitého místa přetáhněte symbol přehrávání poblíž GPS "
-"záznamu. Chcete-li v tomto bodě synchronizovat zvuk podržte Shift."
+"Pro přehrání zvuku od určitého místa přetáhněte ukazatel přehrávání poblíž "
+"GPS záznamu. Chcete-li v tomto bodě synchronizovat zvuk, podržte klávesu "
+"Shift."
msgid "Select, move, scale and rotate objects"
msgstr "Vybrat, přesouvat, měnit velikost a otáčet objekty"
-msgid "Move elements"
-msgstr "Přesun prvků"
-
-msgid "Move them"
-msgstr "Přesunout je"
-
-msgid "Undo move"
-msgstr "Vrátit přesun zpět"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
+"Jste si jisti, že chcete posunout prvky s připojenými cestami, které jsou "
+"skryté filtry?"
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2346,6 +2352,15 @@ msgstr[2] ""
"provedeno spíše omylem.\n"
"Opravdu je chcete přesunout?"
+msgid "Move elements"
+msgstr "Přesun prvků"
+
+msgid "Move them"
+msgstr "Přesunout je"
+
+msgid "Undo move"
+msgstr "Vrátit přesun zpět"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Pusťte tlačítko myši k vybrání objektů v obdélníku"
@@ -2353,7 +2368,7 @@ msgid "Ctrl to merge with nearest node."
msgstr "Ctrl pro sloučení s nejbližším uzlem"
msgid "Release the mouse button to stop moving."
-msgstr "Uvolněte tlačitko myši pro zastavení pohybu."
+msgstr "Uvolněte tlačítko myši pro zastavení pohybu."
msgid "Release the mouse button to stop rotating."
msgstr "Pusťte tlačítko myši pro zastavení otáčení."
@@ -2556,6 +2571,9 @@ msgstr "Selektor MapCSS"
msgid "add toolbar button"
msgstr "Přidat tlačítko do nástrojové lišty"
+msgid "Invalid search expression"
+msgstr "Neplatný vyhledávaný výraz"
+
msgid "Filter"
msgstr "Filtr"
@@ -2577,9 +2595,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Neplatný vyhledávaný výraz"
-
msgid "basic examples"
msgstr "Základní příklady"
@@ -3000,9 +3015,9 @@ msgstr "Nastavit {0}={1} pro relaci ''{2}''"
msgid "Remove \"{0}\" for {1} object"
msgid_plural "Remove \"{0}\" for {1} objects"
-msgstr[0] "Ostranit \"{0}\" z {1} objektu"
-msgstr[1] "Ostranit \"{0}\" ze {1} objektů"
-msgstr[2] "Ostranit \"{0}\" ze {1} objektů"
+msgstr[0] "Odstranit \"{0}\" z {1} objektu"
+msgstr[1] "Odstranit \"{0}\" ze {1} objektů"
+msgstr[2] "Odstranit \"{0}\" ze {1} objektů"
msgid "Set {0}={1} for {2} object"
msgid_plural "Set {0}={1} for {2} objects"
@@ -3374,7 +3389,7 @@ msgid "Unable to set file non-executable {0}"
msgstr "Nemohu nastavit soubor na nespustitelný {0}"
msgid "Unable to set file readable {0}"
-msgstr "Nemohu nastasvit soubor na čitelný {0}"
+msgstr "Nemohu změnit soubor na čitelný {0}"
msgid "Unable to set file writable {0}"
msgstr "Nemohu nastavit soubor na zapisovatelný {0}"
@@ -3397,7 +3412,7 @@ msgid ""
"Failed to initialize preferences. Failed to create missing preference "
"directory: {0}"
msgstr ""
-"Předvolby se nepodařilo inicializovat. Chybějící adresář s předvobami "
+"Předvolby se nepodařilo inicializovat. Chybějící adresář s předvolbami "
"\"{0}\" nelze vytvořit."
msgid ""
@@ -3473,12 +3488,12 @@ msgstr "Imperiální"
msgid "Nautical Mile"
msgstr "Námořní míle"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Nepodařilo se načíst zdroj ''{0}'', chyba je {1}."
-
msgid "UNKNOWN"
msgstr "NEZNÁMÁ"
+msgid "Error reading revision info from revision file: {0}"
+msgstr "Chyba při čtení informace o revizi ze souboru revize: {0}"
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr "Neočekávané číslo veze JOSM v revizním souboru \"{0}\""
@@ -3688,7 +3703,7 @@ msgid ""
msgstr "Nelze porovnat objekt s id ''{0}'' s objektem s id ''{1}''."
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
-msgstr "parameter {0} není v rozsahu 0..{1}, zadáno {2}"
+msgstr "Parametr {0} není v rozsahu 0..{1}, zadáno {2}"
msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr "Nelze načíst třídu map rendereru ''{0}''. Třída nebyla nalezena."
@@ -3696,10 +3711,10 @@ msgstr "Nelze načíst třídu map rendereru ''{0}''. Třída nebyla nalezena."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
msgstr ""
-"Nelze aktivovat třídu mapového renederu ''{0}'', protože nebyla nalezena."
+"Nelze aktivovat třídu mapového rendereru ''{0}'', protože nebyla nalezena."
msgid "Activating the standard map renderer instead."
-msgstr "Aktivace standardního mapového renederu."
+msgstr "Aktivace standardního mapového rendereru."
msgid ""
"Can''t activate map renderer class ''{0}'', because it isn''t a subclass of "
@@ -3719,13 +3734,13 @@ msgid "Wireframe Map Renderer"
msgstr "Drátový mapový renderer"
msgid "Renders the map as simple wire frame."
-msgstr "Renederuje mapu jako jednoduchý drátový model"
+msgstr "Renderuje mapu jako jednoduchý drátový model"
msgid "Styled Map Renderer"
msgstr "Stylovaný mapový renderer"
msgid "Renders the map using style rules in a set of style sheets."
-msgstr "Renederuje mapu za pomoci sad pravidel a stylů."
+msgstr "Renderuje mapu za pomoci sad pravidel a stylů."
msgid "inactive"
msgstr "neaktivní"
@@ -3857,7 +3872,7 @@ msgid "Parameter ''{0}'' required."
msgstr "Parametr ''{0}'' je vyžadován."
msgid "Lambert Conformal Conic"
-msgstr "Lamertovo úhlojevné kuželové zobrazení"
+msgstr "Lambertovo úhlojevné kuželové zobrazení"
msgid "Lat/lon (Geodetic)"
msgstr "Šířka/Délka (geodetické)"
@@ -3937,7 +3952,7 @@ msgid "House number without street"
msgstr "Číslo domu bez ulice"
msgid "House number ''{0}'' duplicated"
-msgstr "Číslo domu ''{0}'' je duplicitné"
+msgstr "Číslo domu ''{0}'' je duplicitní"
msgid "Duplicate house numbers"
msgstr "Duplicitní čísla domů"
@@ -4210,7 +4225,7 @@ msgid "Role for ''{0}'' should be ''{1}''"
msgstr "Role u ''{0}'' by měla být ''{1}''"
msgid "No area style for multipolygon"
-msgstr "Multipolychon nemá žádný styl plochy"
+msgstr "Multipolygon nemá žádný styl plochy"
msgid ""
"Multipolygon relation should be tagged with area tags and not the outer way"
@@ -4318,8 +4333,8 @@ msgid ""
"This test checks that a connection between two nodes is not used by more "
"than one way."
msgstr ""
-"Tento test kontroluje, jestli spojnice mezi dvěmi uzly není používána více, "
-"jak jednou cestou."
+"Tento test kontroluje, zda spojnice mezi dvěma uzly není používána více, jak "
+"jednou cestou."
msgid "Areas share segment"
msgstr "Plochy sdílejí úsek cesty"
@@ -4425,7 +4440,7 @@ msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Neplatný řádek při kontrole značek - {0}: {1}"
msgid "Invalid spellcheck line: {0}"
-msgstr "Neplatná řádek při kotrole pravopisu: {0}"
+msgstr "Neplatný řádek při kontrole pravopisu: {0}"
msgid "Adding {0} to spellchecker"
msgstr "Přidávám {0} ke kontrole pravopisu"
@@ -5111,8 +5126,8 @@ msgid ""
"missing proxy configuration.<br>Would you like to change your proxy settings "
"now?"
msgstr ""
-"JOSM sa pokusil přistoupit k následujícím zdrojům:<br>{0}avšak "
-"<b>neúspěšne</b>, kvůli následujícím chybám v síti:<br>{1}Může to být "
+"JOSM se pokusil přistoupit k následujícím zdrojům:<br>{0}avšak "
+"<b>neúspěšně</b>, kvůli následujícím chybám v síti:<br>{1}Může to být "
"důsledek chybějícího nastavení proxy serveru.<br>Chcete teď změnit nastavení "
"proxy?"
@@ -5161,11 +5176,18 @@ msgstr "Okna"
msgctxt "menu"
msgid "Help"
-msgstr "Napověda"
+msgstr "Nápověda"
msgid "Menu: {0}"
msgstr "Menu: {0}"
+msgid "Main toolbar"
+msgstr "Hlavní nástrojová lišta"
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr "Přepíná viditelnost hlavní nástrojové lišty (horizontální)."
+
msgid "Edit toolbar"
msgstr "Editační nástrojová lišta"
@@ -5236,7 +5258,7 @@ msgid "Status bar background"
msgstr "Pozadí stavového řádku"
msgid "Status bar background: active"
-msgstr "Pozadí stavového řádku: aktviní"
+msgstr "Pozadí stavového řádku: aktivní"
msgid "Status bar foreground"
msgstr "Popředí stavového řádku"
@@ -5344,13 +5366,13 @@ msgstr "do dlaždice"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Alternativně můžete zadat <strong>adresu jediné dlaždice</strong> ve "
-"formátu <i>zoomlevel/x/y</i>, např. <i>15/256/223</i>. Případně je možné "
-"také použít formát <i>zoom,x,y</i> nebo <i>zoom;x;y</i>.</html>"
+"<html>Volitelně můžete zadat <strong>adresu dlaždice</strong> jedné dlaždice "
+"ve formátu <i>zvětšení/x/y</i>, např. <i>15/256/223</i>. Adresy dlaždic ve "
+"formátu <i>zvětšení,x,y</i> nebo <i>zvětšení;x;y</i> jsou také platné.</html>"
msgid "Tile address:"
msgstr "Adresa dlaždice:"
@@ -5447,10 +5469,10 @@ msgid "Conflict foreground: keep all tags"
msgstr "Popředí konfliktu: ponechat všechny značky"
msgid "Conflict background: sum all numeric tags"
-msgstr "Pozadí kofliktu: součet všech číslených značek"
+msgstr "Pozadí konfliktu: součet všech číselných značek"
msgid "Conflict foreground: sum all numeric tags"
-msgstr "Popředí konfliktu: součet všech číslených značek"
+msgstr "Popředí konfliktu: součet všech číselných značek"
msgid "Conflict background: keep member"
msgstr "Pozadí konfliktu: ponechat člen"
@@ -5691,7 +5713,7 @@ msgid "Freeze"
msgstr "Blokovat"
msgid "Freeze the current list of merged elements."
-msgstr "Blokovat aktuání seznam slučovaných elementů."
+msgstr "Blokovat aktuální seznam slučovaných elementů."
msgid "Unfreeze"
msgstr "Odblokovat"
@@ -5703,14 +5725,14 @@ msgid ""
"<html>Click <strong>{0}</strong> to start merging my and their "
"entries.</html>"
msgstr ""
-"<html>Kliněte <strong>{0}</strong> pro zahájení slučování mých a cizích "
+"<html>Klikněte <strong>{0}</strong> pro zahájení slučování mých a cizích "
"položek</html>"
msgid ""
"<html>Click <strong>{0}</strong> to finish merging my and their "
"entries.</html>"
msgstr ""
-"<html>Kliněte <strong>{0}</strong> pro dokončení slučování mých a cizích "
+"Klikněte <strong>{0}</strong> pro dokončení slučování mých a cizích "
"položek</html>"
msgid "My version ({0} entry)"
@@ -6059,7 +6081,7 @@ msgstr ""
"<html>Spojené cesty jsou členy jedné nebo více relací. Rozhodněte, prosím, "
"jestli chcete <strong>ponechat</strong> toto členství u spojené cesty, nebo "
"jestli je chcete <strong>odebrat</strong>.<br>Výchozí rozhodnutí je "
-"<strong>ponechat</strong> první cestu a <strong>ostranit</strong> ostatní "
+"<strong>ponechat</strong> první cestu a <strong>odstranit</strong> ostatní "
"cesty, které jsou členy té samé relace. Spojená cesta tedy zaujme v relaci "
"místo původní cesty.</html>"
@@ -6074,7 +6096,7 @@ msgstr ""
"<html>Spojené uzly jsou členy jedné nebo více relací. Rozhodněte, prosím, "
"jestli chcete <strong>ponechat</strong> toto členství u cílového uzlu, nebo "
"jestli je chcete <strong>odebrat</strong>.<br>Výchozí rozhodnutí je "
-"<strong>ponechat</strong> první uzel a <strong>ostranit</strong> ostatní "
+"<strong>ponechat</strong> první uzel a <strong>odstranit</strong> ostatní "
"uzly, které jsou členy té samé relace. Cílový uzel tedy zaujme v relaci "
"místo původního uzlu.</html>"
@@ -6246,26 +6268,17 @@ msgstr "Vyřešit konflikty"
msgid "Resolve conflicts for ''{0}''"
msgstr "Vyřešit konflikty pro ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Prosím potvrďte odstranění <strong>1 objektu</strong> z <strong>1 "
-"relace</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] "Prosím, potvrďte odstranění <strong>{0} objektu</strong>."
+msgstr[1] "Prosím, potvrďte odstranění <strong>{0} objektů</strong>."
+msgstr[2] "Prosím, potvrďte odstranění <strong>{0} objektů</strong>."
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Prosím potvrďte odstranění <strong>1 objektu</strong> z <strong>{0} "
-"relací</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Prosím potvrďte odstranění <strong>{0} objektů</strong> z <strong>{1} "
-"relací</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] "{0} relace je ovlivněna."
+msgstr[1] "{0} relace jsou ovlivněny."
+msgstr[2] "{0} relací je ovlivněno."
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6650,7 +6663,7 @@ msgid "Gamma"
msgstr "Gama"
msgid "Adjust gamma value of the layer."
-msgstr "Nastavit hodnotu gama poskladové vrstvy."
+msgstr "Nastavit hodnotu gama podkladové vrstvy."
msgid "Activate"
msgstr "Aktivovat"
@@ -6881,7 +6894,7 @@ msgid "New"
msgstr "Nový"
msgid "Relations: {0}/{1}"
-msgstr "Relácie: {0}/{1}"
+msgstr "Relace: {0}/{1}"
msgid "Relations: {0}"
msgstr "Relace: {0}"
@@ -6929,7 +6942,7 @@ msgid "Toggle dynamic buttons"
msgstr "Přepíná dynamická tlačítka"
msgid "Open preferences for this panel"
-msgstr "Otevřít nastavení tohto panelu"
+msgstr "Otevřít nastavení tohoto panelu"
msgid "Undock the panel"
msgstr "Vytrhnout panel"
@@ -7180,7 +7193,7 @@ msgid "Nothing to zoom to"
msgstr "Není co zvětšovat"
msgid "The content of this changeset is not downloaded yet."
-msgstr "Obsah této sady změn ještě nebyl stáhnut."
+msgstr "Obsah této sady změn ještě nebyl stažen."
msgid "Download now"
msgstr "Stáhnout nyní"
@@ -7435,7 +7448,7 @@ msgid ""
"<html>Select to restrict the query to your changesets only.<br>Unselect to "
"include all changesets in the query.</html>"
msgstr ""
-"<html>Zašktrněte, pokud chcete dotaz omezit pouze na vaše sady změn "
+"<html>Zatrhněte, pokud chcete dotaz omezit pouze na vaše sady změn "
"dat.<br>Jinak zahrne do dotazu všechny změny sady změn dat.</html>"
msgid ""
@@ -7579,14 +7592,17 @@ msgstr "Značky/Členství"
msgid "Tags for selected objects."
msgstr "Značky vybraných objektů."
+msgid "<different>"
+msgstr "<různé>"
+
msgid "Member Of"
msgstr "Člen"
msgid "Position"
msgstr "Pozice"
-msgid "<different>"
-msgstr "<různé>"
+msgid "Tag filter"
+msgstr "Filtr značek"
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Objektů: {2} / Značek: {0} / Členství: {1}"
@@ -7634,13 +7650,13 @@ msgid "Go to Taginfo"
msgstr "Jít na Taginfo"
msgid "Launch browser with Taginfo statistics for selected object"
-msgstr "Spustit prohlížeč se statistikou Taginfor pro zvolený objekt"
+msgstr "Spustit prohlížeč se statistikou Taginfo pro zvolený objekt"
msgid "Paste Value"
msgstr "Vložit hodnotu"
msgid "Paste the value of the selected tag from clipboard"
-msgstr "Vložit hodotu vybrané značky ze schránky"
+msgstr "Vložit hodnotu vybrané značky ze schránky"
msgid "Copy Value"
msgstr "Kopírovat hodnotu"
@@ -7728,10 +7744,10 @@ msgid "Please select a value"
msgstr "Vyberte hodnotu"
msgid "Set number of recently added tags"
-msgstr "Nastavte počet novo pridaných značiek"
+msgstr "Nastavte počet nově přidaných značek"
msgid "Remember last used tags after a restart"
-msgstr "Pamatovat si napodle použité značky po restartu"
+msgstr "Pamatovat si naposledy použité značky po restartu"
msgid "to apply first suggestion"
msgstr "aplikovat první návrh"
@@ -7743,7 +7759,7 @@ msgid "to add first suggestion without closing the dialog"
msgstr "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"
+msgstr "Zadejte prosím počet nedávno přidaných značek pro zobrazení"
msgid "Please enter integer number between 0 and {0}"
msgstr "Vložte prosím celé číslo mezi 0 a {0}"
@@ -7752,7 +7768,7 @@ msgid "Recently added tags"
msgstr "Naposledy přidané značky"
msgid "Choose recent tag {0}"
-msgstr "Vybrať nedávnu značku {0}"
+msgstr "Vybrat nedávnou značku {0}"
msgid "Use this tag again"
msgstr "Použít tuto značku znovu"
@@ -7849,7 +7865,7 @@ msgid "New Relation"
msgstr "Nová relace"
msgid "Focus Relation Editor with relation ''{0}'' in layer ''{1}''"
-msgstr "Vystrediť Editor relácie s reláciou''{0}''vo vrstve''{1}''"
+msgstr "Vystředit Editor relace s relací''{0}''ve vrstvě''{1}''"
msgid "Relation Editor: {0}"
msgstr "Editor relací: {0}"
@@ -7997,8 +8013,8 @@ msgid ""
"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please "
"resolve this conflict first, then try again.</html>"
msgstr ""
-"<html>Vrstva ''{0}'' už má konflikt na objekte <br>''{1}''.<br> Prosím "
-"vyriešte najskôr tento konflikt, potom to skúste znova.</html>"
+"<html>Vrstva ''{0}'' už má konflikt na objektu <br>''{1}''.<br> Prosím "
+"vyřešte nejprve tento konflikt a potom to zkuste znova.</html>"
msgid "Apply the current updates"
msgstr "Aplikovat aktuální změny"
@@ -8356,16 +8372,16 @@ msgid "Click to start searching for places"
msgstr "Klikněte pro zahájení hledání míst"
msgid "Querying name server"
-msgstr "Dotazuji se jmeného serveru"
+msgstr "Dotazuji se jmenného serveru"
msgid "Querying name server ..."
-msgstr "Dotazuji se jmeného serveru ..."
+msgstr "Dotazuji se jmenného serveru ..."
msgid "Error occured with query ''{0}'': ''{1}''"
msgstr "Došlo k chybě při dotazu ''{0}'': ''{1}''"
msgid "Name server returned invalid data. Please try again."
-msgstr "Jmenný server vrátil nepoužitelná data. Zkute to prosím znovu."
+msgstr "Jmenný server vrátil nepoužitelná data. Zkuste to prosím znovu."
msgid "Bad response"
msgstr "Chybná odpověď"
@@ -8484,28 +8500,30 @@ msgstr "Aktualizovat historii ze serveru"
msgid "History not initialized yet. Failed to set reference primitive."
msgstr ""
-"História nie je zatiaľ inicializovaná. Neporadilo sa nastaviť odkaz na "
-"základný objekt."
+"Historie ještě není inicializovaná. Nepodařilo se nastavit odkaz na základní "
+"objekt."
msgid ""
"Failed to set reference. Reference ID {0} does not match history ID {1}."
msgstr ""
-"Neúspešné nastavenie odkazu. Odkaz id {0} je nenájdený v histórii id {1}."
+"Neúspěšné nastavení odkazu. Odkaz id {0} nebyl nalezen v historii id {1}."
msgid ""
"Failed to set reference. Reference version {0} not available in history."
-msgstr "neúspešný zadaný odkaz. verzia odkazu {0} nie je platná v priebehu"
+msgstr ""
+"Nepodařilo se nastavit odkaz na objekt. Verze odkazu {0} není v historii "
+"dostupná."
msgid "History not initialized yet. Failed to set current primitive."
msgstr ""
-"História nie je ešte inicializovaná. Nepodarilo sa nastaviť základný objekt."
+"Historie ještě není inicializovaná. Nepodařilo se nastavit základní objekt."
msgid ""
"Failed to set current primitive. Current version {0} not available in "
"history."
msgstr ""
-"Nepodarilo sa nastaviť základný objekt. Aktuálna verzia {0} nie je platná v "
-"priebehu histórie."
+"Nepodařilo se nastavit odkaz na objekt. Aktuální verze {0} nebyla v historii "
+"nalezena."
msgid "Load history"
msgstr "Načíst historii"
@@ -8618,7 +8636,7 @@ msgid "Synchronize way {0} only"
msgstr "Synchronizovat pouze cestu {0}"
msgid "Synchronize relation {0} only"
-msgstr "Syncronizovat pouze relaci {0}"
+msgstr "Synchronizovat pouze relaci {0}"
msgid "Synchronize entire dataset"
msgstr "Synchronizovat celou datovou sadu"
@@ -8700,7 +8718,7 @@ msgid ""
"left.</html>"
msgstr ""
"<html>Vyberte akce které chcete použít pro tuto vrstvu po kliknutí na "
-"tlačítko vlevo.<br/>Zašktněte \"Nahrát na server\", pokud chcete změny "
+"tlačítko vlevo.<br/>Zatrhněte \"Nahrát na server\", pokud chcete změny "
"odeslat na OSM server.<br/>Zaškrtněte \"Uložit\", pokud chcete změny uložit "
"do souboru zadaného vlevo.</html>"
@@ -8757,7 +8775,7 @@ msgid "Close changeset after upload"
msgstr "Zavřít sadu změn po nahrání"
msgid "Select to close the changeset after the next upload"
-msgstr "Vyberte, aby byla sada změn uzvařena po následujícím nahrání"
+msgstr "Vyberte, aby byla sada změn uzavřena po následujícím nahrání"
msgid "Load the list of your open changesets from the server"
msgstr "Načíst ze serveru seznam vašich otevřených sad změn"
@@ -8796,7 +8814,7 @@ msgid "Enter credentials for OSM API"
msgstr "Zadejte přihlašovací údaje pro OSM API"
msgid "Enter credentials for host"
-msgstr "Zadajte přihlašovací údaje pro hostitele"
+msgstr "Zadejte přihlašovací údaje pro hostitele"
msgid "Enter credentials for HTTP proxy"
msgstr "Zadejte přihlašovací údaje pro HTTP proxy"
@@ -8830,8 +8848,8 @@ msgid ""
"Authenticating at the host ''{0}'' failed. Please enter a valid username and "
"a valid password."
msgstr ""
-"Overovanie na hostiteľovi ''{0}'' zlyhalo. Prosím, zadajte platné "
-"používateľské meno a platné heslo."
+"Ověření na hostiteli ''{0}'' selhalo. Prosím, zadejte platné uživatelské "
+"jméno a platné heslo."
msgid "Please enter the user name for authenticating at your proxy server"
msgstr "Prosím, zadejte uživatelské jméno pro přístup na proxy server"
@@ -9417,8 +9435,8 @@ msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
msgstr ""
-"<html>Oznečené zmenené objekty <strong>z aktuálneho výberu</strong> bude "
-"nahratý na server.</html>"
+"<html>Označené změněné objekty <strong>z aktuálního výběru</strong> budou "
+"nahrány na server.</html>"
msgid ""
"<html>Mark <strong>locally deleted objects</strong> to be deleted on the "
@@ -9832,7 +9850,7 @@ msgid "Correlate to GPX"
msgstr "Korelovat vůči GPX"
msgid "Invalid timezone"
-msgstr "Nepatné časové pásmo"
+msgstr "Neplatné časové pásmo"
msgid "Invalid offset"
msgstr "Neplatný posun"
@@ -9961,9 +9979,9 @@ msgstr "Sekundy: {0}"
msgid "(Time difference of {0} day)"
msgid_plural "Time difference of {0} days"
-msgstr[0] "(Časova odchylka {0} den)"
-msgstr[1] "(Časova odchylka {0} dny)"
-msgstr[2] "(Časova odchylka {0} dnů)"
+msgstr[0] "(Časová odchylka {0} den)"
+msgstr[1] "(Časová odchylka {0} dny)"
+msgstr[2] "(Časová odchylka {0} dnů)"
msgid ""
"An error occurred while trying to match the photos to the GPX track. You can "
@@ -10016,7 +10034,7 @@ msgid "Extracting GPS locations from EXIF"
msgstr "Získávám polohu podle GPS z EXIF"
msgid "Starting directory scan"
-msgstr "Začínam prohledávat adresář"
+msgstr "Začínám prohledávat adresář"
msgid "Read photos..."
msgstr "Načíst fotografie..."
@@ -10089,7 +10107,7 @@ msgid "Show previous Image"
msgstr "Zobrazit předchozí obrázek"
msgid "Geoimage: {0}"
-msgstr "Geoobrázok: {0}"
+msgstr "Geoobrázek: {0}"
msgid "Remove photo from layer"
msgstr "Odebrat fotografii z vrstvy"
@@ -10119,7 +10137,7 @@ msgid "Zoom best fit and 1:1"
msgstr "Nejvhodnější zvětšení a 1:1"
msgid "Move dialog to the side pane"
-msgstr "Přesunout dialog do postraního panelu"
+msgstr "Přesunout dialog do postranního panelu"
msgid ""
"\n"
@@ -10163,10 +10181,10 @@ msgid "Show image thumbnails instead of icons."
msgstr "Zobrazit náhledy obrázků namísto ikon."
msgid "Choose visible tracks"
-msgstr "Vyberte viditeľné stopy"
+msgstr "Vyberte viditelné stopy"
msgid "Select by date"
-msgstr "Výber podľa dátumu"
+msgstr "Výběr podle data"
msgid ""
"<html>Select all tracks that you want to be displayed. You can drag select a "
@@ -10179,7 +10197,7 @@ msgstr ""
"něj.</html>"
msgid "Set track visibility for {0}"
-msgstr "Zvoliť viditeľnosť stopy pre {0}"
+msgstr "Vybrat viditelnost stopy pro {0}"
msgid "Show all"
msgstr "Zobrazit vše"
@@ -10204,16 +10222,16 @@ msgid "From"
msgstr "Od"
msgid "To"
-msgstr "Pre"
+msgstr "Pro"
msgid "No timestamp"
msgstr "Chybí časový údaj"
msgid "Select to download OSM data."
-msgstr "Zvolte, chete-li stáhnout data OSM."
+msgstr "Vyberte pro stažení OSM dat."
msgid "Select to download GPS traces."
-msgstr "Zvolte, chete-li stáhnout prošlé trasy GPS."
+msgstr "Zvolte, chcete-li stáhnout prošlé trasy GPS."
msgid "Download everything within:"
msgstr "Stáhnout vše v rozmezí:"
@@ -10237,10 +10255,10 @@ msgid "track and waypoints"
msgstr "trasy a body tras"
msgid "Click to download"
-msgstr "Kliknite pre stiahnutie"
+msgstr "Klikněte pro stáhnutí"
msgid "Click to cancel"
-msgstr "Kliknite pre zrušenie"
+msgstr "Klikněte pro zrušení"
msgid "Download from OSM along this track"
msgstr "Stáhnout data z OSM podél této trasy"
@@ -10296,7 +10314,7 @@ msgid "Import not possible"
msgstr "Import není možný"
msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audiosoubory (*.wav)"
+msgstr "Wave zvukové soubory (*.wav)"
msgid "Audio markers from {0}"
msgstr "Audio značky z {0}"
@@ -10376,7 +10394,7 @@ msgid "Unable to synchronize in layer being played."
msgstr "Není možno synchronizovat v již přehrávané vrstvě"
msgid "Make Audio Marker at Play Head"
-msgstr "Vytvořit Zvukovou značku v \"Play Head\""
+msgstr "Vytvořit Zvukovou značku v místě ukazatele přehrávání"
msgid ""
"You need to have paused audio at the point on the track where you want the "
@@ -10388,18 +10406,18 @@ msgid ""
"You need to drag the play head near to the GPX track whose associated sound "
"track you were playing (after the first marker)."
msgstr ""
-"Musíte přetáhnout tlačítko Play poblíž stopy GPX, jejíž přiřazenou zvukovou "
-"stopy jste přehrávali (za první značku)."
+"Musíte přetáhnout ukazatel přehrávání poblíž stopy GPX, jejíž přiřazenou "
+"zvukovou stopy jste přehrávali (za první značku)."
msgid ""
"You need to SHIFT-drag the play head onto an audio marker or onto the track "
"point where you want to synchronize."
msgstr ""
-"Potrebujete ťahať \"play head\" so stlačeným SHIFT až na audio značku, alebo "
-"až na track point, ktorý chcete zosynchronizovať."
+"Ukazatel přehrávání musíte táhnout se stisknutou klávesou Shift až na "
+"zvukovou značku, neboaž na bod stopy, který chcete sesynchronizovat."
msgid "Unable to create new audio marker."
-msgstr "Není možné vztvořit novou zvukovou značku"
+msgstr "Není možné vytvořit novou zvukovou značku"
msgid "There was an error while trying to display the URL for this marker"
msgstr "Při pokusu o zobrazení URL pro tuto značku došlo k chybě"
@@ -10408,7 +10426,7 @@ msgid "(URL was: "
msgstr "(URL bylo: "
msgid "Select the map painting styles"
-msgstr "Vybraẗ styl kreslení mapy"
+msgstr "Vybrat styl kreslení mapy"
msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr "Selhalo nahrání stylů kreslení mapy z ''{0}''. Došlo k výjimce: {1}"
@@ -10470,7 +10488,7 @@ msgid ""
"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
"to use the Access Token in this JOSM session only.</html>"
msgstr ""
-"<html>Zaškrtněte, pokud chcete uložit autorizační token do nastavení "
+"<html>Zatrhněte, pokud chcete uložit autorizační token do nastavení "
"JOSM.<br>Pokud nezaškrtnete, bude přístupový token použit pouze v tomto "
"sezení JOSM.</html>"
@@ -10484,7 +10502,7 @@ msgid "Consumer Secret:"
msgstr "Tajný klíč:"
msgid "Request Token URL:"
-msgstr "URL požadavkového tokenu:"
+msgstr "URL požadovaného tokenu:"
msgid "Access Token URL:"
msgstr "URL přístupového tokenu:"
@@ -10656,7 +10674,7 @@ msgid ""
"Please enter an OAuth Access Token which is authorized to access the OSM "
"server ''{0}''."
msgstr ""
-"Zadajte prosím OAuth autorizační přístup, který je oprávněný k přístupu k "
+"Zadejte prosím OAuth autorizační přístup, který je oprávněný k přístupu k "
"serveru OSM ''{0}''."
msgid "Access Token"
@@ -10714,7 +10732,7 @@ msgid "Get an Access Token for ''{0}''"
msgstr "Získání přístupového tokenu pro ''{0}''"
msgid "Close the dialog and cancel authorization"
-msgstr "Zavřit dialog a zrušit přihlášení"
+msgstr "Zavřít dialog a zrušit přihlášení"
msgid "Close the dialog and accept the Access Token"
msgstr "Zavřít dialog a přijmout přístupový token"
@@ -10747,7 +10765,7 @@ msgid "Initializing a session at the OSM website..."
msgstr "Inicializuji sezení na serveru OSM..."
msgid "Authenticating the session for user ''{0}''..."
-msgstr "Autetizační sezení pro uživatele ''{0}''..."
+msgstr "Autentizační sezení pro uživatele ''{0}''..."
msgid "Authorizing request token ''{0}''..."
msgstr "Autorizuji požadavkový token ''{0}''..."
@@ -10782,13 +10800,13 @@ msgstr "Povolit čtení vašich nastavení"
msgid "Select to grant JOSM the right to read your server preferences"
msgstr ""
-"Zaškrtnutím povolíte JOSM, aby načítal vaše uložená nastavení ze serveru"
+"Zatrhnutím povolíte JOSM, aby načítal vaše uložená nastavení ze serveru"
msgid "Allow to write your preferences"
msgstr "Povolit zápis vašich nastavení"
msgid "Select to grant JOSM the right to write your server preferences"
-msgstr "Zaškrtnutím povolíte JOSM, aby ukládal vaše nastavení na server"
+msgstr "Zatrhnutím povolíte JOSM, aby ukládal vaše nastavení na server"
msgid "Allow modifications of notes"
msgstr "Povolit změny poznámek (notes)"
@@ -10904,7 +10922,7 @@ msgid ""
"token.</html>"
msgstr ""
"<html>Nepodařil se přístup na OSM server ''{0}''<br>s autorizačním tokenem "
-"''{1}''.<br>Server zamítnul autorizační token jako neautorizovaný. Nebudete "
+"''{1}''.<br>Server zamítl autorizační token jako neautorizovaný. Nebudete "
"moci<br>přistupovat ke chráněnému obsahu na tomto serveru.</html>"
msgid "Test failed"
@@ -10941,7 +10959,7 @@ msgid ""
"''{1}''.<br>The token ist probably invalid.</html>"
msgstr ""
"<html>Nepodařilo se podepsat žádost pro OSM server ''{0}'' tokenem "
-"''{1}''.<br>Token je pravdepodobně neplatný.</html>"
+"''{1}''.<br>Token je pravděpodobně neplatný.</html>"
msgid ""
"<html>The test failed because the server responded with an internal "
@@ -11146,7 +11164,7 @@ msgid "Open JOSM customization file"
msgstr "Otevřít soubor přizpůsobení JOSM"
msgid "Import log"
-msgstr "Importovať log"
+msgstr "Importovat log"
msgid ""
"<html>Here is file import summary. <br/>You can reject preferences changes "
@@ -11272,7 +11290,7 @@ msgid "Display the Audio menu."
msgstr "Zobrazovat v menu nabídku Zvuk"
msgid "Label audio (and image and web) markers."
-msgstr "Popis zvukovej (obrázka a web) značky"
+msgstr "Popis zvukové (obrázku a web) značky"
msgid "Display live audio trace."
msgstr "Zobrazit živou zvukovou stopu."
@@ -11427,7 +11445,7 @@ msgid "Smooth map graphics (antialiasing)"
msgstr "Vyhlazovat zobrazení mapy (antialiasing)"
msgid "Smooth map graphics in wireframe mode (antialiasing)"
-msgstr "Vyhladiť mapy v režime drôtového modelu (antialiasing)"
+msgstr "Vyhladit mapy v režimu drátového modelu (antialiasing)"
msgid "Draw only outlines of areas"
msgstr "Vykreslovat pouze obrysy ploch"
@@ -11440,7 +11458,7 @@ msgstr "Zobrazovat směr úseků cesty."
msgid "Draw arrows in the direction of oneways and other directed features."
msgstr ""
-"Nakreslite šípky v smere jednosmerných ciest a ďalšie smerové vlastnosti."
+"Nakreslení šipek ve směru jednosměrných cest a další směrové vlastnosti."
msgid "Draw the order numbers of all segments within their way."
msgstr "Zobrazovat pořadová čísla úseků v cestě."
@@ -11462,11 +11480,11 @@ msgid ""
"Apply antialiasing to the map view in wireframe mode resulting in a smoother "
"appearance."
msgstr ""
-"Aplikovať vyhladzovanie (antialiasing) v režime drôtového modelu pre "
-"jemnejšie zobrazenie."
+"Aplikovat vyhlazování (antialiasing) v režimu drátového modelu pro jemnější "
+"zobrazení."
msgid "Hightlight target nodes and ways while drawing or selecting"
-msgstr "Zvýrazniť cieľové body a cesty počas kreslenia alebo výberu"
+msgstr "Zvýraznit cílové body a cesty během kreslení nebo výběru"
msgid ""
"This option suppresses the filling of areas, overriding anything specified "
@@ -11536,7 +11554,7 @@ msgid "Draw large GPS points"
msgstr "Kreslit velké GPS body"
msgid "Draw a circle from HDOP value"
-msgstr "Nakresliť kruh z hodnoty HDOP"
+msgstr "Nakreslit kruh z hodnoty HDOP"
msgid "Velocity (red = slow, green = fast)"
msgstr "Rychlost (červená = pomalá, zelená = rychlá)"
@@ -11573,7 +11591,7 @@ msgid "Dynamic color range based on data limits"
msgstr "Dynamické barvy závisle na hodnotách dat"
msgid "Smooth GPX graphics (antialiasing)"
-msgstr "Vyhladiť GPX grafiku (antialiasing)"
+msgstr "Vyhladit GPX grafiku (antialiasing)"
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11625,7 +11643,7 @@ msgid "Minimum distance (pixels)"
msgstr "Minimální vzdálenost (pixelů)"
msgid "Draw a circle from HDOP value."
-msgstr "Nakreslite kruh z hodnoty HDOP."
+msgstr "Nakreslí kruh z hodnoty HDOP."
msgid "Draw larger dots for the GPS points."
msgstr "Zobrazovat větší tečky u GPS bodů."
@@ -11639,7 +11657,7 @@ msgstr "Šířka kreslených GPX linií"
msgid ""
"Apply antialiasing to the GPX lines resulting in a smoother appearance."
msgstr ""
-"Aplikovať vyhladzovanie (antialiasing) na čiary GPX pre jemnejšie zobrazenie."
+"Aplikovat vyhlazování (antialiasing) na čáry GPX pro jemnější zobrazení."
msgid ""
"All points and track segments will have the same color. Can be customized in "
@@ -11671,7 +11689,7 @@ msgid "Track and Point Coloring"
msgstr "Barvy tras a bodů"
msgid "Colors points and track segments by data limits."
-msgstr "Měnit barvu bodů a částí trasy v závisloti na velikosti hodnot dat."
+msgstr "Měnit barvu bodů a částí trasy v závislosti na velikosti hodnot dat."
msgid "Waypoint labelling"
msgstr "Značení bodů"
@@ -11701,7 +11719,7 @@ msgid "Modeless working (Potlatch style)"
msgstr "Nepoužívat módy (styl Potlachu)"
msgid "Dynamic buttons in side menus"
-msgstr "Dynamická tlačítka v postraních menu"
+msgstr "Dynamická tlačítka v postranních menu"
msgid "Display ISO dates"
msgstr "Zobrazit ISO datumy"
@@ -11786,7 +11804,7 @@ msgid "2. Enter maximum zoom (optional)"
msgstr "2. Zadejte maximální zvětšení (volitelné)"
msgid "3. Verify generated TMS URL"
-msgstr "3. Overte vytvorený TMS URL"
+msgstr "3. Ověřte vytvořenou TMS URL"
msgid "4. Enter name for this layer"
msgstr "4. Zadejte název pro tuto vrstvu"
@@ -11852,7 +11870,7 @@ msgid "Strong"
msgstr "Silně"
msgid "Sharpen (requires layer re-add): "
-msgstr "Doostření (vyžaduje znovupřidání vrstvy): "
+msgstr "Doostření (vyžaduje nové přidání vrstvy): "
msgid "Tile cache directory: "
msgstr "Adresář keše dlaždic: "
@@ -12020,7 +12038,7 @@ msgid "Configure whether to create backup files"
msgstr "Konfigurace vytváření záložních souborů"
msgid "Enable built-in icon defaults"
-msgstr "Povolit vestavěné standarní ikony"
+msgstr "Povolit vestavěné standardní ikony"
msgid "Available styles:"
msgstr "Dostupné styly:"
@@ -12054,7 +12072,7 @@ msgid ""
"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
msgstr ""
"<html>Nepodařilo se načíst seznam zdrojů stylů z<br>''{0}''.<br><br>Detaily "
-"(nepreložené):<br>{1}</html>"
+"(nepřeložené):<br>{1}</html>"
msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
msgstr ""
@@ -12288,7 +12306,7 @@ msgid ""
"Please decide whether JOSM shall automatically update active plugins at "
"startup after an update of JOSM itself."
msgstr ""
-"Prosím, rozdhodněte, zda se budou po spuštění novější verze JOSM automaticky "
+"Prosím, rozhodněte, zda se budou po spuštění novější verze JOSM automaticky "
"aktualizovat také používané doplňky."
msgid "Update interval (in days):"
@@ -12335,7 +12353,7 @@ msgid "Central meridian"
msgstr "Hlavní poledník"
msgid "Scaling factor"
-msgstr "Koeficient zväčšenia"
+msgstr "Koeficient zvětšení"
msgid "Ellipsoid name"
msgstr "Název elipsoidu"
@@ -12422,7 +12440,7 @@ msgid "Map Projection"
msgstr "Projekce mapy"
msgid "The projection {0} could not be activated. Using Mercator"
-msgstr "Projekce {0} nemohla být aktivována. Používam Mercator."
+msgstr "Projekce {0} nemohla být aktivována. Používám Mercator."
msgid "PUWG 1992 (Poland)"
msgstr "PUWG 1992 (Polsko)"
@@ -12557,8 +12575,8 @@ msgid ""
"<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
"validate again.</html>"
msgstr ""
-"<html>''{0}'' nie je platná OSM API URL.<br>Prosím, skontrolujte pravopis a "
-"znovu potvrďte.</html>"
+"<html>''{0}'' není platná OSM API URL.<br>Prosím, zkontrolujte správnost "
+"zápisu a znovu potvrďte.</html>"
msgid "Invalid API URL"
msgstr "Neplatné API URL"
@@ -12567,15 +12585,15 @@ msgid ""
"<html>Failed to build URL ''{0}'' for validating the OSM API "
"server.<br>Please check the spelling of ''{1}'' and validate again.</html>"
msgstr ""
-"<html>Nepodarilo sa doplniť URL ''{0}'' pre overenie OSM API "
-"servera.<br>Skontrolujte prosím váš text ''{1}'' a overte znova.</html>"
+"<html>Nepodařilo se doplnit URL ''{0}'' pro ověření OSM API "
+"serveru.<br>Zkontrolujte prosím váš text ''{1}'' a znovu ověřte.</html>"
msgid ""
"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
"''{1}'' and your Internet connection and validate again.</html>"
msgstr ""
-"<html>Neúspešné pripojenie k URL ''{0}''.<br>Prosím, skontrolujte pravopis z "
-"''{1}'' a vaše internetové pripojenie a potvrďte znovu.</html>"
+"<html>Neúspěšné připojení k URL ''{0}''.<br>Prosím, zkontrolujte správnost "
+"zápisu ''{1}'' a vaše internetové připojení a znovu potvrďte.</html>"
msgid "Connection to API failed"
msgstr "Připojení k API selhalo"
@@ -12596,7 +12614,7 @@ msgid ""
msgstr ""
"<html>OSM API server v ''{0}'' neposlal platnou odpověď.<br>Je "
"pravděpodobné, že ''{0}'' není server OSM API.<br>Prosím, zkontrolujte "
-"pravopis ''{0}'' a zkuste znovu.</html>"
+"správnost zápisu ''{0}'' a zkuste znovu.</html>"
msgid "Authentication"
msgstr "Ověřování totožnosti"
@@ -12617,7 +12635,7 @@ msgid "Use OAuth"
msgstr "Použít OAuth"
msgid "Select to use OAuth as authentication mechanism"
-msgstr "Vyberat OAuth jako mechanismus ověřování totožnosti"
+msgstr "Vybrat OAuth jako mechanismus ověřování totožnosti"
msgid ""
"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
@@ -12826,7 +12844,7 @@ msgid "Remove the selected rules from the list of active rules"
msgstr "Odebrat vybraná pravidla ze seznamu aktivních pravidel"
msgid "Edit the filename or URL for the selected active rule"
-msgstr "Upravit název souboru nebo URL u vybraného atkivního pravidla"
+msgstr "Upravit název souboru nebo URL u vybraného aktivního pravidla"
msgid "Add the selected available rules to the list of active rules"
msgstr "Přidat vybraná dostupná pravidla do seznamu aktivních pravidel"
@@ -13094,6 +13112,9 @@ msgstr ""
"Poškozená předvolba značení \"{0}-{1}\" - počet položek v ''display_values'' "
"musí být stejný jako ve ''values''"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13192,7 +13213,7 @@ msgid ""
msgstr "Aktuální hodnota není validním ID OSM. Zadejte prosím celé číslo > 0"
msgid "false: the property is explicitly switched off"
-msgstr "odvybráno: vlastnost je explicitně vypnutá"
+msgstr "nevybráno: vlastnost je explicitně vypnutá"
msgid "true: the property is explicitly switched on"
msgstr "vybráno: vlastnost je explicitně zapnutá"
@@ -13275,6 +13296,9 @@ msgstr "Stahuji body {0} až {1}..."
msgid "Contacting OSM Server..."
msgstr "Připojování k serveru OSM..."
+msgid "Downloading notes"
+msgstr "Stahuji poznámky"
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Nepodařilo se otevřít vstupní proud zdroje ''{0}''"
@@ -13327,14 +13351,14 @@ msgstr ""
"Dostal jsem ''{0}''"
msgid "Illegal longitude value for parameter ''{0}'', got {1}"
-msgstr "Neplatná hodnota parametra zem. dĺžky ''{0}'', dostal som {1}"
+msgstr "Neplatná hodnota parametru zem. délky ''{0}'', obdrženo: {1}"
msgid "Illegal latitude value for parameter ''{0}'', got {1}"
-msgstr "Neplatná hodnota parametra zem. šírky ''{0}'', dostal som {1}"
+msgstr "Neplatná hodnota parametru zem. šířky ''{0}'', obdrženo: {1}"
msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
msgstr ""
-"Neočekávaná hodnota ''{0}'' v URL požadavku na sadu změn. Dostal jsem: {1}"
+"Neočekávaná hodnota ''{0}'' v URL požadavku na sadu změn. Obdrženo: {1}"
msgid ""
"Cannot create a changeset query including both the query parameters ''uid'' "
@@ -13391,7 +13415,7 @@ msgid "Parsing response from server..."
msgstr "Zpracovávám odpověď ze serveru..."
msgid "Unexpected XML element with name ''{0}''"
-msgstr "Neočakávaný XML element s názvem ''{0}''"
+msgstr "Neočekávaný XML element s názvem ''{0}''"
msgid "Could not export ''{0}''."
msgstr "Nemohu exportovat \"{0}\""
@@ -13415,13 +13439,13 @@ msgid "Projected GeoJSON Files"
msgstr "Projected GeoJSON soubory"
msgid "Layer ''{0}'' not supported"
-msgstr "Vrstva ''{0}'' nie je podporovaná"
+msgstr "Vrstva ''{0}'' není podporována"
msgid ""
"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
"tracks."
msgstr ""
-"Poznámka: GPL není kompatibilní s licencí OSM. Nestahujte prosím cesti "
+"Poznámka: GPL není kompatibilní s licencí OSM. Nestahujte prosím cesty "
"licencované pod GPL."
msgid "GPS track description"
@@ -13637,10 +13661,10 @@ msgid "Closing changeset..."
msgstr "Zavírám sadu změn..."
msgid "No changeset present for diff upload."
-msgstr "Není k dizpozici žádná sada změn pro nahrání rozdílu."
+msgstr "Není k dispozici žádná sada změn pro nahrání rozdílu."
msgid "Preparing upload request..."
-msgstr "Připravuji požadavak na nahrání..."
+msgstr "Připravuji požadavek na nahrání..."
msgid "Waiting 10 seconds ... "
msgstr "Čekám 10 sekund ... "
@@ -13782,7 +13806,7 @@ msgid "Open OSM file"
msgstr "Otevřít OSM soubor"
msgid "Reading was canceled"
-msgstr "Čítanie bolo zrušené"
+msgstr "Čtení bylo zrušeno"
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
@@ -13835,8 +13859,8 @@ msgid ""
"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
"{1}."
msgstr ""
-"Neplatná hodnota pre vlastnosť \"version\" (verzia) na OSM základnom objekte "
-"s ID {0}. Prijatá hodnota je {1}"
+"Neplatná hodnota vlastnosti \"version\" (verze) na základním objektu OSM s "
+"ID {0}. Přijatá hodnota je {1}"
msgid ""
"Normalizing value of attribute ''version'' of element {0} to {2}, API "
@@ -13866,7 +13890,7 @@ msgstr "Chybějící povinný atribut ''{0}''."
msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
msgstr ""
-"Neplatná dlhá hodnota pre vlastnosť \"{0}\". Prijatá hodnota je \"{1}\""
+"Neplatná číselná hodnota vlastnosti \"{0}\". Přijatá hodnota je \"{1}\""
msgid "{0} bytes have been read"
msgstr "{0} bajtů bylo načteno"
@@ -13977,7 +14001,7 @@ msgid "Uploading data ..."
msgstr "Nahrávám data na server ..."
msgid "Unexpected id 0 for osm primitive found"
-msgstr "Najdené neočakávané id 0 pre OSM základný objekt"
+msgstr "Nalezeno neočekávané id 0 základního OSM objektu"
msgid "OSM Server Files zip compressed"
msgstr "Soubory OSM serveru komprimované ZIPem"
@@ -14018,7 +14042,7 @@ msgid "Add all tags"
msgstr "Přidat všechny značky"
msgid "Add checked tags to selected objects"
-msgstr "Přidat zaškrtnuté značky do vybraných objektů"
+msgstr "Přidat zatrhnuté značky do vybraných objektů"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter: Přidat všechny značky do vybraných objektů"
@@ -14030,10 +14054,10 @@ msgid "Existing values"
msgstr "Současné hodnoty"
msgid "Enable the checkbox to accept the value"
-msgstr "Hodnotu přijmete zaškrtnutím políčka"
+msgstr "Hodnotu přijmete zatržením políčka"
msgid "Accept all tags from {0} for this session"
-msgstr "Prijať všetky značky z {0} pre toto sedenie"
+msgstr "Přijmout všechny značky z {0} pro toto sezení"
msgid "Load data from API"
msgstr "Nahrávat data z API"
@@ -14086,7 +14110,7 @@ msgid "Remote Control has been asked to create a new node."
msgstr "Vzdálené ovládání bylo požádáno o vytvoření nového uzlu."
msgid "There is no layer opened to add node"
-msgstr "Pre pridanie bodu nie je otvorená žiadna vrstva"
+msgstr "Pro přidání bodu není otevřena žádná vrstva"
msgid "Remote Control has been asked to create a new way."
msgstr "Vzdálené ovládání bylo požádáno o vytvoření nové cesty."
@@ -14194,7 +14218,7 @@ msgstr ""
"Verze ''{0}'' metadat vrstvy GPX trasy není podporována. Očekávána: 0.1"
msgid "File name expected for layer no. {0}"
-msgstr "Očekáván název souboru pro vstrvu číslo {0}"
+msgstr "Očekáván název souboru pro vrstvu číslo {0}"
msgid ""
"Version ''{0}'' of meta data for imagery layer is not supported. Expected: "
@@ -14268,7 +14292,7 @@ msgstr "Nelze načíst vrstvu"
msgid ""
"Cannot load layer of type ''{0}'' because no suitable importer was found."
msgstr ""
-"Nedá sa načítať vrstva typu \"{0}\" pretože sa nenašiel vhodný importér."
+"Nelze načíst vrstva typu \"{0}\" protože nebyl nalezen vhodný importní modul."
msgid ""
"Cannot load layer {0} because it depends on layer {1} which has been skipped."
@@ -14332,7 +14356,7 @@ msgid "replaced by new {0} plugin"
msgstr "nahrazen novým doplňkem {0}"
msgid "no longer required"
-msgstr "už nie je potrebný"
+msgstr "již není potřeba"
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
@@ -14581,7 +14605,7 @@ msgid "Plugin information"
msgstr "Informace o doplňku"
msgid "no description available"
-msgstr "není zádný popis"
+msgstr "popis není dostupný"
msgid ""
"Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14746,8 +14770,8 @@ msgid ""
"Alternatively, if that does not work you can manually fill in the "
"information below at this URL:"
msgstr ""
-"Případně, pokud to nebude fungovať, můžete ručně vyplnit níže uvedené údaje "
-"na této URL:"
+"V případě, že toto nebude fungovat, můžete ručně vyplnit níže uvedené údaje "
+"na následující URL:"
msgid "(The text has already been copied to your clipboard.)"
msgstr "(Text již byl zkopírován do schránky.)"
@@ -14759,8 +14783,8 @@ msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
msgstr ""
-"<html>Zlyhala inicializácia komunikácie s OSM serverom {0}.<br>Skontrlujte "
-"URL servera vo Vašich nastaveniach a Vaše internetové pripojenie."
+"<html>Selhala inicializace komunikace s OSM serverem {0}.<br>Zkontrolujte "
+"URL serveru ve Vašem nastavení a Vaše internetové připojení."
msgid ""
"<html>Failed to authenticate at the OSM server ''{0}''.<br>You are using "
@@ -14781,17 +14805,17 @@ msgid_plural ""
"referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
"the node, and upload again."
msgstr[0] ""
-"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
-"odkazovaný z bodu {1}.<br>Prosím, načítajte bod, odstráňte odkazovanie na "
-"bod a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z {1} bodu.<br>Prosím, stáhněte bod, odstraňte odkaz na bod a "
+"nahrajte data znovu."
msgstr[1] ""
-"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
-"odkazovaný z bodov {1}.<br>Prosím, načítajte body, odstráňte odkazovanie na "
-"bod a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z {1} bodů.<br>Prosím, nahrajte body, odstraňte odkazy na bod a "
+"nahrajte data znovu."
msgstr[2] ""
-"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
-"odkazovaný z bodov {1}.<br>Prosím, načítajte body, odstráňte odkazovanie na "
-"bod a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z {1} bodů.<br>Prosím, nahrajte body, odstraňte odkazy na bod a "
+"nahrajte data znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -14803,15 +14827,15 @@ msgid_plural ""
"the node, and upload again."
msgstr[0] ""
"<strong>Selhalo</strong> mazání <strong>bodu {0}</strong>. Je stále "
-"odkazovaný z cesty {1}.<br>Prosím, načtěte cestu, odstraňte odkaz na bod a "
+"odkazovaný z {1} cesty.<br>Prosím, stáhněte cestu, odstraňte odkaz na bod a "
"nahrajte data znovu."
msgstr[1] ""
"<strong>Selhalo</strong> mazání <strong>bodu {0}</strong>. Je stále "
-"odkazovaný z cest {1}.<br>Prosím, načtěte cesty, odstraňte odkazy na bod a "
+"odkazovaný z {1} cest.<br>Prosím, stáhněte cesty, odstraňte odkazy na bod a "
"nahrajte data znovu."
msgstr[2] ""
"<strong>Selhalo</strong> mazání <strong>bodu {0}</strong>. Je stále "
-"odkazovaný z cest {1}.<br>Prosím, načtěte cesty, odstraňte odkazy na bod a "
+"odkazovaný ze {1} cest.<br>Prosím, stáhněte cesty, odstraňte odkazy na bod a "
"nahrajte data znovu."
msgid ""
@@ -14823,17 +14847,17 @@ msgid_plural ""
"referred to by relations {1}.<br>Please load the relations, remove the "
"reference to the node, and upload again."
msgstr[0] ""
-"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
-"odkazovaný z relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
-"odkazovanie na bod a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z {1} relace.<br>Prosím, stáhněte relaci, odstraňte odkaz na bod "
+"a nahrajte data znovu."
msgstr[1] ""
-"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
-"odkazovaný z relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
-"odkazovanie na bod a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>bodu {0}</strong>. Je stále "
+"odkazovaný ze {1} relací.<br>Prosím, stáhněte relace, odstraňte odkazy na "
+"bod a nahrajte data znovu."
msgstr[2] ""
-"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
-"odkazovaný z relácií {1}.<br>Prosím, načítajte relácie, odstráňte "
-"odkazovanie na bod a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z {1} relací.<br>Prosím, stáhněte relace, odstraňte odkazy na bod "
+"a nahrajte data znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -14844,17 +14868,17 @@ msgid_plural ""
"referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
"the way, and upload again."
msgstr[0] ""
-"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná z bodu {1}.<br>Prosím, načítajte bod, odstráňte odkazovanie na "
-"cestu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>cesty {0}</strong>. Je stále "
+"odkazovaná z {1} bodu.<br>Prosím, nahrajte bod, odstraňte odkaz na cestu a "
+"nahrajte data znovu."
msgstr[1] ""
-"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná z bodov {1}.<br>Prosím, načítajte body, odstráňte odkazovanie na "
-"cestu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>cesty {0}</strong>. Je stále "
+"odkazovaná ze {1} bodů.<br>Prosím, nahrajte body, odstraňte odkazy na cestu "
+"a nahrajte data znovu."
msgstr[2] ""
-"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná z bodov {1}.<br>Prosím, načítajte body, odstráňte odkazovanie na "
-"cestu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>cesty {0}</strong>. Je stále "
+"odkazovaná z {1} bodů.<br>Prosím, nahrajte body, odstraňte odkazy na cestu a "
+"nahrajte data znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -14865,17 +14889,17 @@ msgid_plural ""
"referred to by ways {1}.<br>Please load the ways, remove the reference to "
"the way, and upload again."
msgstr[0] ""
-"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná z cesty {1}.<br>Prosím, načítajte cestu, odstráňte odkazovanie na "
-"cestu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>cesty {0}</strong>. Je stále "
+"odkazovaná z {1} cesty.<br>Prosím, stáhněte cestu, odstraňte odkaz na cestu "
+"a nahrajte data znovu."
msgstr[1] ""
-"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná z ciest {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie na "
-"cestu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>cesty {0}</strong>. Je stále "
+"odkazovaná ze {1} cest.<br>Prosím, stáhněte cesty, odstraňte odkazy na cestu "
+"a nahrajte data znovu."
msgstr[2] ""
-"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná z ciest {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie na "
-"cestu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>cesty {0}</strong>. Je stále "
+"odkazovaná ze {1} cest.<br>Prosím, stáhněte cesty, odstraňte odkazy na cestu "
+"a nahrajte data znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -14886,17 +14910,17 @@ msgid_plural ""
"referred to by relations {1}.<br>Please load the relations, remove the "
"reference to the way, and upload again."
msgstr[0] ""
-"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná z relácie {1}.<br>Prosím, načítajte reláciu, odstráňte "
-"odkazovanie na cestu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>cesty {0}</strong>. Je stále "
+"odkazovaná z {1} relace.<br>Prosím, stáhněte relaci, odstraňte odkaz na "
+"cestu a nahrajte data znovu."
msgstr[1] ""
-"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná z relácií {1}.<br>Prosím, načítajte relácie, odstráňte "
-"odkazovanie na cestu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>cesty {0}</strong>. Je stále "
+"odkazovaná ze {1} relací.<br>Prosím, stáhněte relace, odstraňte odkazy na "
+"cestu a nahrajte data znovu."
msgstr[2] ""
-"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná z relácií {1}.<br>Prosím, načítajte relácie, odstráňte "
-"odkazovanie na cestu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>cesty {0}</strong>. Je stále "
+"odkazovaná z {1} relací.<br>Prosím, stáhněte relace, odstraňte odkazy na "
+"cestu a nahrajte data znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -14907,17 +14931,17 @@ msgid_plural ""
"referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
"the relation, and upload again."
msgstr[0] ""
-"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná z bodu {1}.<br>Prosím, načítajte bod, odstráňte odkazovanie na "
-"reláciu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>relace {0}</strong>. Je stále "
+"odkazovaná z {1} bodu.<br>Prosím, stáhněte bod, odstraňte odkaz na relaci a "
+"nahrajte data znovu."
msgstr[1] ""
-"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná z bodov {1}.<br>Prosím, načítajte bod, odstráňte odkazovanie na "
-"reláciu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>relace {0}</strong>. Je stále "
+"odkazovaná ze {1} bodů.<br>Prosím, stáhněte body, odstraňte odkazy na relaci "
+"a nahrajte data znovu."
msgstr[2] ""
-"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná z bodov {1}.<br>Prosím, načítajte body, odstráňte odkazovanie na "
-"reláciu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>relace {0}</strong>. Je stále "
+"odkazovaná z {1} bodů.<br>Prosím, stáhněte body, odstraňte odkazy na relaci "
+"a nahrajte data znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -14928,17 +14952,17 @@ msgid_plural ""
"referred to by ways {1}.<br>Please load the ways, remove the reference to "
"the relation, and upload again."
msgstr[0] ""
-"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná z cestu {1}.<br>Prosím, načítajte cestu, odstráňte odkazovanie na "
-"reláciu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>relace {0}</strong>. Je stále "
+"odkazovaná z {1} cesty.<br>Prosím, stáhněte cestu, odstraňte odkaz na relaci "
+"a nahrajte data znovu."
msgstr[1] ""
-"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná z ciest {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie na "
-"reláciu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>relace {0}</strong>. Je stále "
+"odkazovaná ze {1} cest.<br>Prosím, stáhněte cesty, odstraňte odkazy na "
+"relaci a nahrajte data znovu."
msgstr[2] ""
-"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná z ciest {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie na "
-"reláciu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>relace {0}</strong>. Je stále "
+"odkazovaná z {1} cest.<br>Prosím, stáhněte cesty, odstraňte odkazy na relaci "
+"a nahrajte data znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -14949,17 +14973,17 @@ msgid_plural ""
"referred to by relations {1}.<br>Please load the relations, remove the "
"reference to the relation, and upload again."
msgstr[0] ""
-"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná z relácie {1}.<br>Prosím, načítajte reláciu, odstráňte "
-"odkazovanie na reláciu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>relace {0}</strong>. Je stále "
+"odkazovaná z {1} relace.<br>Prosím, stáhněte relaci, odstraňte odkaz na "
+"relaci a nahrajte data znovu."
msgstr[1] ""
-"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná z relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
-"odkazovanie na reláciu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>relace {0}</strong>. Je stále "
+"odkazovaná ze {1} relací.<br>Prosím, stáhněte relace, odstraňte odkazy na "
+"relaci a nahrajte data znovu."
msgstr[2] ""
-"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná z relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
-"odkazovanie na reláciu a nahrajte dáta znovu."
+"<strong>Selhalo</strong> mazání <strong>relace {0}</strong>. Je stále "
+"odkazovaná z {1} relací.<br>Prosím, stáhněte relace, odstraňte odkazy na "
+"relaci a nahrajte data znovu."
msgid ""
"<html>Uploading to the server <strong>failed</strong> because your "
@@ -15004,19 +15028,20 @@ msgid ""
"resource<br>''{1}''.<br>Please launch the preferences dialog and retrieve "
"another OAuth token.</html>"
msgstr ""
-"<html>Overenie na serveri OSM s OAuth prístupom ''{0}'' zlyhalo.<br>Pre "
-"overenie nie je povolený prístup k chránenému zdroju <br>''{1}''.<br>Prosím "
-"otvorte dialóg nastavení a získajte ďalší OAuth prístup.</html>"
+"<html>Ověření přístupu na OSM serveru pomocí OAuth tokenu ''{0}'' "
+"selhalo.<br>Token není ověřen pro přístup k chráněnému zdroji "
+"<br>''{1}''.<br>Prosím, otevřete dialog nastavení a vyžádejte si další OAuth "
+"token.</html>"
msgid ""
"<html>Communication with the OSM server ''{0}'' timed out. Please retry "
"later.</html>"
msgstr ""
"<html>Spojení s OSM serverem ''{0}'' vypršelo. Prosím, zkuste to znovu "
-"později.</Html>"
+"později.</html>"
msgid "no error message available"
-msgstr "není k dizpozici žádné chybové hlášení"
+msgstr "není k dispozici žádné chybové hlášení"
msgid ""
"<html>Communication with the OSM server ''{0}''failed. The server "
@@ -15025,7 +15050,7 @@ msgid ""
"(untranslated)</strong>: {2}</html>"
msgstr ""
"<html>Spojení se serverem OSM ''{0}'' selhalo. Server "
-"odpověděl<br>nasledujícím chybovým kódem a hlášením:<br><strong> Kód chyby: "
+"odpověděl<br>následujícím chybovým kódem a hlášením:<br><strong> Kód chyby: "
"<strong> {1}<br><strong>Chybové hlášení (nepřeložené)</strong>: {2}</HTML>"
msgid ""
@@ -15050,7 +15075,7 @@ msgstr ""
"(nepřeloženo):<br>{0}</html>"
msgid "<html>The server reported that it has detected a conflict."
-msgstr "<html>Server nahlásil zistenie konfliktu."
+msgstr "<html>Server nahlásil zjištění konfliktu."
msgid ""
"<html>Failed to upload to changeset <strong>{0}</strong><br>because it has "
@@ -15064,16 +15089,16 @@ msgid ""
"security reasons. This is most likely because you are running<br>in an "
"applet and because you did not load your applet from ''{1}''."
msgstr ""
-"<html>Zlyhalo otvorenie pripojenia na vzdialený server<br>''{0}''<br>kvôli "
-"bezpečnostným príčinám. Toto je pravdepodobne kvôli tomu, že ste "
-"spustený<br>v aplete. a pretože ste nenačítali aplet z ''{1}''."
+"<html>Selhalo otevření připojení na vzdálený server<br>''{0}''<br> z "
+"bezpečnostních důvodů. Toto pravděpodobně nastalo proto, že je aplikace "
+"spuštěna<br>v apletu A protože jste aplet nenačetli z ''{1}''."
msgid ""
"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
"check your internet connection."
msgstr ""
-"<html>Zlyhalo otvorenie pripojenia na vzdialený "
-"server<br>''{0}''.<br>Prosím, skontrolujte Vaše internetové pripojenie."
+"<html>Selhalo otevření připojení na vzdálený server<br>''{0}''.<br>Prosím, "
+"zkontrolujte Vaše internetové připojení."
msgid ""
"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
@@ -15087,7 +15112,7 @@ msgid ""
"and/or inconsistent.<br><br>Details (untranslated): {0}</html>"
msgstr ""
"<html>Nepodařilo se stáhnout data. Formát je buď nepodporovaný, chybný, a / "
-"nebo nekonzistentní.<br><br>Detaily (nepreloženo): {0}</html>"
+"nebo nekonzistentní.<br><br>Detaily (nepřeloženo): {0}</html>"
msgid "<html>Failed to download data.<br><br>Details: {0}</html>"
msgstr "<html>Nepodařilo se stáhnout data.<br><br>Detaily: {0}</html>"
@@ -15141,10 +15166,10 @@ msgid ""
"<strong>Downloading failed</strong> if you tried to download this "
"object.<br><br>The error message is:<br>{0}</html>"
msgstr ""
-"<html>Server hlási, že objekt je smazaný.<br><strong>Nahrávání "
-"selhalo</strong> pokud jste se snažili upravit nebo smazat tento objekt.<br> "
-"<strong>Stahování selhalo</strong>, pokud jste se snažili nahrát tento "
-"objekt.<br><br>Chybová zpráva je:<br>{0}</html>"
+"<html>Server hlásí, že objekt je smazaný.<br><strong>Nahrávání "
+"selhalo,</strong> pokud jste se snažili upravit nebo smazat tento "
+"objekt.<br> <strong>Stahování selhalo</strong>, pokud jste se snažili nahrát "
+"tento objekt.<br><br>Chybová zpráva je:<br>{0}</html>"
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Nelze najít překlad do jazyka {0}. Vracím se k {1}."
@@ -15206,7 +15231,7 @@ msgid "Update Java"
msgstr "Aktualizovat Java"
msgid "You are running version {0} of Java."
-msgstr "Je spuštena Java verze {0}."
+msgstr "Je spuštěna Java verze {0}."
msgid "April 2015"
msgstr "duben 2015"
@@ -15225,7 +15250,7 @@ msgstr ""
"na Java {0}."
msgid "Would you like to update now ?"
-msgstr "Chcete akutalizovat nyní?"
+msgstr "Chcete aktualizovat nyní?"
msgid ""
"A previous version of JOSM has installed a custom certificate in order to "
@@ -15293,7 +15318,7 @@ msgid "Suspicious characters in key:"
msgstr "Klíč obsahuje podezřelé znaky:"
msgid "Value is too long (max {0} characters):"
-msgstr "Hodnota je príliš dlouhá (maximum je {0} znaků):"
+msgstr "Hodnota je příliš dlouhá (maximum je {0} znaků):"
msgid "Do you want to paste these tags?"
msgstr "Chcete vložit tyto značky?"
@@ -15333,7 +15358,7 @@ msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
msgstr ""
-"Nastavenie s klíčem ''{0}'' neobsahuje ''{1}''. Nelze obnovit geometrii okna "
+"Nastavení s klíčem ''{0}'' neobsahuje ''{1}''. Nelze obnovit geometrii okna "
"z nastavení."
msgid ""
@@ -15354,7 +15379,7 @@ msgid ""
"Preference with key ''{0}'' does not exist. Cannot restore window geometry "
"from preferences."
msgstr ""
-"Nastavenie s klíčem ''{0}'' neexistuje. Nelze obnovit geometrii okna z "
+"Nastavení s klíčem ''{0}'' neexistuje. Nelze obnovit geometrii okna z "
"nastavení."
msgid "Ignoring malformed geometry: {0}"
@@ -15461,6 +15486,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "křoví"
+msgctxt "natural"
+msgid "wood"
+msgstr "prales"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "Přiřazená ulice (associatedStreet)"
@@ -15531,7 +15560,7 @@ msgstr "lokalita"
msgctxt "Place type"
msgid "village"
-msgstr "obec (dedina)"
+msgstr "obec (vesnice)"
msgctxt "Place type"
msgid "town"
@@ -15539,11 +15568,11 @@ msgstr "město"
msgctxt "Place type"
msgid "borough"
-msgstr "mestský obvod"
+msgstr "městský obvod"
msgctxt "Place type"
msgid "municipality"
-msgstr "obce so spojenou administratívou"
+msgstr "obce se spojenou administrativou"
msgctxt "Place type"
msgid "island"
@@ -15616,7 +15645,7 @@ msgid "Folders"
msgstr "Adresáře"
msgid "Home"
-msgstr "Domáci"
+msgstr "Domů"
msgid "Look in:"
msgstr "Hledat v:"
@@ -15685,7 +15714,7 @@ msgid "Hue:"
msgstr "Odstín:"
msgid "GTK Color Chooser"
-msgstr "GTK Výber Farieb"
+msgstr "GTK Výběr barev"
msgid "Red:"
msgstr "Červená:"
@@ -16072,6 +16101,9 @@ msgstr "Drone Imagery (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Imagery 2014 (Haiti)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16099,8 +16131,11 @@ msgstr "OSMIE Civil Parishes"
msgid "OSMIE Baronies"
msgstr "OSMIE Baronies"
-msgid "OSMIE Political"
-msgstr "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr "OSMIE Local Election Areas"
+
+msgid "OSMIE Dail Election Areas"
+msgstr "OSMIE Dail Election Areas"
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
@@ -16478,7 +16513,7 @@ msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-82"
msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
+msgstr "NLS - OS 6-inch County Series 1888-1913"
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -16487,7 +16522,7 @@ msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
-msgstr ""
+msgstr "NLS - OS 25-inch (Scotland) 1892-1905"
msgid "OS 1:25k historic (OSM-Best)"
msgstr "OS 1:25k historic (OSM-Best)"
@@ -16675,6 +16710,9 @@ msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr "OS Town Plans, Paisley 1858 (NLS)"
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "OS Town Plans, Peebles 1856 (NLS)"
@@ -16750,11 +16788,15 @@ msgid ""
"Provides Apache Commons library components. Not meant to be installed "
"directly by users, but rather as a dependency for other plugins."
msgstr ""
+"Poskytuje prvky knihovny Apache Commons. Nemá se instalovat přímo "
+"uživatelem, ale spíše v závislosti na ostatních doplňcích."
msgid ""
"Provides Apache HTTP library. Not meant to be installed directly by users, "
"but rather as a dependency for other plugins."
msgstr ""
+"Poskytuje knihovnu Apache HTTP. Nemá se instalovat přímo uživatelem, ale "
+"spíše v závislosti na ostatních doplňcích."
msgid ""
"Allows selection of areas in an layer and automatic creation of a way as "
@@ -16808,7 +16850,7 @@ msgid "(Warning: Experimental!) Tool for conflating (merging) data."
msgstr "(Pozor: Experimentální!) Nástroj pro spojování (slučování) dat."
msgid "Downloads new data when you pan/zoom"
-msgstr ""
+msgstr "Stáhne nová data, když posouváte nebo zvětšujete"
msgid "Create a grid of ways."
msgstr "Vytváření pravidelné mřížky cest."
@@ -16844,13 +16886,20 @@ msgstr ""
"Umožňuje uživateli anonymizovat čas a velice rychle smazat části rozsáhlých "
"GPX záznamů."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Poskytuje knihovnu EJML pro ostatní doplňky JOSM. Neměl by být instalován "
+"přímo uživatelem, ale pouze na základě požadavku jiného doplňku."
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
"Zobrazuje výškový profil a další statistická údaje o GPX záznamu prošlé "
"trasy."
msgid "Handling of French EPCIs (boundary=local_authority)"
-msgstr "Používá Francouzký EPCIs (boundary=local_authority)"
+msgstr "Používá Francouzský EPCIs (boundary=local_authority)"
msgid "Use external scripts in JOSM"
msgstr "Použití externích skriptů v JOSM"
@@ -16889,6 +16938,13 @@ msgstr "Umožňuje odfiltrovat nepotřebné trasy GPS"
msgid "Visualizes routing information as a routing graph."
msgstr "Vizualizuje informace o směrování v podobě grafu."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Poskytuje knihovnu GSON pro ostatní doplňky. Nemá se instalovat přímo "
+"uživatelem, ale pouze na základě požadavku jiného doplňku."
+
msgid "Simple tool to tag house numbers."
msgstr "Jednoduchý nástroj na značení čísel domů."
@@ -17028,7 +17084,7 @@ msgstr "Rozšiřuje možnosti editace otevírací doby."
msgid ""
"Allows opening gpx/osm files that intersect the currently visible screen area"
msgstr ""
-"Otevírá sobory gpx/osm které se protínají se současnou viditelnou oblastí."
+"Otevírá soubory gpx/osm které se protínají se současnou viditelnou oblastí."
msgid ""
"Launches FireFox to display the current visible screen as a nice SVG image."
@@ -17039,7 +17095,7 @@ msgid ""
"Bring in errors from Osm Inspector and display it on the current JOSM "
"bounding box"
msgstr ""
-"Přivést chyby z Osm Inspectoru a zobrazit je na aktuálním ohraničujícím "
+"Stáhne chyby z Osm Inspectoru a zobrazí je na aktuálním ohraničujícím "
"rámečku JOSM"
msgid ""
@@ -17132,7 +17188,7 @@ msgid "Provides routing capabilities."
msgstr "Poskytuje směrování"
msgid "Loads data from SDS"
-msgstr "Načíta dáta z SDS"
+msgstr "Nahrává data z SDS"
msgid "Imagery Layer for Sea Charts"
msgstr "Obrazová vrstva pro Sea Charts"
@@ -17233,7 +17289,7 @@ msgid "Allows undeleting object from OSM database"
msgstr "Umožňuje obnovování smazaných objektů z OSM databáze"
msgid "Several utilities that make your life easier."
-msgstr "Různé nástroje zjenodušující život."
+msgstr "Různé nástroje zjednodušující život."
msgid ""
"(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -17265,7 +17321,7 @@ msgid ""
"Drive a race car from point A to point B over aerial imagery, leave cacti "
"behind."
msgstr ""
-"Řidte závodní auto z bodu A do bodu B přes letecké snímky, zanechávajíc "
+"Řiďte závodní auto z bodu A do bodu B přes letecké snímky, zanechávajíc "
"kaktusy za sebou."
msgid "Surface"
@@ -17376,7 +17432,7 @@ msgstr "dráha"
msgctxt "riding"
msgid "sports_centre"
-msgstr "Konské športovisko"
+msgstr "jízdárna"
msgctxt "riding"
msgid "stadium"
@@ -17387,13 +17443,13 @@ msgid "track"
msgstr "dráha"
msgid "clay"
-msgstr "hlina"
+msgstr "jíl"
msgid "dirt"
msgstr "hlína"
msgid "fine_gravel"
-msgstr "jemný štrk"
+msgstr "jemný štěrk"
msgid "mud"
msgstr "bahno"
@@ -17401,9 +17457,21 @@ msgstr "bahno"
msgid "Lanes"
msgstr "Jízdních pruhů"
+msgid "Lanes in way direction"
+msgstr "Pruhy ve směru cesty"
+
+msgid "Lanes opposed to way direction"
+msgstr "Pruhy v protisměru cesty"
+
msgid "Max. speed (km/h)"
msgstr "Max. rychlost (km/h)"
+msgid "Max. speed in way direction"
+msgstr "Max. rychlost ve směru cesty"
+
+msgid "Max. speed opposed to way direction"
+msgstr "Max. rychlost v protisměru cesty"
+
msgid "Bridge"
msgstr "Most"
@@ -17471,6 +17539,9 @@ msgstr "vedlejší kolej"
msgid "spur"
msgstr "vlečka"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Elektrifikováno"
@@ -17565,6 +17636,9 @@ msgstr "oddělené"
msgid "isolated"
msgstr "izolované"
+msgid "outside"
+msgstr "venkovní"
+
msgid "Height (meters)"
msgstr "Výška (metrů)"
@@ -17833,10 +17907,10 @@ msgid "delivery"
msgstr "zásobování"
msgid "agricultural"
-msgstr "zemědelská vozidla"
+msgstr "zemědělská vozidla"
msgid "forestry"
-msgstr "lestníctvo"
+msgstr "lesnictví"
msgid "Population"
msgstr "Počet obyvatel"
@@ -17848,7 +17922,7 @@ msgid "Website"
msgstr "Webové stránky"
msgid "Distance (km)"
-msgstr "Vzdialenosť (km)"
+msgstr "Vzdálenost (km)"
msgid "Ascent (m)"
msgstr "Stoupání (m)"
@@ -18109,6 +18183,9 @@ msgstr "Poplatek"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "Je tato vodní plocha nestálá (sezónně vysychá)?"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr "propustek"
@@ -18130,12 +18207,88 @@ msgstr "Motorový člun"
msgid "Canoe"
msgstr "Kánoe"
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "voda"
+
+msgid "gas"
+msgstr "plyn"
+
+msgid "heat"
+msgstr "teplo"
+
+msgid "oil"
+msgstr "ropa"
+
+msgid "sewage"
+msgstr "kanalizace"
+
+msgid "Support"
+msgstr "Umístění"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "sloup"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "nástěnné"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "billboard"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "na zemi"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Silnice a ulice"
msgid "Motorway"
msgstr "Dálnice"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Dálnice - nájezd, rampa, kolektor"
@@ -18237,6 +18390,9 @@ msgstr "parkovací ulička"
msgid "drive-through"
msgstr "prodej do auta (drive-through)"
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Parkovací ulička"
@@ -18401,7 +18557,7 @@ msgid "Max. length (meters)"
msgstr "Max. délka (m)"
msgid "Overtaking"
-msgstr "Předjížení"
+msgstr "Předjíždění"
msgctxt "overtaking"
msgid "yes"
@@ -18503,7 +18659,7 @@ msgid ""
"grassy acclivities, jagged rocks, facile snow-free glaciers"
msgstr ""
"místy může být potřeba si k postupu pomoci rukama. Terén dosti exponovaný, "
-"nepevné travnaté svahy, rozeklané skaly, snadno překonatelné ledovce bez "
+"nepevné travnaté svahy, rozeklané skály, snadno překonatelné ledovce bez "
"sněhu"
msgid "T5 - difficult alpine trail with climbing"
@@ -18523,7 +18679,7 @@ msgid ""
"climbing up to second grade. Often very exposed, precarious jagged rocks, "
"glacier with danger to slip and fall"
msgstr ""
-"lezeníe až na druhém stupni obtížnosti. Často velmi exponované, nejisté "
+"lezení až na druhém stupni obtížnosti. Často velmi exponované, nejisté "
"rozeklané skály, ledovec s nebezpečím uklouznutí a pádu"
msgid "Visibility"
@@ -18557,7 +18713,7 @@ msgid "Ski"
msgstr "Lyže"
msgid "Snowmobile"
-msgstr "Sněžný skůtr"
+msgstr "Sněžný skútr"
msgid "Dedicated Bridleway"
msgstr "Stezka pro koně"
@@ -18590,19 +18746,19 @@ msgid "shared_lane"
msgstr "sdílený jízdní pruh"
msgid "Cycleway left"
-msgstr "Chodník pre cyklistov vľavo"
+msgstr "Chodník pro cyklisty vlevo"
msgid "Cycleway right"
-msgstr "Chodník pre cyklistov vpravo"
+msgstr "Chodník pro cyklisty vpravo"
msgid "Oneway (bicycle)"
-msgstr "Jednosmerná (bicykel)"
+msgstr "Jednosměrná (kolo)"
msgid "Edit Highway Attributes:"
msgstr "Upravit vlastnosti silnice:"
msgid "Highway"
-msgstr "Hlavná cesta"
+msgstr "Hlavní cesta"
msgid "Dedicated Cycleway"
msgstr "Cyklostezka"
@@ -18668,7 +18824,7 @@ msgid "Number"
msgstr "Číslo"
msgid "Exit to"
-msgstr "Výjazd do"
+msgstr "Výjezd do"
msgid "Services"
msgstr "Služby motoristům (odpočívadla)"
@@ -18794,12 +18950,15 @@ msgstr "Obratiště"
msgid "Turning Loop"
msgstr "Smyčka"
-msgid "City Limit"
-msgstr "Značka hranice sídla (rychlostní limit)"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Druhé jméno"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Rychlostní radar"
@@ -18810,7 +18969,7 @@ msgid "Highway milestone"
msgstr "Silniční kilometrovník"
msgid "Distance (kilometers)"
-msgstr "Staničení (kilometry)"
+msgstr "Vzdálenost (kilometry)"
msgctxt "junction=yes"
msgid "Named Junction"
@@ -18914,11 +19073,17 @@ msgid "wire"
msgstr "drátěný"
msgid "Guard Rail"
-msgstr "Zvodidlá"
+msgstr "Svodidla"
msgid "Wall"
msgstr "Zeď"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Městské hradby"
@@ -19072,7 +19237,7 @@ msgid "Water Body"
msgstr "Vodní plocha"
msgid "canal"
-msgstr "prieplav"
+msgstr "průplav"
msgid "lake"
msgstr "jezero"
@@ -19090,7 +19255,7 @@ msgid "reservoir"
msgstr "nádrž"
msgid "river"
-msgstr "rieka (river)"
+msgstr "řeka (river)"
msgid "Salt Water"
msgstr "Slaná voda"
@@ -19326,11 +19491,20 @@ msgstr "CNG (zemní plyn)"
msgid "Pier"
msgstr "Molo"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Plavební komora"
msgid "Turning Point"
-msgstr "Rožšířené místo pro otáčení lodí"
+msgstr "Rozšířené místo pro otáčení lodí"
msgid "Slipway"
msgstr "Skluz v loděnici"
@@ -19488,7 +19662,7 @@ msgid ""
"drag_lift (general type - use only if exact type (see values below) is "
"unknown)"
msgstr ""
-"lyžařský vlek (obecný typ - použijte pouze pokud neznáte konkrátní typ vleku "
+"lyžařský vlek (obecný typ - použijte pouze pokud neznáte konkretní typ vleku "
"(viz níže))"
msgid "t-bar"
@@ -19580,7 +19754,7 @@ msgid "Diesel (Gas To Liquid - ultimate diesel)"
msgstr "Diesel GTL (Gas To Liquid)"
msgid "Diesel for Heavy Good Vehicles"
-msgstr "Nafta pre nákladní automobily"
+msgstr "Nafta pro nákladní automobily"
msgid "1/25 mix (mofa/moped)"
msgstr "1/25 mix (motorové kolo/moped)"
@@ -19724,7 +19898,7 @@ msgid "Bicycles are washed (for a fee)"
msgstr "Mytí jízdních kol (za poplatek)"
msgid "Public Bicycle Repair Station"
-msgstr "Věřejná opravna bicyklů"
+msgstr "Veřejná opravna bicyklů"
msgid "Chain tool"
msgstr "Nástroj na řetěz"
@@ -19794,7 +19968,7 @@ msgstr "šedá"
msgctxt "color"
msgid "white"
-msgstr "biela"
+msgstr "bílá"
msgctxt "color"
msgid "#CD853F"
@@ -19870,7 +20044,7 @@ msgid "Trolleybus"
msgstr "Trolejbus"
msgid "Share taxi"
-msgstr "Zdieľané taxi"
+msgstr "Sdílené taxi"
msgid "Funicular"
msgstr "Pozemní lanovka"
@@ -19966,12 +20140,6 @@ msgstr "Letiště"
msgid "Airport Ground"
msgstr "Letiště"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Přistávací dráha (runway)"
@@ -19999,7 +20167,7 @@ msgid "yes"
msgstr "ano"
msgid "Beacon"
-msgstr "Vodní bój"
+msgstr "Vodní bóje"
msgid "Windsock"
msgstr "Větrný pytel"
@@ -20150,13 +20318,16 @@ msgid "steak_house"
msgstr "steak_house"
msgid "Microbrewery"
-msgstr "Minipivovar"
+msgstr "Malý pivovar"
msgid "Outdoor seating"
msgstr "Venkovní sezení"
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
-msgstr "Rychlé občersvení"
+msgstr "Rychlé občerstvení"
msgid "fish_and_chips"
msgstr "Ryba a hranolky (UK)"
@@ -20395,7 +20566,7 @@ msgid "Strip Club"
msgstr "Strip klub"
msgid "Brothel"
-msgstr "Nevestinec"
+msgstr "Nevěstinec"
msgid "Culture"
msgstr "Kultura"
@@ -20817,48 +20988,29 @@ msgstr "sluneční"
msgid "unorthodox"
msgstr "nekonvenční"
-msgid "Support"
-msgstr "Umístění"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "sloup"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "nástěnné"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "billboard"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "na zemi"
-
msgid "Visibility/readability"
msgstr "Viditelnost/čitelnost"
msgid "house (up to 5m)"
-msgstr "dom (viac ako 5 m)"
+msgstr "dům (do 5m)"
msgid "street (up to 20m)"
-msgstr "ulica (viac ako 20 m)"
+msgstr "ulice (do 20m)"
msgid "area (more than 20m)"
-msgstr "oblasť (viac ako 20 m)"
+msgstr "oblast (více než 20m)"
msgid "Shows current date"
msgstr "Zobrazuje datum"
msgid "Shows temperature"
-msgstr "Zobrazena teplota"
+msgstr "Zobrazuje teplotu"
msgid "Shows barometric pressure"
msgstr "Zobrazen barometrický tlak"
msgid "Shows humidity"
-msgstr "Zobrazena vlkhost vzduchu"
+msgstr "Zobrazena vlhkost vzduchu"
msgid "Recycling Container"
msgstr "Recyklační kontejner"
@@ -20987,10 +21139,10 @@ msgid "Hide"
msgstr "Úkryt"
msgid "Lock"
-msgstr "Uzamknutelný"
+msgstr "Uzamykatelný"
msgid "Indoor"
-msgstr "V budove"
+msgstr "V budově"
msgid "Fire Hydrant"
msgstr "Požární hydrant"
@@ -21012,18 +21164,18 @@ msgid "pond"
msgstr "rybník"
msgid "Diameter (in mm)"
-msgstr "Priemer (v mm)"
+msgstr "Průměr (v mm)"
msgid "Hydrant Position"
msgstr "Umístění hydrantu"
msgctxt "hydrant position"
msgid "lane"
-msgstr "ochranné okolie"
+msgstr "ochranné okolí"
msgctxt "hydrant position"
msgid "parking_lot"
-msgstr "parkovisko"
+msgstr "parkovací místo"
msgctxt "hydrant position"
msgid "sidewalk"
@@ -21034,7 +21186,7 @@ msgid "green"
msgstr "zeleň"
msgid "Pressure (in bar)"
-msgstr "Tlak (v baroch)"
+msgstr "Tlak (v barech)"
msgid "suction"
msgstr "sání"
@@ -21257,7 +21409,7 @@ msgstr "klasická;bruslení"
msgctxt "piste:grooming"
msgid "scooter"
-msgstr "skůtrem"
+msgstr "skútrem"
msgctxt "piste:grooming"
msgid "backcountry"
@@ -21351,7 +21503,7 @@ msgid "Racquetball"
msgstr "racquetbal (podobné jako squash, jiná pravidla)"
msgid "Table Tennis/Ping-Pong"
-msgstr "Stolní tenis/pingpong"
+msgstr "Stolní tenis/ping pong"
msgid "Tennis"
msgstr "Tenis"
@@ -21415,6 +21567,14 @@ msgid "barn"
msgstr "stodola"
msgctxt "building"
+msgid "stable"
+msgstr "stáj"
+
+msgctxt "building"
+msgid "cabin"
+msgstr "chatka"
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "budova na farmě"
@@ -21452,7 +21612,7 @@ msgstr "kůlna"
msgctxt "building"
msgid "storage_tank"
-msgstr "uskladňovací_nádrž"
+msgstr "uskladňovací nádrž"
msgctxt "building"
msgid "supermarket"
@@ -21613,32 +21773,6 @@ msgstr "víno"
msgid "Bunker Silo"
msgstr "Silážní jáma"
-msgid "Pipeline"
-msgstr "Potrubí"
-
-msgid "water"
-msgstr "voda"
-
-msgid "gas"
-msgstr "plyn"
-
-msgid "heat"
-msgstr "teplo"
-
-msgid "oil"
-msgstr "ropa"
-
-msgid "sewage"
-msgstr "kanalizace"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "podvodní"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "nadzemní"
-
msgid "Crane"
msgstr "Jeřáb"
@@ -21673,7 +21807,7 @@ msgid "copper"
msgstr "měď"
msgid "dimension_stone"
-msgstr "dekoračné kamene"
+msgstr "dekorační kameny"
msgid "gold"
msgstr "zlato"
@@ -21712,7 +21846,7 @@ msgid "zircon"
msgstr "zirkon"
msgid "Visible Headframe"
-msgstr "Viditelná težní věž"
+msgstr "Viditelná těžní věž"
msgid "Disused"
msgstr "Nepoužívaný"
@@ -21723,6 +21857,23 @@ msgstr "Štola"
msgid "Length in meters"
msgstr "Délka v metrech"
+msgid "Pipeline"
+msgstr "Potrubí"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "podvodní"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "nadzemní"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Vodojem"
@@ -21963,6 +22114,34 @@ msgstr "otáčecí pilíř"
msgid "Bridge outline"
msgstr "Půdorys mostu"
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "Elektrárna"
@@ -22083,7 +22262,7 @@ msgid "fusion"
msgstr "termonukleární fúze"
msgid "China Pressurized Reactor (CPR-1000)"
-msgstr "Čínký tlakovodní reaktor (CPR-1000)"
+msgstr "Čínský tlakovodní reaktor (CPR-1000)"
msgid "European Pressurized Reactor (EPR)"
msgstr "Evropský tlakovodní reaktor (EPR)"
@@ -22948,7 +23127,7 @@ msgid "Gift/Souvenir"
msgstr "Dárky/Suvenýry"
msgid "Variety Store"
-msgstr "Zmiešaný tovar"
+msgstr "Smíšené zboží"
msgid "Bookmaker"
msgstr "Bookmaker"
@@ -23130,6 +23309,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr "Kanceláře"
+
+msgctxt "office"
+msgid "Accountant"
+msgstr "Účetní"
+
+msgctxt "office"
+msgid "Administrative"
+msgstr "Místní správa"
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr "Reklamní agentura"
+
+msgctxt "office"
+msgid "Architect"
+msgstr "Architekt"
+
+msgctxt "office"
+msgid "Association"
+msgstr "Neziskové sdružení"
+
+msgctxt "office"
+msgid "Private company"
+msgstr "Soukromá společnost"
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr "Vzdělávací instituce"
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr "Agentura práce"
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr "Realitní kancelář"
+
+msgctxt "office"
+msgid "Foundation"
+msgstr "Nadace"
+
+msgctxt "office"
+msgid "Government"
+msgstr "Vládní úřad/ministerstvo"
+
+msgctxt "office"
+msgid "Insurance"
+msgstr "Pojišťovna"
+
+msgctxt "office"
+msgid "It specialist"
+msgstr "IT specialista"
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr "Právník"
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr "Vydavatelství novin"
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr "Nevládní organizace (NGO)"
+
+msgctxt "office"
+msgid "Notary"
+msgstr "Notář"
+
+msgctxt "office"
+msgid "Political party"
+msgstr "Politická strana"
+
+msgctxt "office"
+msgid "Religion"
+msgstr "Církevní organizace"
+
+msgctxt "office"
+msgid "Research"
+msgstr "Výzkum"
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr "Daňový poradce"
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr "Telekomunikační společnost"
+
msgid "Geography"
msgstr "Geografie"
@@ -23140,7 +23410,7 @@ msgid "Administrative"
msgstr "Administrativní"
msgid "Administrative level"
-msgstr "Administratívní úroveň"
+msgstr "Administrativní úroveň"
msgid "Maritime"
msgstr "Námořní"
@@ -23155,7 +23425,7 @@ msgid "canton"
msgstr "kanton"
msgid "linguistic_community"
-msgstr "jazyková_komunita"
+msgstr "jazyková komunita"
msgid "ward"
msgstr "volební obvod"
@@ -23237,7 +23507,8 @@ msgid "A farm within a bigger settlement"
msgstr "Statek uvnitř většího osídlení"
msgid "(please use isolated_dwelling for an isolated farm)"
-msgstr "(prosím použijte tag \"isolated_dwelling\" pro izolovaný statek)"
+msgstr ""
+"(prosím, použijte pro izolovaný statek značku \"isolated_dwelling\" )"
msgid "Locality"
msgstr "Místní název"
@@ -23469,7 +23740,7 @@ msgid ""
"A single notable free-standing rock, which may differ from the composition "
"of the terrain it lies in."
msgstr ""
-"Osamělá výrazná skala, která se může odlišovat od složení okolního terénu."
+"Osamělá výrazná Skála, která se může odlišovat od složení okolního terénu."
msgid "Land use"
msgstr "Využití krajiny"
@@ -23480,6 +23751,29 @@ msgstr "Dvůr statku"
msgid "Farmland"
msgstr "Zemědělská půda"
+msgid "Crop"
+msgstr "Plodina"
+
+msgctxt "crop"
+msgid "corn"
+msgstr "kukuřice"
+
+msgctxt "crop"
+msgid "grass"
+msgstr "tráva"
+
+msgctxt "crop"
+msgid "rice"
+msgstr "rýře"
+
+msgctxt "crop"
+msgid "wheat"
+msgstr "pšenice"
+
+msgctxt "crop"
+msgid "hop"
+msgstr "chmel"
+
msgid "Meadow"
msgstr "Louka"
@@ -23889,7 +24183,7 @@ msgid "protected_area"
msgstr "chráněná oblast"
msgid "Sub area"
-msgstr "Podoblasť"
+msgstr "Podoblast"
msgid "Administration centre"
msgstr "Administrativní centrum"
@@ -23961,13 +24255,13 @@ msgid "maxheight"
msgstr "max výška"
msgid "maxweight"
-msgstr "max hmotnosť"
+msgstr "max hmotnost"
msgid "maxspeed"
msgstr "max. rychlost"
msgid "mindistance"
-msgstr "min vzdialenosť"
+msgstr "min vzdálenost"
msgid "check"
msgstr "kontrola"
@@ -24093,7 +24387,7 @@ msgid "Street"
msgstr "Ulice"
msgid "ways being part of street"
-msgstr "cestv tvořící ulici"
+msgstr "cesty tvořící ulici"
msgid "addresses belonging to the street"
msgstr "adresy patřící do ulice"
@@ -24174,7 +24468,7 @@ msgid "branch waterways (no riverbank)"
msgstr "větev vodní cesty (bez nábřeží)"
msgid "spring of waterway"
-msgstr "pramnň vodního toku"
+msgstr "pramen vodního toku"
msgid "Length (meters)"
msgstr "Délka (v metrech)"
@@ -24237,10 +24531,10 @@ msgid "{0} together with {1}"
msgstr "{0} zároveň s {1}"
msgid "incomplete object: only {0}"
-msgstr "nekomplentí objekt: pouze {0}"
+msgstr "nekompletní objekt: pouze {0}"
msgid "incomplete object: only {0} and {1}"
-msgstr "nekomplentí objekt: pouze {0} a {1}"
+msgstr "nekompletní objekt: pouze {0} a {1}"
msgid "{0} together with addr:*"
msgstr "{0} spolu s addr:*"
@@ -24486,6 +24780,9 @@ msgstr "{0} musí být číselná hodnota"
msgid "{0} must be a positive integer number"
msgstr "{0} musí být celé kladné číslo"
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr "relace bez \"type\""
@@ -24543,6 +24840,12 @@ 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 "Display fill colour of areas with place=*"
+msgstr "Zobrazit výplňovou barvu oblastí s place=*"
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr "Plochy se vykreslují s výplní pouze okolo jejich vnitřních hran"
+
msgid "Columbus V-900 CSV Files"
msgstr "CSV soubory Columbus V-900"
@@ -24613,7 +24916,7 @@ msgid "Set input focus to the command line."
msgstr "Nastavte vstupní fokus na příkazovou řádku."
msgid "Point on the start"
-msgstr "Uzel na začiatku"
+msgstr "Uzel na začátku"
msgid "Point on the end"
msgstr "Uzel na konci"
@@ -24653,7 +24956,7 @@ msgstr ""
"společný"
msgid "Select two ways with a node in common"
-msgstr "Vybrat svě cesty se společným bodem."
+msgstr "Vybrat dvě cesty se společným bodem."
msgid "Select two ways with alone a node in common"
msgstr "Vybrat dvě cesty a jeden jejich společný uzel"
@@ -24743,7 +25046,7 @@ msgid "Connecting..."
msgstr "Připojuji se..."
msgid "Upload canceled"
-msgstr "Nahrávanie bolo zrušené"
+msgstr "Nahrávání bylo zrušeno"
msgid "Error while uploading"
msgstr "Chyba při nahrávání na server"
@@ -24773,7 +25076,7 @@ msgid "Elevation Profile"
msgstr "Výškový profil"
msgid "Elevation Grid Layer (experimental!)"
-msgstr "Vrsta modelu terénu (Experimentální!)"
+msgstr "Vrstva modelu terénu (Experimentální!)"
msgid "Shows elevation grid layer"
msgstr "Zobrazit vrstvu výškového modelu terénu"
@@ -24815,7 +25118,7 @@ msgid "(No elevation data)"
msgstr "(žádné údaje o nadmořské výšce)"
msgid "Can not save preferences"
-msgstr "Nelze uložit předvoľby"
+msgstr "Nelze uložit předvolby"
msgid "Epsilon multiplier"
msgstr "Násobitel epsilon"
@@ -24824,7 +25127,7 @@ msgid "Starting Epsilon"
msgstr "Počáteční epsilon"
msgid "Max points count per 1 km"
-msgstr "Max počet bodov na 1 km"
+msgstr "Max počet bodů na 1 km"
msgid "Enter key mode"
msgstr "Funkce klávesy Enter"
@@ -24877,7 +25180,7 @@ msgid ""
"Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
"to delete, Enter to simplify or save, Ctrl-Shift-Click to start new line"
msgstr ""
-"kliknutí nebo kliknutí&tažení pokračuje, Ctrl+kliknutí přidá pevný uzel, "
+"Kliknutí nebo kliknutí a tažení pokračuje, Ctrl+kliknutí přidá pevný uzel, "
"Shift+kliknutí smaže, Enter zjednoduší nebo uloží, Ctrl+Shift+kliknutí začne "
"novou čáru"
@@ -24926,7 +25229,7 @@ msgid "Show dialog with incomplete addresses"
msgstr "Zobrazit dialog s nekompletními adresami"
msgid "Include objects used for guesses"
-msgstr "Vložte objekty použité pre odhady"
+msgstr "Vložte objekty použité pro odhady"
msgid "Fix street addresses"
msgstr "Opravit adresy ulic"
@@ -25002,7 +25305,7 @@ msgstr "žádné položky"
msgctxt "address"
msgid "City"
-msgstr "Mesto"
+msgstr "Město"
msgid "Postcode"
msgstr "PSČ"
@@ -25114,10 +25417,10 @@ msgid "Import image"
msgstr "Importovat obrázek"
msgid "Import georeferenced image"
-msgstr "Import georeferenčného obrázka"
+msgstr "Import georeferenčního obrázku"
msgid "Error while creating image layer: "
-msgstr "Chyba pri vytváraní obrazu vrstvy: "
+msgstr "Chyba při vytváření obrazu vrstvy: "
msgid "NanoLog"
msgstr "NanoLog"
@@ -25144,7 +25447,7 @@ msgid "Save NanoLog layer"
msgstr "Uložit vrstvu NanoLog"
msgid "Open NanoLog panel"
-msgstr "Ovevřít panel NanoLog"
+msgstr "Otevřít panel NanoLog"
msgid "Open NanoLog file..."
msgstr "Otevřít soubor NanoLog..."
@@ -25201,7 +25504,7 @@ msgid "apply {0}"
msgstr "použít {0}"
msgid "There is something wrong in the value near:"
-msgstr "Je nejaká chyba v hodnotě poblíž:"
+msgstr "Je nějaká chyba v hodnotě poblíž:"
msgid "Info: {0}"
msgstr "Info: {0}"
@@ -25357,7 +25660,7 @@ msgid "Please enter valid number for ending address"
msgstr "Zadejte použitelné číslo pro koncovou adresu"
msgid "Starting address number must be less than ending address number"
-msgstr "Počáteční číslo adresy musí být menší než koncové císlo"
+msgstr "Počáteční číslo adresy musí být menší než koncové číslo"
msgid "Align Way Segments"
msgstr "Zarovnat úseky cest"
@@ -26031,8 +26334,8 @@ msgstr ""
msgid ""
"Warning: failed to put option pane dialog always on top. Exception was: {0}"
msgstr ""
-"Varovanie: neúspešná voľba umiestniť panel dialógu vždy na vrchu. Výnimky "
-"boli: {0}"
+"Varování: neúspěšná volba umístit panel dialogu vždy na vrchu. Výjimka byla: "
+"{0}"
msgid ""
"To enable the cadastre WMS plugin, change\n"
@@ -26108,7 +26411,7 @@ msgid "commune"
msgstr "obec"
msgid "Enable automatic caching."
-msgstr "Zapnout automatické cachování."
+msgstr "Zapnout automatické kešování."
msgid "Max. cache size (in MB)"
msgstr "Max. velikost keše (MB)"
@@ -26172,7 +26475,7 @@ msgid "Low resolution (600x400)"
msgstr "Nízké rozlišení (600x400)"
msgid "Image filter interpolation:"
-msgstr "Obrázkový filter interpolácie:"
+msgstr "Obrázkový filtr interpolace:"
msgid "Nearest-Neighbor (fastest) [ Default ]"
msgstr "Nejbližší soused (nejrychlejší) [ výchozí ]"
@@ -26229,7 +26532,7 @@ msgid "Municipality administrative borders."
msgstr "Administrativní hranice samospráv."
msgid "Raster images grab multiplier:"
-msgstr "Multiplikátor achytávače rastrových obrázků:"
+msgstr "Multiplikátor zachytávače rastrových obrázků:"
msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
@@ -26254,8 +26557,8 @@ msgid ""
"Automatically selects the first WMS layer if multiple layers exist when "
"grabbing."
msgstr ""
-"Automaticky vyberie první WMS vrstvu, existuje-li více vrstev při "
-"zachytávání (grabování)."
+"Automaticky vybere první WMS vrstvu, existuje-li více vrstev při zachytávání "
+"(grabování)."
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr "Tohle povolte, aby se používala značka ''addr:street'' na uzlech."
@@ -26289,7 +26592,7 @@ msgid "Extract SVG ViewBox..."
msgstr "Extrahovat SVG ViewBox..."
msgid "Extract best fitting boundary..."
-msgstr "Vyberte nejvhodnejší rozhraní(hranice)..."
+msgstr "Vyberte nejvhodnější rozhraní(hranice)..."
msgid "Create boundary"
msgstr "Vytvořit hranice"
@@ -26305,7 +26608,7 @@ msgid ""
"Use the normal Cadastre Grab menu."
msgstr ""
"Obec je vektorizovaná !\n"
-"Použite normálne Cadastre Grab menu."
+"Použijte normální Cadastre Grab menu."
msgid ""
"This commune is not vectorized.\n"
@@ -26330,7 +26633,7 @@ msgid "Cadastre grab"
msgstr "Zachycení katastru"
msgid "Download Image from French Cadastre WMS"
-msgstr "Stáhnout obrázek z Francouzkého katastrálního WMS"
+msgstr "Stáhnout obrázek z Francouzského katastrálního WMS"
msgid "Cadastre: {0}"
msgstr "Katastr: {0}"
@@ -26339,17 +26642,17 @@ msgid "Georeference an image"
msgstr "Přiřazení souřadnic obrázku"
msgid "Grab non-georeferenced image"
-msgstr "Zachytený obrázok bez zemepisných súradníc"
+msgstr "Zachycený obrázek bez zeměpisných souřadnic"
msgid "Georeferencing interrupted"
-msgstr "Určovanie zemepisných súradníc prerušené"
+msgstr "Zjišťování zeměpisných souřadnic přerušeno"
msgid ""
"This image contains georeference data.\n"
"Do you want to use them ?"
msgstr ""
-"Tento obrázok obsahuje georeferenčné dáta.\n"
-"Chcete ich použiť?"
+"Tento obrázek obsahuje georeferenční data.\n"
+"Chcete je použít?"
msgid "Load layer from cache"
msgstr "Načíst vrstvu z keše"
@@ -26449,7 +26752,7 @@ msgstr ""
"(povinné jsou dva uzly)"
msgid "Image georeferencing"
-msgstr "Určovanie zemepisnej polohy obrázkov"
+msgstr "Určování zeměpisné polohy obrázku"
msgid ""
"Do you want to cancel completely\n"
@@ -26466,10 +26769,10 @@ msgstr ""
"všechny souřadnice. Zkuste to znovu, prosím."
msgid "Enter cadastre east,north position"
-msgstr "Vstúpiť do cadastre na východ, sever pozici"
+msgstr "Vložit východní a severní pozici katastru"
msgid "(Warning: verify north with arrow !!)"
-msgstr "(Varovanie: potvrdte sever so šípkou !!)"
+msgstr "(Varování: potvrďte sever šipkou!)"
msgid "East"
msgstr "Východ"
@@ -26478,15 +26781,15 @@ msgid "I use the mouse"
msgstr "Používám myš"
msgid "Set {0} Lambert coordinates"
-msgstr "Zvoliť {0} Lambert súradnice"
+msgstr "Zvolit {0} Lambertovy souřadnice"
msgid "Click second corner for image cropping"
msgstr "Klikněte na druhý roh pro oříznutí obrázku"
msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
-"Zvoľte druhý Lambert priečnik(crosspiece) pre určovanie zemepisnej "
-"polohy(georeferencing)"
+"Zvolte druhý Lambertův příčník(crosspiece) pro určení zeměpisné polohy "
+"(georeferencing)"
msgid "Adjust WMS"
msgstr "Upravit WMS"
@@ -26547,7 +26850,7 @@ msgid "Cache Lambert Zone Error"
msgstr "Chyba Lambertovy projekce v keši"
msgid "canvec tile helper"
-msgstr "pomocník s dlažidcemi CanVec"
+msgstr "pomocník s dlaždicemi CanVec"
msgid "Use"
msgstr "Použití"
@@ -26565,7 +26868,7 @@ msgid "Use the selected scheme from the list."
msgstr "Použít vybrané schéma ze seznamu."
msgid "Use the current colors as a new color scheme."
-msgstr "Použít současné bervy jako nové barevné schéma."
+msgstr "Použít současné barvy jako nové barevné schéma."
msgid "Delete the selected scheme from the list."
msgstr "Smazat vybrané schéma ze seznamu."
@@ -26578,9 +26881,9 @@ msgstr "Sloučit dva objekty"
msgid "Added {0} object to subject layer"
msgid_plural "Added {0} objects to subject layer"
-msgstr[0] "Přidán {0} objekt do cílové vrsty"
-msgstr[1] "Přidány {0} objekty do cílové vrsty"
-msgstr[2] "Přidáno {0} objektů do cílové vrsty"
+msgstr[0] "Přidán {0} objekt do cílové vrstvy"
+msgstr[1] "Přidány {0} objekty do cílové vrstvy"
+msgstr[2] "Přidáno {0} objektů do cílové vrstvy"
msgid "Conflation"
msgstr "Sloučení"
@@ -26643,7 +26946,7 @@ msgid "Select the primitives currently selected in the list"
msgstr "Vybrat prvky, které jsou v seznamu právě vybrané"
msgid "Match finder settings"
-msgstr "Nastevní hledání shod"
+msgstr "Nastavení hledání shod"
msgid "Match finder method"
msgstr "Způsob hledání shod"
@@ -26700,80 +27003,96 @@ msgid "Invalid reference or subject"
msgstr "Nepoužitelná reference nebo cíl"
msgid "Download OSM data continuously"
-msgstr ""
+msgstr "Stahovat OSM data kontinuálně"
msgid "Download map data continuously when paning and zooming."
-msgstr ""
+msgstr "Stahovat OSM data kontinuálně při posouvání a zvětšování."
msgid "Toggle the continuous download on/off"
-msgstr ""
+msgstr "Zapnout/vypnout kontinuální stahování."
msgid "Download Settings"
-msgstr ""
+msgstr "Nastavení stahování"
msgid "Settings for the continuous download."
-msgstr ""
+msgstr "Nastavení pro kontinuální stahování."
msgid "Activate continuous downloads at startup."
-msgstr ""
+msgstr "Aktivovat kontinuální stahování při startu."
msgid "Supress the default modal progress monitor when downloading."
-msgstr ""
+msgstr "Potlačit při stahování výchozí modální okno průběhu."
msgid ""
"If this plugin is active at startup. This default state will not change when "
"you are toggeling the plugin with the menu option."
msgstr ""
+"Je-li tento doplněk aktivní při startu. Výchozí stav se nezmění, když "
+"přepínáte doplněk položkou menu."
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
msgstr ""
+"Maximální počet vláken použitých pro stahování. Vyšší hodnota způsobí, že "
+"klient pošle víc současných požadavků na server."
+
+msgid "Requires restart"
+msgstr "Vyžaduje restart"
msgid "Max threads"
-msgstr ""
+msgstr "Max. vláken"
msgid "Maximum number of boxes to download for each pan/zoom."
-msgstr ""
+msgstr "Maximální počet oken ke stažení pro každý posuv/zvětšení."
msgid "Max download boxes"
-msgstr ""
+msgstr "Max. stahovacích oken"
msgid ""
"Time in milliseconds after a pan/zoom before it starts downloading. "
"Additional changes in the viewport in the waiting time will reset the timer."
msgstr ""
+"Čas v milisekundách po posuvu/zvětšení než se zahájí stahování. Další změny "
+"v aktuální okně během doby čekání resetují počitadlo."
msgid "Wait time (milliseconds)"
-msgstr ""
+msgstr "Čekací doba (milisekundy)"
msgid ""
"How much extra area around the viewport is it going to download. Setting "
"this to 0 will not download any extra data."
msgstr ""
+"Jak moc další oblasti okolo oblasti pohledu se má stáhnout. Nastavení na 0 "
+"nestáhne žádná další data."
msgid "Extra download area"
-msgstr ""
+msgstr "Další oblast okolo"
msgid ""
"Max area to download in degrees^2. Increasing this number will cause the "
"plugin to download areas when you are zoomed far out."
msgstr ""
+"Maximální oblast ke stažení ve stupních^2. Zvětšením tohoto čísla způsobí, "
+"že doplněk stáhne oblasti, když jste zmenšili hodně daleko."
msgid "Max download area"
-msgstr ""
+msgstr "Max. stahovací oblast"
msgid "The strategy for finding what areas to request from the server."
-msgstr ""
+msgstr "Strategie hledání, které oblasti se mají požadovat od serveru."
msgid "Download strategy"
-msgstr ""
+msgstr "Strategie stahování"
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
+"Potlačí při stahování okno s průběhem stahování. Pokud je tato volba "
+"povolena, pak není žádný indikátor, že se něco stahuje a ani žádná možnost "
+"jak stahování přerušit."
msgid "Address"
msgstr "Adresa"
@@ -27074,7 +27393,7 @@ msgid "Add EGPX layer"
msgstr "Přidat EGPX vrstvu"
msgid "GPX Data"
-msgstr "GPX dáta"
+msgstr "GPX data"
msgid "Classes element below root child level"
msgstr "Prvek třídy pod úrovní potomka kořenového prvku"
@@ -27215,7 +27534,7 @@ msgid "weight (t)"
msgstr "váha (t)"
msgid "axleload (t)"
-msgstr "zaťaženie na nápravu (t)"
+msgstr "zatížení na nápravu (t)"
msgid "Bookmark name"
msgstr "Název záložky"
@@ -27242,19 +27561,19 @@ msgid "Road requirements"
msgstr "Požadavky na silnici"
msgid "Max. incline up (%, pos.)"
-msgstr "Max. stúpanie (%)"
+msgstr "Max. stoupání (%)"
msgid "Maximum incline the vehicle can go up"
msgstr "Maximální stoupání, které je vozidlo schopné vyjet"
msgid "Max. incline down (%, pos.)"
-msgstr "Max. klesanie (%)"
+msgstr "Max. klesání (%)"
msgid "Maximum incline the vehicle can go down"
msgstr "Maximální klesání, které je vozidlo schopné sjet"
msgid "Surface blacklist"
-msgstr "Zákázané typy povrchu"
+msgstr "Zakázané typy povrchu"
msgid ""
"List of surfaces the vehicle cannot use, values are separated by semicolons "
@@ -27336,10 +27655,10 @@ msgid "Draw directions separately"
msgstr "Kreslit směry zvlášť"
msgid "Node color"
-msgstr "Farba bodu"
+msgstr "Barva bodu"
msgid "Arrow color"
-msgstr "Farba šípky"
+msgstr "Barva šípky"
msgid "Arrowhead fill color"
msgstr "Barva výplně šipky"
@@ -27351,7 +27670,7 @@ msgid "New bookmark"
msgstr "Nová záložka"
msgid "Really delete \"{0}\"?"
-msgstr "Naozaj zmazať \"{0}\"?"
+msgstr "Opravu smazat \"{0}\"?"
msgid "Bookmark deletion"
msgstr "Vymazání záložky"
@@ -27364,7 +27683,7 @@ msgstr ""
"Všechny ručně přidané nebo upravené záložky budou ztraceny!"
msgid "Bookmark reset"
-msgstr "Reset záložky"
+msgstr "Obnovení záložky"
msgid "Choose node color"
msgstr "Zvolte barvu uzlu"
@@ -27394,7 +27713,7 @@ msgid ""
"Weights must be given as positive decimal numbers with unit \"t\" or without "
"unit."
msgstr ""
-"Hmotnosť musí byť zadaná ako kladné desatinné číslo s jednotkou \"t\" alebo "
+"Hmotnost musí být zadaná jako kladné desetinné číslo s jednotkou \"t\" nebo "
"bez jednotky."
msgid ""
@@ -27415,7 +27734,7 @@ msgstr ""
msgid ""
"Inclines must be given as positive decimal numbers with followed by \"%\"."
-msgstr "Sklon musí byť zadaný ako kladné desatinné číslo nasledované \"%\"."
+msgstr "Sklon musí být zadán jako kladné desetinné číslo nasledované \"%\"."
msgid "Tracktype grades must be given as integers between 0 and 5."
msgstr ""
@@ -27475,10 +27794,10 @@ msgid "Deprecate Offset"
msgstr "Prohlásit za zastaralý"
msgid "Are you sure this imagery offset is wrong?"
-msgstr "Jeste si jisti, že tento posuv mapového podkladu je špatný?"
+msgstr "Jste si jisti, že tento posuv mapového podkladu je špatný?"
msgid "Are you sure this calibration geometry is aligned badly?"
-msgstr "Jeste si jisti, že tento kalibrační útvar je nesprávně zarovnaný?"
+msgstr "Jste si jisti, že tento kalibrační útvar je nesprávně zarovnaný?"
msgid "Warning: deprecation is basically irreversible!"
msgstr "Varování: prohlášení zastaralým se již nedá odvolat!"
@@ -27843,7 +28162,7 @@ msgstr "vytvářet relace OSM: junction"
msgid ""
"if enabled the plugin produces osm-relations from the junction subgraphs"
msgstr ""
-"pokud je povoleno, pak doplněk vytváří relace OSM pro podgrafy kžižovatek"
+"pokud je povoleno, pak doplněk vytváří relace OSM pro podgrafy křižovatek"
msgid "create the channel digraph"
msgstr "vytvořit orientovaný graf toků"
@@ -27881,7 +28200,7 @@ msgid "Number of {0}-ways junctions found: {1}"
msgstr "Počet nalezených {0}-cestných křižovatek: {1}"
msgid "generate all combinations from entrie/exit candidates"
-msgstr "vytvořit všechny kombinace možných vjedzů/výjezdů"
+msgstr "vytvořit všechny kombinace možných vjezdů/výjezdů"
msgid "Direction index ''{0}'' not found"
msgstr "Index směru ''{0}'' nenalezen."
@@ -28012,8 +28331,8 @@ msgid ""
"Maximum number of nodes to generate before bailing out (before simplifying "
"lines). Default 50000."
msgstr ""
-"Maximálny počet bodov na tvorbu pred sanáciou (pred zjednodušením línií). "
-"Štandardne 50000."
+"Maximální počet bodů na tvorbu před sanací (před zjednodušením linií). "
+"Standardně 50000."
msgid ""
"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -28102,7 +28421,7 @@ msgid "Status"
msgstr "Stav"
msgid "Way Info"
-msgstr "Infrormace o cestě"
+msgstr "Informace o cestě"
msgid "Speed"
msgstr "Rychlost"
@@ -28303,16 +28622,16 @@ msgid "Days"
msgstr "Dnů"
msgid "Imported images"
-msgstr ""
+msgstr "Importované obrázky"
msgid "Mapillary filter"
-msgstr "Filter Mapillary"
+msgstr "Filtr Mapillary"
msgid "Open Mapillary filter dialog"
-msgstr "Otevřit okno filtru Mapillary"
+msgstr "Otevřít okno filtru Mapillary"
msgid "Not older than: "
-msgstr ""
+msgstr "Ne starší než: "
msgid "Downloaded images"
msgstr "Stažené obrázky"
@@ -28405,7 +28724,7 @@ msgid "Wait for full quality pictures"
msgstr "Počkat na obrázek v maximální kvalitě"
msgid "Follow selected image"
-msgstr "Následovat vybraný obázek"
+msgstr "Následovat vybraný obrázek"
msgid "Go forward"
msgstr "Vpřed"
@@ -28473,7 +28792,7 @@ msgid "Finished upload"
msgstr "Nahrávání na server dokončeno"
msgid "Uploading: {0}"
-msgstr "Náhrávám na server: {0}"
+msgstr "Nahrávám na server: {0}"
msgid "Measured values"
msgstr "Naměřené hodnoty"
@@ -28500,7 +28819,7 @@ msgid "Angle"
msgstr "Úhel"
msgid "Angle between two selected Nodes"
-msgstr "Úhel mezi dvěmi zvolenými uzly"
+msgstr "Úhel mezi dvěma zvolenými uzly"
msgid "Layer to make measurements"
msgstr "Vrstva pro prováděná měření"
@@ -28515,7 +28834,7 @@ msgid "Merge overlap"
msgstr "Sloučit překrytí"
msgid "Merge overlap of ways."
-msgstr "Sluoučit překrytí cest."
+msgstr "Sloučit překrytí cest."
msgid "Merge Overlap (combine)"
msgstr "Sloučení překryvu (spojení)"
@@ -28542,16 +28861,16 @@ msgid "Michigan Left"
msgstr "Michiganské odbočení vlevo"
msgid "Adds no left turn for sets of 4 or 5 ways."
-msgstr "Pridť zákaz zabočenia vľavo pre sadu zo 4 alebo 5 ciest."
+msgstr "Přidat zákaz odbočení vlevo pro sadu 4 nebo 5 cest."
msgid "Please select 4 or 5 ways to assign no left turns."
-msgstr "Prosím vybrať 4 alebo 5 ciest na priradenie zákazu zabočenia v ľavo."
+msgstr "Prosím vyberte 4 nebo 5 cest na přiřazení zákazu odbočení vlevo."
msgid "Please select 4 ways that form a closed relation."
msgstr "Prosím označte 4 cesty, které tvoří uzavřenou relaci."
msgid "Unable to order the ways. Please verify their directions"
-msgstr "Pre neschopnosť usporiadať cesty. Prosím skontrolovať ich smery"
+msgstr "Nelze uspořádat cesty. Prosím, zkontrolujte jejich směry"
msgid "Create Michigan left turn restriction"
msgstr "Vytvořit zákaz Michiganského odbočení vlevo"
@@ -28592,13 +28911,13 @@ msgid "No, just keep it"
msgstr "No, nechat to tak"
msgid "Close the dialog and discard all changes"
-msgstr "Zavrieť okno a zahodiť všetky zmeny"
+msgstr "Zavřít okno a zahodit všechny změny"
msgid "Proceed and go to the next page"
msgstr "Udělat to a jít na další stranu"
msgid "Finish"
-msgstr "Dokončiť"
+msgstr "Dokončit"
msgid "Confirm the setup and close this dialog"
msgstr "Potvrdit nastavení a zavřít dialogové okno"
@@ -28646,7 +28965,7 @@ msgid "proxy password"
msgstr "heslo proxy"
msgid "oauth key"
-msgstr "oauth kľúč"
+msgstr "oauth klíč"
msgid "oauth secret"
msgstr "oauth heslo"
@@ -28663,13 +28982,13 @@ msgid "Save user and password ({0})"
msgstr "Uložení uživatelského jména a hesla ({0})"
msgid "Plain text, JOSM default"
-msgstr "Čitelný text, výhozí volba JOSM"
+msgstr "Čitelný text, výchozí volba JOSM"
msgid "Use {0}"
msgstr "Použít {0}"
msgid "Encrypt data with Windows logon credentials"
-msgstr "Zakódovať údaje s prihlasovacími údajmi Windows"
+msgstr "Zakódovat údaje s přihlašovacími údaji Windows"
msgid "The native password manager plugin detected {0} on your system."
msgstr "Doplněk Native Password Manager našel ve vašem systému {0}."
@@ -28718,7 +29037,7 @@ msgid "Accept"
msgstr "Přijmout"
msgid "Refuse"
-msgstr "Odmietnuť"
+msgstr "Odmítnout"
msgid "I understand and accept these terms and conditions"
msgstr "Rozumím a přijímám tyto podmínky a ujednání"
@@ -28744,15 +29063,17 @@ msgid ""
msgid_plural ""
"The following {0} modules have been downloaded <strong>successfully</strong>:"
msgstr[0] "Následující modul byl <strong>úspěšně</strong> stažen:"
-msgstr[1] "Následující moduly byly <strong>úspěšně</strong> staženy:"
-msgstr[2] "Následující moduly byly <strong>úspěšně</strong> staženy:"
+msgstr[1] "Následující {0} moduly byly <strong>úspěšně</strong> staženy:"
+msgstr[2] "Následujících {0} modulů bylo <strong>úspěšně</strong> staženo:"
msgid "Downloading the following module has <strong>failed</strong>:"
msgid_plural ""
"Downloading the following {0} modules has <strong>failed</strong>:"
msgstr[0] "Stahování následujícího modulu bylo <strong>neúspěšné</strong>:"
-msgstr[1] "Stahování následujících modulů bylo <strong>neúspěšné</strong>:"
-msgstr[2] "Stahování následujících modulů bylo <strong>neúspěšné</strong>:"
+msgstr[1] ""
+"Stahování následujících {0} modulů bylo <strong>neúspěšné</strong>:"
+msgstr[2] ""
+"Stahování následujících {0} modulů bylo <strong>neúspěšné</strong>:"
msgid "Modules"
msgstr "Moduly"
@@ -28761,7 +29082,7 @@ msgid "Accept the new module sites and close the dialog"
msgstr "Přijmout nové weby s moduly a zavřít dialog"
msgid "Configure Module Sites"
-msgstr "Nastavení webů s mobuly"
+msgstr "Nastavení webů s moduly"
msgid "Download the list of available modules"
msgstr "Stáhnout seznam dostupných modulů"
@@ -28770,7 +29091,7 @@ msgid "Update modules"
msgstr "Aktualizovat moduly"
msgid "Update the selected modules"
-msgstr "Aktualizovať vybrané moduly"
+msgstr "Aktualizovat vybrané moduly"
msgid "Please restart JOSM to activate the downloaded modules."
msgstr "Restartujte, prosím, JOSM, aby se aktivovaly stažené moduly."
@@ -29006,7 +29327,7 @@ msgstr ""
"platným URL. Stahování přeskakuji."
msgid "Downloading Module {0}..."
-msgstr "Stauji modul {0}..."
+msgstr "Stahuji modul {0}..."
msgid "An error occurred in module {0}"
msgstr "Došlo k chybě v modulu {0}"
@@ -29084,13 +29405,13 @@ msgid "Disable module"
msgstr "Zakázat modul"
msgid "Click to delete the module ''{0}''"
-msgstr "Klinutím smažete modul ''{0}''"
+msgstr "Kliknutím smažete modul ''{0}''"
msgid "Keep module"
msgstr "Ponechat modul"
msgid "Click to keep the module ''{0}''"
-msgstr "Klinutím ponecháte modul ''{0}''"
+msgstr "Kliknutím ponecháte modul ''{0}''"
msgid "Warning: failed to delete outdated module ''{0}''."
msgstr "Varování: nepodařilo se smazat zastaralý modul ''{0}''."
@@ -29207,7 +29528,7 @@ msgid "Firefox executable"
msgstr "Spustitelný soubor Firefoxu"
msgid "OSM Server Files pbf compressed"
-msgstr "soubory OSM servera skomprimované v pbf"
+msgstr "soubory OSM serveru zkomprimované v pbf"
msgid "Download PBF"
msgstr "Stáhnout PBF"
@@ -29390,7 +29711,7 @@ msgid "Please set a projection."
msgstr "Prosím, nastavte projekci"
msgid "Could not parse numbers. Please check."
-msgstr "Nelze načáíst čísla. Prosím, zkontrolujte."
+msgstr "Nelze načíst čísla. Prosím, zkontrolujte."
msgid "Building JOSM layer"
msgstr "Buduji vrstvu JOSM"
@@ -29442,7 +29763,7 @@ msgstr "Zapsat souřadnice do hlavičky obrázku"
msgid ""
"Write position information into the exif header of the following files:"
-msgstr "Zapíše informaci o poloze do hlavičky EXIF u nasledujících souborů:"
+msgstr "Zapíše informaci o poloze do hlavičky EXIF u následujících souborů:"
msgid "settings"
msgstr "nastavení"
@@ -29526,6 +29847,9 @@ msgstr "Neoznačené obrázky"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Chcete uložit současnou kalibraci vrstvy {0}?"
+msgid "Select an option"
+msgstr "Zvolte možnost"
+
msgid "Load Picture Calibration..."
msgstr "Načíst kalibraci obrázků…"
@@ -29535,6 +29859,9 @@ msgstr "Načíst kalibrační data ze souboru"
msgid "Loading file failed: {0}"
msgstr "Nahrávání souboru selhalo: {0}"
+msgid "Problem occurred"
+msgstr "Nastal problém"
+
msgid "Load World File Calibration..."
msgstr "Načíst kalibraci World File..."
@@ -29551,13 +29878,13 @@ msgid "Calibration reset"
msgstr "Vynulovat kalibraci"
msgid "Save Picture Calibration..."
-msgstr "Ukladám kalibráciu obrázka ..."
+msgstr "Ukládám kalibraci obrázku ..."
msgid "Saves calibration data to a file"
-msgstr "Kalibračné údaje uložené do souboru"
+msgstr "Kalibrační údaje uložené do souboru"
msgid "Saving file failed: {0}"
-msgstr "Uloženie souboru zlyhalo: {0}"
+msgstr "Uložení souboru selhalo: {0}"
msgid "New picture layer from clipboard"
msgstr "Nová vrstva s obrázkem ze schránky"
@@ -29578,6 +29905,9 @@ msgstr ""
"Použijte, prosím, {0}, abyste nahráli vaše KML, které byly nesprávně "
"kalibrovány."
+msgid "Notification"
+msgstr "Oznámení"
+
msgid "PicLayer move"
msgstr "PicLayer přemístění"
@@ -29585,7 +29915,7 @@ msgid "Moved"
msgstr "Posunuto"
msgid "Drag to move the picture"
-msgstr "Pretiahnite obrázok"
+msgstr "Přetáhněte obrázek"
msgid "PicLayer rotate"
msgstr "PicLayer otočení"
@@ -29594,7 +29924,7 @@ msgid "Rotated"
msgstr "Otočeno"
msgid "Drag to rotate the picture"
-msgstr "Ťahajte pre otočenie obrázka"
+msgstr "Tahejte pro otočení obrázku"
msgid "PicLayer scale X"
msgstr "PicLayer měřítko X"
@@ -29603,7 +29933,7 @@ msgid "Scaled by X"
msgstr "Změna velikosti v X"
msgid "Drag to scale the picture in the X Axis"
-msgstr "Dotiahnuť do mierky obrázka v osi X"
+msgstr "Dotáhnout do měřítka obrázku v ose X"
msgid "PicLayer scale"
msgstr "PicLayer měřítko"
@@ -29612,7 +29942,7 @@ msgid "Scaled"
msgstr "Změněná velikost"
msgid "Drag to scale the picture in the X and Y Axis"
-msgstr "Dotiahnuť do mierky obrázka v osi X a Y"
+msgstr "Dotáhnout do měřítka obrázku v osách X a Y"
msgid "PicLayer scale Y"
msgstr "PicLayer měřítko Y"
@@ -29621,43 +29951,43 @@ msgid "Scaled by Y"
msgstr "Změna velikosti v Y"
msgid "Drag to scale the picture in the Y Axis"
-msgstr "Ťahať na mierku obrázku v osi Y"
+msgstr "Dotáhnout do měřítka obrázku v ose Y"
msgid "PicLayer shear"
-msgstr "PicLayer skosenie"
+msgstr "PicLayer zkosení"
msgid "Sheared"
msgstr "Ostřiženo"
msgid "Drag to shear the picture"
-msgstr "Pretiahnite pre skosenie obrázka"
+msgstr "Přetáhněte pro zkosení obrázku"
msgid "PicLayer Move point"
-msgstr "PicLayer premiestnenie bodu"
+msgstr "PicLayer přemístění bodu"
msgid "Point added/moved"
msgstr "Bod přidán/posunut"
msgid "Drag or create point on the picture"
-msgstr "Premiestniť alebo vytvoriť uzel na obrázku"
+msgstr "Přemístit nebo vytvořit uzel na obrázku"
msgid "PicLayer Remove point"
msgstr "PicLayer Odstranit bod"
msgid "Point removed"
-msgstr "Bod ostraněn"
+msgstr "Bod odstraněn"
msgid "Remove point on the picture"
-msgstr "Ostranit bod z obrázku"
+msgstr "Odstranit bod z obrázku"
msgid "PicLayer Transform point"
-msgstr "PicLayer transformácia bodu"
+msgstr "PicLayer transformace bodu"
msgid "Point transformed"
msgstr "Bod transformován"
msgid "Transform point on the picture"
-msgstr "Tranformovat bod na obrázku"
+msgstr "Transformovat bod na obrázku"
msgid "PicLayer: {0}"
msgstr "PicLayer: {0}"
@@ -29666,10 +29996,10 @@ msgid "Calibration Files"
msgstr "Kalibrační soubory"
msgid "Could not find the map object."
-msgstr "Nepodarilo sa nájsť objekt na mape."
+msgstr "Nepodařilo se najít objekt na mapě."
msgid "PicLayer failed to load or import the image."
-msgstr "PicLayer zlyhal pri načítavaní alebo importovaní obrázku."
+msgstr "PicLayer selhal při načítání nebo importovaní obrázku."
msgid "Nothing in clipboard"
msgstr "Ve schránce nic není"
@@ -29679,7 +30009,7 @@ msgstr "Data ve schránce nejsou obrázek"
msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
-"Varovanie: Nepodarilo sa spracovať zip soubor ''{0}''. Výnimka bola: {1}"
+"Varování: Nepodařilo se zpracovat zip soubor ''{0}''. Výjimka byla: {1}"
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr "Byl nalezen kalibrační soubor k souboru s obrázkem: {0}\n"
@@ -29694,7 +30024,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "Chcete ho použít?"
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr "Načíst kalibrační soubor?"
msgid "It will be applied automatically."
@@ -29774,22 +30104,22 @@ msgid "Media"
msgstr "Médium"
msgid "Orientation"
-msgstr "Orientácia"
+msgstr "Orientace"
msgid "Printer settings"
msgstr "Nastavení tiskárny"
msgid "Scale"
-msgstr "Mierka"
+msgstr "Měřítko"
msgid "Resolution"
-msgstr "Rozlíšenie"
+msgstr "Rozlišení"
msgid "Map information"
msgstr "Informace o mapě"
msgid "Map Preview"
-msgstr "Náhľad mapy"
+msgstr "Náhled mapy"
msgid "Zoom To Page"
msgstr "Celá stránka"
@@ -29933,9 +30263,6 @@ msgstr "Země"
msgid "pending"
msgstr "čekající"
-msgid "outside"
-msgstr "venkovní"
-
msgid "[incomplete]"
msgstr "[nekompletní]"
@@ -30024,7 +30351,7 @@ msgid "The GPX file contained no tracks or waypoints."
msgstr "Tento soubor GPX neobsahoval žádné trasy ani uzly tras."
msgid "Create Stops from GPX"
-msgstr "Vytvořiz zastávky podle GPX"
+msgstr "Vytvořit zastávky podle GPX"
msgid "Tracks in this GPX file:"
msgstr "Trasy v tomto souboru GPX:"
@@ -30088,7 +30415,7 @@ msgid "Public transport routes"
msgstr "Trasy veřejné dopravy"
msgid "Toggle direction arrows"
-msgstr "Přeponout směrové šipky"
+msgstr "Přepnout směrové šipky"
msgid "Toggle reference labels"
msgstr "Přepnout referenční štítky"
@@ -30166,7 +30493,7 @@ msgid "Admin level"
msgstr "Administrativní úroveň"
msgid "Create a relation from selected objects"
-msgstr "Vytvoriť reláciu z vybraných objektov"
+msgstr "Vytvořit relaci z vybraných objektů"
msgid "Choose a type for the relation:"
msgstr "Zvolte typ relace:"
@@ -30175,7 +30502,7 @@ msgid "Delete relation"
msgstr "Smazat relaci"
msgid "Download incomplete members for the chosen relation"
-msgstr "Stiahnuť nekompletných členov vybranej relácie"
+msgstr "Stáhnout nekompletní členy vybrané relaci"
msgid "Download referrers"
msgstr "Stáhnout odkazující objekty"
@@ -30202,7 +30529,7 @@ msgid "Reconstruction of polygons can be done only from outer ways"
msgstr "Rekonstrukce polygonů je možná pouze z vnějších cest"
msgid "Reconstruct polygons from relation {0}"
-msgstr "Reconstruovat polygony z relace {0}"
+msgstr "Rekonstruovat polygony z relace {0}"
msgid "Reconstruct route"
msgstr "Rekonstruovat trasu"
@@ -30214,7 +30541,7 @@ msgid "Select relation in main selection."
msgstr "Vybere relaci v hlavním výběru."
msgid "Fix roles of the chosen relation members"
-msgstr "Opraviť úlohy vybratých členov relácie"
+msgstr "Opravit úlohy vybraných členů relace"
msgid "Complete multipolygon for way {0}"
msgstr "Dokončit multipolygon u cesty {0}"
@@ -30271,7 +30598,7 @@ msgid "Enter the ID of the changeset that should be reverted"
msgstr "Zadejte id sady změn, kterou chcete vrátit zpět"
msgid "Reverted changeset"
-msgstr "Zpětvrácená sada změn"
+msgstr "Vrácená sada změn"
msgid "It is not allowed to revert changeset from {0}"
msgstr "Není povoleno vracet zpět sady změn z {0}"
@@ -30280,7 +30607,7 @@ msgid "Downloading objects history"
msgstr "Stahuji historii objektů"
msgid "Missing merge target for {0} with id {1}"
-msgstr "Chýba zlučovaný cieľ pre {0} s id {1}"
+msgstr "Chybí slučovaný cíl pro {0} s id {1}"
msgid "Objects history"
msgstr "Historie objektů"
@@ -30292,7 +30619,7 @@ msgid "Tool: Display objects history dialog"
msgstr "Nástroj: Zobrazit dialog historie objektů"
msgid "Preparing history data..."
-msgstr "Pripravujem dáta histórie..."
+msgstr "Připravuji historická data..."
msgid "Remote Control has been asked to revert a changeset."
msgstr "Dálkové ovládání bylo požádáno o vrácení zpět sady změn"
@@ -30382,10 +30709,10 @@ msgid "custom"
msgstr "vlastní"
msgid "Could not read tagging preset source: ''{0}''"
-msgstr "Nepodarilo sa načítať zdroj prednastavených značiek: ''{0}''"
+msgstr "Nepodařilo se načíst zdroj přednastavených značek: ''{0}''"
msgid "Error parsing tagging preset from ''{0}'':\n"
-msgstr "Chyba pri čítaní prednastavených značiek z ''{0}'':\n"
+msgstr "Chyba při načítání přednastavených značek z ''{0}'':\n"
msgid "Sign {0}"
msgstr "Dopravní značka {0}"
@@ -30427,7 +30754,7 @@ msgid "Click and drag to move destination"
msgstr "Kliknutím a přetažením posunete cíl"
msgid "Click to remove destination"
-msgstr "Kliknutním odstraníte cíl"
+msgstr "Kliknutím odstraníte cíl"
msgid "Open a list of routing nodes"
msgstr "Otevřít seznam navigačních bodů"
@@ -30445,7 +30772,7 @@ msgid "Fastest"
msgstr "Nejrychlejší"
msgid "Ignore oneways"
-msgstr "Ignorovať jednosmerky"
+msgstr "Ignorovat jednosměrky"
msgid "Reverse route"
msgstr "Obrátit cestu"
@@ -30507,7 +30834,7 @@ msgid "SDS data file"
msgstr "Datový soubor SDS"
msgid "Load..."
-msgstr "Načítať..."
+msgstr "Nahrávám..."
msgid "Load separate data store data from a file."
msgstr "Nahrát data o SDS ze souboru."
@@ -30575,7 +30902,7 @@ msgid "SDS tag prefix"
msgstr "Prefix SDS značky"
msgid "Connection successful."
-msgstr "Spojení proběhlo úspešně"
+msgstr "Spojení proběhlo úspěšně"
msgid "Cannot connect to SDS server: "
msgstr "Nemohu se připojit k serveru SDS: "
@@ -30754,7 +31081,7 @@ msgid "Surveyor"
msgstr "Surveyor"
msgid "Could not read surveyor definition: {0}"
-msgstr "Nemôžem čítať meračské rozlíšenie: {0}"
+msgstr "Nemohu načíst geometrickou definici: {0}"
msgid "Error parsing {0}: {1}"
msgstr "Chyba při čtení {0}: {1}"
@@ -30769,7 +31096,7 @@ msgid "{0} end"
msgstr "{0} konec"
msgid "Waypoint Description"
-msgstr "Popis bodov"
+msgstr "Popis bodů"
msgid "Tag2Link Preferences"
msgstr "Nastavení Tag2Link"
@@ -30843,7 +31170,7 @@ msgid "List of Numbers"
msgstr "Seznam čísel"
msgid "add to existing associatedStreet relation"
-msgstr "přidat do existující relace přiřazená alice (associatedStreet)"
+msgstr "přidat do existující relace přiřazené ulice (associatedStreet)"
msgid "create an associatedStreet relation"
msgstr "vytvořit relaci Přiřazená ulice (associatedStreet)"
@@ -30921,7 +31248,7 @@ msgid "Open to-fix window."
msgstr "Otevřít okno to-fix"
msgid "Tool:To-fix"
-msgstr "Nástroj:To-fix"
+msgstr "Nástroj: To-fix"
msgid "Skip"
msgstr "Přeskočit"
@@ -30945,13 +31272,13 @@ msgid "~.02"
msgstr "~.02"
msgid "tofix:Skip item"
-msgstr "tofix:Přeskočit položku"
+msgstr "tofix: Přeskočit položku"
msgid "tofix:Fixed item"
-msgstr "tofix:Opravená položka"
+msgstr "tofix: Opravená položka"
msgid "tofix:Not a Error item"
-msgstr "tofix:Položka, která není chybou"
+msgstr "tofix: Položka, která není chybou"
msgid "Maintenance server"
msgstr "Server údržby"
@@ -30976,7 +31303,7 @@ msgid "Browse"
msgstr "Prohlížet"
msgid "Browse map with left button"
-msgstr "Prezerať mapu s ľavým tlačidlom"
+msgstr "Prohlížet mapu levým tlačítkem"
msgid "Merge objects nodes"
msgstr "Sloučit uzly objektů"
@@ -31012,7 +31339,7 @@ msgid ""
"New version of Tracer2Server is available. For best results please upgrade "
"to version {0}."
msgstr ""
-"Je k dispozici nová verze Tracer2Server. Doporučujeme vám upgradovat na "
+"Je k dispozici nová verze Tracer2Server. Doporučujeme vám aktualizovat na "
"verzi {0}."
msgid "No set of parameter is active!"
@@ -31108,7 +31435,7 @@ msgid "Download referenced osm objects..."
msgstr "Stáhnout odkazované objekty OSM..."
msgid "{0} Signatures loaded. All referenced OSM objects found."
-msgstr "Načteno {0} podpisů. Všechny odkazované objkety OSM byly nalezeny."
+msgstr "Načteno {0} podpisů. Všechny odkazované objekty OSM byly nalezeny."
msgid ""
"{0} of {1} OSM objects are referenced but not there.\n"
@@ -31125,7 +31452,7 @@ msgstr "Stáhnout podepsaná data"
msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
-"Upozornenie: Ignorujem výnimku, pretože úloha bola zrušená. Výnimka: {0}"
+"Upozornění: Ignoruji výjimku, protože úloha byla zrušená. Výjimka: {0}"
msgid ""
"Generating new Keypair.\n"
@@ -31467,16 +31794,16 @@ msgstr ""
"neviditelná ve vrstvě ''{1}''"
msgid "Clear the selected roles or delete the selected members"
-msgstr "Vymazať vybrané úlohy alebo odstrániť vybraných členov"
+msgstr "Smazat vybrané role nebo odstranit vybrané členy"
msgid "Insert new relation members from object in the clipboard"
msgstr "Vložit nové členy relace ze schránky"
msgid "Move the selected relation members down by one position"
-msgstr "Presunutie vybratých členov relácie dole o jednu pozíciu"
+msgstr "Přesunout vybrané členy relace o jednu pozici dolů"
msgid "Move the selected relation members up by one position"
-msgstr "Presunutie vybratých členov relácie hore o jednu pozíciu"
+msgstr "Přesunout vybrané členy relace o jednu pozici nahoru"
msgid "Edit basic attributes of a turn restriction"
msgstr "Upravit základní vlastnosti zákazu odbočení"
@@ -31560,7 +31887,7 @@ msgid "Remove deleted members and save"
msgstr "Odstranit smazané členy a uložit"
msgid "Cancel and return to editor"
-msgstr "Zrušit a vrátit seo do editoru"
+msgstr "Zrušit a vrátit se do editoru"
msgid "Deleted members in turn restriction"
msgstr "Smazané členy v zákaze odbočení"
@@ -31683,19 +32010,19 @@ msgid "Mopeds"
msgstr "Mopedy"
msgid "Use standard exceptions"
-msgstr "Použít standardní vyjímky"
+msgstr "Použít standardní výjimky"
msgid "Use non-standard exceptions"
-msgstr "Použít nestandardní vyjímky"
+msgstr "Použít nestandardní výjimky"
msgid "Remove the currently selected vias"
-msgstr "Vymazať aktuálne vybraté \"cez (via)\" objekty"
+msgstr "Smazat aktuálně vybrané \"přes (via)\" objekty"
msgid "Move the selected vias down by one position"
-msgstr "Presunutie vybratých \"cez (via)\" objektov dole o jednu pozíciu"
+msgstr "Přesunutí vybraných \"přes (via)\" objektů o jednu pozici dolů"
msgid "Move the selected vias up by one position"
-msgstr "Presunutie vybratých \"cez (via)\" objektov hore o jednu pozíciu"
+msgstr "Přesunutí vybraných \"přes (via)\" objektů o jednu pozici nahoru"
msgid "Copy the selected vias to the clipboard"
msgstr "Kopírovat vybrané objekty \"přes (via)\" do schránky"
@@ -31755,7 +32082,7 @@ msgid "Set the current JOSM selection to the selected turn restrictions"
msgstr "Vybrat v JOSM vybrané zákazy odbočení"
msgid "Select in current data layer"
-msgstr "Vyberte v aktuálnej dátovej vrstve"
+msgstr "Vyberte v aktuální datové vrstvě"
msgid "Zoom to the currently selected turn restrictions"
msgstr "Zvětšit na aktuálně vybrané zákazy odbočení"
@@ -31771,7 +32098,7 @@ msgstr ""
"href=\"http://www.skobbler.de\">skobbler GmbH</a>."
msgid "Configure the preferences for the turnrestrictions plugin"
-msgstr "Nastavit předvoby doplňku turnrestrictions"
+msgstr "Nastavit předvolby doplňku turnrestrictions"
msgid "Sponsor"
msgstr "Sponzor"
@@ -31836,7 +32163,7 @@ msgstr "Opravit v editoru"
msgid ""
"Go to Basic Editor and manually choose members with roles ''from'' and ''to''"
msgstr ""
-"Prejsť do Základného Editora a ručne zvoliť členov s funkciou ''z'' a ''na''"
+"Přejít do základního editoru a ručně zvolit členy s funkcí ''z'' a ''na''"
msgid ""
"This turn restriction uses a non-standard restriction type <tt>{0}</tt> for "
@@ -31848,7 +32175,7 @@ msgstr ""
"Vyberte, prosím, jednu ze standardních možností v základním editoru."
msgid "Go to Basic Editor and manually choose a turn restriction type"
-msgstr "Přepnout na základní editor a ručně zvolit typ zákazu odbočení"
+msgstr "Přejít do základního editoru a ručně zvolit typ zákazu odbočení"
msgid ""
"The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and the "
@@ -31930,7 +32257,7 @@ msgstr ""
"zákaz odbočení má {0} cesty s touto rolí. Prosím odstraňte {1} z nich."
msgid "Go to the Advanced Editor and remove the members"
-msgstr "Prejsť na pokročilý editor a odstrániť členov"
+msgstr "Přepnout na rozšířený editor a odstranit členy"
msgid ""
"The tag <tt>except</tt> has the non-standard value <tt>{0}</tt>. It is "
@@ -31941,8 +32268,8 @@ msgstr ""
msgid "Go to Basic Editor and select standard vehicle type based exceptions"
msgstr ""
-"Prejdite na základný editor a vyberte štandardný typ vozidla na základe "
-"výnimky"
+"Přejděte do základního editoru a vyberte standardní typ vozidla na základě "
+"výjimky"
msgid "The required tag <tt>{0}={1}</tt> is missing."
msgstr "Povinná značka <tt>{0}={1}</tt> chybí."
@@ -31977,7 +32304,7 @@ msgid "Split now"
msgstr "Rozdělit teď"
msgid "Split the ways"
-msgstr "Rozdelí cesty"
+msgstr "Rozdělí cesty"
msgid ""
"This turn restriction uses the node <span class=\"object-name\">{0}</span> "
@@ -32051,13 +32378,13 @@ msgid "Align Way Nodes"
msgstr "Zarovnat uzly cesty"
msgid "Align nodes in a way"
-msgstr "Zarovat uzly cesty"
+msgstr "Zarovnat uzly cesty"
msgid "The way with selected nodes can not be straightened."
-msgstr "Cesta s vybranými bodmi nemôže byť vyrovnaná."
+msgstr "Cesta s vybranými body nemůže být vyrovnaná."
msgid "Internal error: number of nodes is {0}."
-msgstr "Interná chyba: počet bodov je {0}."
+msgstr "Interní chyba: počet bodů je {0}."
msgid "Extract node"
msgstr "Vyjmout uzel"
@@ -32069,8 +32396,8 @@ msgid ""
"This tool extracts node from its ways and requires single node to be "
"selected."
msgstr ""
-"Tento nástroj extrahuje uzel z jeho cesty a potrebuje aby bol vybratý "
-"samotný uzel."
+"Tento nástroj extrahuje uzel z jeho cesty a potřebuje aby byl vybránsamotný "
+"uzel."
msgid "Extract node from line"
msgstr "Vyjme uzel z cesty"
@@ -32185,7 +32512,7 @@ msgid "Open custom URL"
msgstr "Otevřít vlastní URL"
msgid "Opens specified URL browser"
-msgstr "Otevřít zvolené URL v porhlížeči."
+msgstr "Otevřít zvolené URL v prohlížeči."
msgid "Utilsplugin2 settings"
msgstr "Utilsplugin2 nastavení"
@@ -32423,7 +32750,7 @@ msgid "All inside [testing]"
msgstr "Vše uvnitř [testování]"
msgid "Select all inside selected polygons"
-msgstr "Vybere všechny prvny uvnitř oblasti"
+msgstr "Vybrat všechny prvky uvnitř vybrané oblasti"
msgid ""
"Nothing found. Please select some closed ways or multipolygons to find all "
@@ -32640,7 +32967,7 @@ msgid ""
"an entire way first.</html>"
msgstr ""
"<html>Není vybrán ani uzel ani cesta s koncem mimo současně <br/>staženou "
-"oblast. <br/>Nejdřív yberte uzel na začátku nebo na konci cesty nebo celou "
+"oblast. <br/>Nejdřív vyberte uzel na začátku nebo na konci cesty nebo celou "
"cestu.</html>"
msgid "<html>Could not find a unique node to start downloading from.</html>"
diff --git a/i18n/po/cy.po b/i18n/po/cy.po
index 3ff0545..b288fc4 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2009-07-17 21:45+0000\n"
"Last-Translator: iggy23 <Unknown>\n"
"Language-Team: Welsh <cy at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
"2 : 3;\n"
-"X-Launchpad-Export-Date: 2015-10-30 05:02+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 05:02+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: cy\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -170,6 +170,12 @@ msgstr "Ategynnau"
msgid "About JOSM..."
msgstr "Ynglyn JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2132,13 +2138,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2152,6 +2154,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2346,6 +2357,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2364,9 +2378,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3161,12 +3172,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "ANHYSBYS"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4758,6 +4769,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4930,7 +4948,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5732,20 +5750,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6977,13 +6990,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11940,6 +11956,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12102,6 +12121,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13938,6 +13960,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14544,6 +14570,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14571,7 +14600,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15147,6 +15179,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15292,6 +15327,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15330,6 +15370,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15763,9 +15808,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15833,6 +15890,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15927,6 +15987,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16467,6 +16530,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16488,12 +16554,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16595,6 +16737,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17134,12 +17279,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17257,6 +17405,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17661,6 +17815,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18299,12 +18462,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18488,6 +18645,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19150,25 +19310,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19748,6 +19889,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19946,32 +20095,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20056,6 +20179,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20296,6 +20436,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21461,6 +21629,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21800,6 +22059,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22783,6 +23065,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22838,6 +23123,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24812,7 +25103,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24855,9 +25149,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27442,6 +27736,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27451,6 +27748,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27490,6 +27790,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27603,7 +27906,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27840,9 +28143,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/da.po b/i18n/po/da.po
index d6950ad..2b617a9 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-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-28 19:28+0000\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-22 09:23+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-10-30 04:37+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:37+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: da_DK\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -174,6 +174,12 @@ msgstr "Udvidelser"
msgid "About JOSM..."
msgstr "Om JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr "Kunne ikke finde ressource ''{0}''."
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Kunne ikke indlæse ressource \"{0}\". Fejl er {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -182,14 +188,10 @@ msgid_plural ""
"screen with browser windows<br>and take some time to finish."
msgstr[0] ""
"Du er ved at starte {0} browservindue. <br>Dette kan både fylde din skærm "
-"med et browservindue <br>og tage noget tid at \r\n"
-"\r\n"
-"afslutte."
+"med et browservindue <br>og tage noget tid at afslutte."
msgstr[1] ""
"Du er ved at starte {0} browservinduer. <br>Dette kan både fylde din skærm "
-"med browservinduer <br>og tage noget tid at \r\n"
-"\r\n"
-"afslutte."
+"med browservinduer <br>og tage noget tid at afslutte."
msgid "Continue"
msgstr "Fortsæt"
@@ -420,7 +422,7 @@ msgid "Copy selected objects to paste buffer."
msgstr "Kopier valgte objekter til udklipsholderen."
msgid "Please select something to copy."
-msgstr "Vælg venligst noget at kopiere."
+msgstr "Vælg noget at kopiere."
msgid "Copy Coordinates"
msgstr "Kopier koordinater"
@@ -699,7 +701,7 @@ msgid ""
"verify no errors have been introduced."
msgstr ""
"Nogle af vejene var en del af relationer der er blevet ændret.<br>Kontroller "
-"venligst at der ikke er indført nogen fejl."
+"at der ikke er indført nogen fejl."
msgid "Fix tag conflicts"
msgstr "Ret tag konflikter"
@@ -784,7 +786,7 @@ msgid "Jump to Position"
msgstr "Hop til position"
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
-msgstr "Kunne ikke forstå længde, bredde eller zoom. Tjek venligst."
+msgstr "Kunne ikke forstå længde, bredde eller zoom. Tjek den."
msgid "Unable to parse Lon/Lat"
msgstr "Kunne ikke forstå længde/breddegrad"
@@ -825,7 +827,7 @@ msgid ""
"again."
msgstr ""
"Kunne ikke afstemme det indtastede link eller id til den valgte service. "
-"Prøv venligst igen."
+"Prøv igen."
msgid "No valid WMS URL or id"
msgstr "Ingen gyldig WMS-URL eller id"
@@ -869,8 +871,8 @@ msgid ""
"Please select at least two nodes to merge or one node that is close to "
"another node."
msgstr ""
-"Vælg venligst mindst to punkter der skal sammenlægges eller et punkt der er "
-"tæt på et andet punkt."
+"Vælg mindst to punkter der skal sammenlægges eller et punkt der er tæt på et "
+"andet punkt."
msgid "Abort Merging"
msgstr "Afbryd sammenlægning"
@@ -991,7 +993,7 @@ msgid "does not exist"
msgstr "eksisterer ikke!"
msgid "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
-msgstr "<html>Kan ikke åbne mappen \"{0}\".<br>Vælg venligst en fil</html>"
+msgstr "<html>Kan ikke åbne mappen \"{0}\".<br>Vælg en fil</html>"
msgid "Open file"
msgstr "Åbn fil"
@@ -1112,7 +1114,7 @@ msgstr ""
"en efter en.</html>"
msgid "Please select ways with angles of approximately 90 or 180 degrees."
-msgstr "Vælg venligst veje med vinkler på cirka 90 eller 180 grader."
+msgstr "Vælg veje med vinkler på cirka 90 eller 180 grader."
msgid "Download from Overpass API ..."
msgstr "Download fra Overpass API ..."
@@ -2295,14 +2297,12 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Vælg, flyt, skalér eller rotér objekter"
-msgid "Move elements"
-msgstr "Flyt elementer"
-
-msgid "Move them"
-msgstr "Flyt dem"
-
-msgid "Undo move"
-msgstr "Fortryd flytning"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
+"Er du sikker på, at du vil flytte elementer med vedhæftede veje, der er "
+"skjult af filtre?"
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2321,6 +2321,15 @@ msgstr[1] ""
"ofte en fejl.\n"
"Vil du virkelig flytte dem?"
+msgid "Move elements"
+msgstr "Flyt elementer"
+
+msgid "Move them"
+msgstr "Flyt dem"
+
+msgid "Undo move"
+msgstr "Fortryd flytning"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Slip museknappen for at vælge objekterne inden i firkanten."
@@ -2528,6 +2537,9 @@ msgstr "MapCSS vælger"
msgid "add toolbar button"
msgstr "tilføj værktøjslinjeknap"
+msgid "Invalid search expression"
+msgstr "Ugyldigt søgeudtryk"
+
msgid "Filter"
msgstr "Filter"
@@ -2549,9 +2561,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Ugyldigt søgeudtryk"
-
msgid "basic examples"
msgstr "nemme eksempler"
@@ -2843,7 +2852,7 @@ msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
"length {2}. Values length is {3}."
msgstr ""
-"Længde af værdi for tag ''{0}'' på objekt {1} overskrider den max tilladte "
+"Længde af værdi for tag ''{0}'' på objekt {1} overskrider den maks. tilladte "
"længde {2}. Værdis længde er {3}."
msgid "Precondition Violation"
@@ -3305,7 +3314,7 @@ msgid ""
msgstr ""
"<html>Indstillingsfilen beder om lov til at tilføje indstillinger til "
"<b>{0}</b>,<br/> men dens standardværdi er ukendt i øjeblikket.<br/> Aktiver "
-"venligst den tilsvarende funktion manuelt og prøv at importere igen."
+"den tilsvarende funktion manuelt og prøv at importere igen."
msgid "Failed to create missing cache directory: {0}"
msgstr "Kunne ikke oprette manglende cachemappe: {0}"
@@ -3424,12 +3433,12 @@ msgstr "Imperisk"
msgid "Nautical Mile"
msgstr "Sømil"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Kunne ikke indlæse ressource \"{0}\". Fejl er {1}."
-
msgid "UNKNOWN"
msgstr "UKENDT"
+msgid "Error reading revision info from revision file: {0}"
+msgstr "Fejl ved læsning af revisions info fra revisions fil: {0}"
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr "Uventet JOSM versionsnummer i revisionsfilen, værdien er ''{0}''"
@@ -5113,6 +5122,15 @@ msgstr "Hjælp"
msgid "Menu: {0}"
msgstr "Menu: {0}"
+msgid "Main toolbar"
+msgstr "Hovedværktøjslinje"
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+"Slå synligheden af hovedværktøjslinjen (dvs. den vandrette værktøjslinje) "
+"til/fra"
+
msgid "Edit toolbar"
msgstr "Værktøjslinjen Rediger"
@@ -5276,7 +5294,7 @@ msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
msgstr ""
-"<html>Vælg venligst et <strong>område af OSM tern</strong> på et givent "
+"<html>Vælg et <strong>område af OSM tern</strong> på et givent "
"zoomniveau.</html>"
msgid "Zoom level:"
@@ -5290,12 +5308,12 @@ msgstr "op til tern"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
"<html>Alternativt kan du indtaste en <strong>tern-adresse</strong> for et "
-"enkelt tern i formatet <i>zoomniveau/x/y</i>, f.eks <i>15/256/223</i>. Tern-"
+"enkelt tern i formatet <i>zoomniveau/x/y</i>, f.eks. <i>15/256/223</i>. Tern-"
"adresser i formatet <i>zoom,x,y</i> eller <i>zoom;x;y</i> er også "
"gyldige.</html>"
@@ -5306,13 +5324,13 @@ msgid "Apply the tile address"
msgstr "Anfør tern-adressen"
msgid "Please enter a tile address"
-msgstr "Indtast venligst en tern-adresse"
+msgstr "Indtast en tern-adresse"
msgid "The current value isn''t a valid tile address"
msgstr "Den aktuelle værdi er ikke en gyldig tern-adresse"
msgid "Please enter a tile index"
-msgstr "Indtast venligst et tern-indeks"
+msgstr "Indtast et tern-indeks"
msgid "The current value isn''t a valid tile index for the given zoom level"
msgstr ""
@@ -5874,7 +5892,7 @@ msgid "sum"
msgstr "sum"
msgid "Please decide which values to keep"
-msgstr "Beslut venligst hvilke værdier der skal beholdes"
+msgstr "Beslut hvilke værdier der skal beholdes"
msgid "Value ''{0}'' is going to be applied for key ''{1}''"
msgstr "Værdi \"{0}\" vil blive anvendt for nøgle \"{1}\""
@@ -6182,26 +6200,15 @@ msgstr "Løs konflikter"
msgid "Resolve conflicts for ''{0}''"
msgstr "Løs konflikter for ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Bekræft venligst for at fjerne <strong>1 objekt</strong> fra <strong>1 "
-"relation</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] "Bekræft fjernelse af <strong>{0} objekt</strong>."
+msgstr[1] "Bekræft fjernelse af <strong>{0} objekter</strong>."
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Bekræft venligst for at fjerne <strong>1 objekt</strong> fra "
-"<strong>{0} relationer</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Bekræft venligst for at fjerne <strong>{0} objekter</strong> fra "
-"<strong>{1} relationer</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] "{0} relation påvirkes."
+msgstr[1] "{0} relationer påvirkes."
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6552,10 +6559,10 @@ msgid "East/North"
msgstr "Øst/Nord"
msgid "Please enter a GPS coordinates"
-msgstr "Indtast venligst et GPS koordinat"
+msgstr "Indtast et GPS koordinat"
msgid "Please enter a Easting and Northing"
-msgstr "Indtast venligst østlig og nordlig afstand"
+msgstr "Indtast østlig og nordlig afstand"
msgid "Toggle visibility of layer: {0}"
msgstr "Vælg synlighed for laget: {0}"
@@ -7012,7 +7019,7 @@ msgid "My changesets"
msgstr "Mine rettesæt"
msgid "Download my changesets from the OSM server (max. 100 changesets)"
-msgstr "Download mine rettesæt fra OSM serveren (max 100 rettesæt)"
+msgstr "Download mine rettesæt fra OSM serveren (maks. 100 rettesæt)"
msgid ""
"<html>JOSM is currently running with an anonymous user. It cannot "
@@ -7264,13 +7271,13 @@ msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr "Kan ikke begrænse rettesætsforespørgslen til brugernavnet \"{0}\""
msgid "Please enter a valid user ID"
-msgstr "Indtast venligst en gyldig bruger ID"
+msgstr "Indtast en gyldig bruger ID"
msgid "Invalid user ID"
msgstr "Ugyldigt bruger ID"
msgid "Please enter a non-empty user name"
-msgstr "Indtast venligst et ikke-tomt brugernavn"
+msgstr "Indtast et ikke-tomt brugernavn"
msgid "Invalid user name"
msgstr "Ugyldigt brugernavn"
@@ -7307,8 +7314,8 @@ msgid ""
"<html>Please enter valid date/time values to restrict<br>the query to a "
"specific time range.</html>"
msgstr ""
-"<html>Indtast venligst gyldige dato/tid-værdier for at "
-"begrænse<br>forespørgslen til et specifikt tidsinterval.</html>"
+"<html>Indtast gyldige dato/tid-værdier for at begrænse<br>forespørgslen til "
+"et specifikt tidsinterval.</html>"
msgid "Invalid date/time values"
msgstr "Ugyldige dato/tids-værdier"
@@ -7334,37 +7341,34 @@ msgstr "Ugyldigt afgrænsningsområde"
msgid ""
"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-"Den nuværende værdi er ikke et gyldigt brugerID. Indtast venligst en "
-"heltalsværdi > 0"
+"Den nuværende værdi er ikke et gyldigt bruger ID. Indtast en heltalsværdi > 0"
msgid "Please enter an integer value > 0"
-msgstr "Indtast venligst en heltalsværdi > 0"
+msgstr "Indtast en heltalsværdi > 0"
msgid ""
"<html>The current value is not a valid user name.<br>Please enter an non-"
"empty user name.</html>"
msgstr ""
-"<html>Den nuværende værdi er ikke et gyldigt brugernavn.<br>Indtast venligst "
-"et ikke-tomt brugernavn.</html>"
+"<html>Den nuværende værdi er ikke et gyldigt brugernavn.<br>Indtast et ikke-"
+"tomt brugernavn.</html>"
msgid "Please enter an non-empty user name"
-msgstr "Indtast venligst et ikke-tomt brugernavn"
+msgstr "Indtast et ikke-tomt brugernavn"
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 ""
-"Indtast venligst en dato i det normale format for din "
-"lokalitet.<br>Eksempel: {0}<br>Eksempel: {1}<br>Eksempel: {2}<br>Eksempel: "
-"{3}<br>"
+"Indtast en dato i det normale format for din lokalitet.<br>Eksempel: "
+"{0}<br>Eksempel: {1}<br>Eksempel: {2}<br>Eksempel: {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 ""
-"Indtast venligst en gyldig tid i det normale format for din "
-"lokalitet.<br>Eksempel: {0}<br>Eksempel: {1}<br>Eksempel: {2}<br>Eksempel: "
-"{3}<br>"
+"Indtast en gyldig tid i det normale format for din lokalitet.<br>Eksempel: "
+"{0}<br>Eksempel: {1}<br>Eksempel: {2}<br>Eksempel: {3}<br>"
msgid "Download my changesets only"
msgstr "Download kun mine rettesæt"
@@ -7373,8 +7377,8 @@ msgid ""
"<html>Select to restrict the query to your changesets only.<br>Unselect to "
"include all changesets in the query.</html>"
msgstr ""
-"<html>Vælg for at begrænse forespørgslen til dine rettesæt.<br>Lad være med "
-"at vælge for at inkludere alle rettesæt i forespørgslen.</html>"
+"<html>Vælg for at begrænse forespørgslen til dine rettesæt.<br>Fravælg for "
+"at inkludere alle rettesæt i forespørgslen.</html>"
msgid ""
"<html>Please select one the following <strong>standard "
@@ -7382,13 +7386,13 @@ msgid ""
"only want to download changesets created by yourself.<br>Note that JOSM will "
"download max. 100 changesets.</html>"
msgstr ""
-"<html>Vælg venligst en af følgende <strong>standard "
-"forespørgsler</strong>.Vælg <strong>Download kun mine rettesæt</strong> hvis "
-"du kun ønsker at downloade rettesæt du selv har oprettet.<br>Bemærk at JOSM "
-"maksimalt vil indlæse 100 rettesæt.</html>"
+"<html>Vælg en af følgende <strong>standard forespørgsler</strong>.Vælg "
+"<strong>Download kun mine rettesæt</strong> hvis du kun ønsker at downloade "
+"rettesæt du selv har oprettet.<br>Bemærk at JOSM maksimalt vil indlæse 100 "
+"rettesæt.</html>"
msgid "<html>Download the latest changesets</html>"
-msgstr "<html>Hent de seneste rettesæt</html>"
+msgstr "<html>Download de seneste rettesæt</html>"
msgid ""
"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
@@ -7398,7 +7402,7 @@ msgstr ""
"brugernavn i indstillingerne.</em></html>"
msgid "<html>Download my open changesets</html>"
-msgstr "<html>Hent mine åbne rettesæt</html>"
+msgstr "<html>Download mine åbne rettesæt</html>"
msgid ""
"<html>Download changesets in the current map view.<br><em>Disabled. There is "
@@ -7446,7 +7450,7 @@ msgid "Query and download changesets"
msgstr "Forespørg og download rettesæt"
msgid "Please enter a valid changeset query URL first."
-msgstr "Indtast venligst en gyldig rettesætsforespørgselsURL først."
+msgstr "Indtast en gyldig rettesætsforespørgselsURL først."
msgid "Illegal changeset query URL"
msgstr "Ulovlig rettesætsforespørgselsURL"
@@ -7467,8 +7471,7 @@ msgid "URL: "
msgstr "URL: "
msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
-msgstr ""
-"Indtast eller indsæt venligst en URL for at hente rettesæt fra OSM API’et."
+msgstr "Indtast eller indsæt en URL for at hente rettesæt fra OSM API’et."
msgid "Examples"
msgstr "Eksempler"
@@ -7517,14 +7520,17 @@ msgstr "Tags/Medlemskaber"
msgid "Tags for selected objects."
msgstr "Tags for markerede objekter."
+msgid "<different>"
+msgstr "<forskellige>"
+
msgid "Member Of"
msgstr "Medlem af"
msgid "Position"
msgstr "Placering"
-msgid "<different>"
-msgstr "<forskellige>"
+msgid "Tag filter"
+msgstr "Tag filter"
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Objekter: {2} / Tags: {0} / Medlemskaber: {1}"
@@ -7656,10 +7662,10 @@ msgstr[0] "Dette vil ændre på op til {0} objekt."
msgstr[1] "Dette vil ændre på op til {0} objekter."
msgid "Please select a key"
-msgstr "Vælg venligst en nøgle"
+msgstr "Vælg en nøgle"
msgid "Please select a value"
-msgstr "Vælg venligst en værdi"
+msgstr "Vælg en værdi"
msgid "Set number of recently added tags"
msgstr "Indstil antallet af nyligt tilføjede tags"
@@ -7677,10 +7683,10 @@ msgid "to add first suggestion without closing the dialog"
msgstr "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"
+msgstr "Indtast antallet af nyligt tilføjede tags der skal vises"
msgid "Please enter integer number between 0 and {0}"
-msgstr "Indtast venligst et heltalsnummer mellem 0 og {0}"
+msgstr "Indtast et heltalsnummer mellem 0 og {0}"
msgid "Recently added tags"
msgstr "Nyligt tilføjede tags"
@@ -8123,11 +8129,10 @@ msgstr "Tilføj et bogmærke for det nu markerede downloadområde"
msgid ""
"Currently, there is no download area selected. Please select an area first."
msgstr ""
-"Der er lige nu ikke markeret noget downloadområde. Markér venligst et område "
-"først."
+"Der er lige nu ikke markeret noget downloadområde. Vælg et område først."
msgid "Please enter a name for the bookmarked download area."
-msgstr "Indtast venligst et navn for det bogmærkede downloadområde."
+msgstr "Indtast et navn for det bogmærkede downloadområde."
msgid "Name of location"
msgstr "Navn på sted"
@@ -8236,7 +8241,7 @@ msgid "Click to download the currently selected area"
msgstr "Klik for at downloade det aktuelt valgte område"
msgid "Please select a download area first."
-msgstr "Vælg venligst et downloadområde først."
+msgstr "Vælg et downloadområde først."
msgid ""
"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> nor "
@@ -8306,7 +8311,7 @@ msgid "Error occured with query ''{0}'': ''{1}''"
msgstr "Der opstod en fejl med forespørgslen ''{0}'': ''{1}''"
msgid "Name server returned invalid data. Please try again."
-msgstr "Navne server returnerede ugyldige data. Prøv venligst igen."
+msgstr "Navne server returnerede ugyldige data. Prøv igen."
msgid "Bad response"
msgstr "Dårlig respons"
@@ -8338,9 +8343,9 @@ msgstr ""
"<html><p class=\"warning-header\">Hjælpe-indhold for emnet mangler</p><p "
"class=\"warning-body\">Hjælpe-indholdet for emnet <strong>{0}</strong> er "
"ikke tilgængeligt endnu. Det mangler både på dit sprog ({1}) og på "
-"engelsk.<br><br>Hjælp venligst med at forbedre JOSM hjælpesystemet og udfyld "
-"den manglende information. Du kan både redigere <a href=\"{2}\">hjælpe-emnet "
-"for dit eget sprog ({1})</a> og <a href=\"{3}\">for hjælpeemnet på "
+"engelsk.<br><br>Hjælp med at forbedre JOSM hjælpesystemet og udfyld den "
+"manglende information. Du kan både rediger <a href=\"{2}\">hjælpe-emnet for "
+"dit eget sprog ({1})</a> og <a href=\"{3}\">for hjælpeemnet på "
"engelsk</a>.</p></html>"
msgid ""
@@ -8597,7 +8602,7 @@ msgid ""
"again with a new or an existing open changeset.</html>"
msgstr ""
"<html>Upload <strong>fejlede</strong> fordi du har brugt<br>rettesæt {0}, "
-"som allerede blev lukket {1}.<br>Upload venligst igen med et nyt eller et "
+"som allerede var blevet lukket {1}.<br>Upload igen med et nyt eller et "
"eksisterende åbent rettesæt.</html>"
msgid "Changeset closed"
@@ -8670,8 +8675,8 @@ msgid ""
"Please decide what changeset the data is uploaded to and whether to close "
"the changeset after the next upload."
msgstr ""
-"Bestem venligst hvilket rettesæt dataene skal uploades til og om rettesættet "
-"skal lukkes efter næste upload."
+"Bestem hvilket rettesæt dataene skal uploades til og om rettesættet skal "
+"lukkes efter næste upload."
msgid "Upload to a new changeset"
msgstr "Upload til et nyt rettesæt"
@@ -8701,7 +8706,7 @@ msgid "Close the currently selected open changeset"
msgstr "Luk det nu markerede åbne rettesæt"
msgid "<html>Please select the changesets you want to close</html>"
-msgstr "<html>Marker venligst de rettesæt du ønsker at lukke</html>"
+msgstr "<html>Marker de rettesæt du ønsker at lukke</html>"
msgid "Open changesets"
msgstr "Åbn rettesæt"
@@ -8743,7 +8748,7 @@ msgid "Warning: The password is transferred unencrypted."
msgstr "Advarsel: Adgangskoden sendes ukrypteret."
msgid "Please enter the user name of your OSM account"
-msgstr "Indtast venligst din OSM-kontos brugernavn"
+msgstr "Indtast dit brugernavn til din OSM-konto"
msgid "Please enter the password of your OSM account"
msgstr "Indtast adgangskoden til din OSM-konto"
@@ -8752,11 +8757,11 @@ msgid ""
"Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
"and a valid password."
msgstr ""
-"Godkendelse ved OSM API ''{0}'' fejlede. Indtast venligst et gyldigt "
-"brugernavn og en gyldig adgangskode."
+"Godkendelse ved OSM API ''{0}'' fejlede. Indtast et gyldigt brugernavn og en "
+"gyldig adgangskode."
msgid "Please enter the user name of your account"
-msgstr "Indtast venligst dit konto-brugernavn"
+msgstr "Indtast brugernavnet til din konto"
msgid "Please enter the password of your account"
msgstr "Indtast adgangskoden til din konto"
@@ -8769,16 +8774,16 @@ msgstr ""
"gyldig adgangskode."
msgid "Please enter the user name for authenticating at your proxy server"
-msgstr "Indtast venligst brugernavnet til godkendelse ved din proxy-server"
+msgstr "Indtast brugernavnet til godkendelse ved din proxy-server"
msgid "Please enter the password for authenticating at your proxy server"
-msgstr "Indtast venligst adgangskoden til godkendelse af din proxy-server"
+msgstr "Indtast adgangskoden til godkendelse af din proxy-server"
msgid ""
"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
"username and a valid password."
msgstr ""
-"Godkendelse af HTTP proxyen ''{0}'' mislykkedes. Indtast venligst et gyldigt "
+"Godkendelse af HTTP proxyen ''{0}'' mislykkedes. Indtast et gyldigt "
"brugernavn og en gyldig adgangskode."
msgid ""
@@ -8883,7 +8888,7 @@ msgid "Layer ''{0}'' is not backed by a file"
msgstr "Lag \"{0}\" er ikke bakket op af en fil"
msgid "File ''{0}'' is not writable. Please enter another file name."
-msgstr "Fil \"{0}\" er ikke skrivbar. Indtast venligst et andet filnavn."
+msgstr "Fil \"{0}\" er ikke skrivebar. Indtast et andet filnavn."
msgid "Click cell to change the file path."
msgstr "Klik på cellen for at ændre filstien."
@@ -9091,7 +9096,7 @@ msgid "Upload the changed primitives"
msgstr "Upload de ændrede primitiver"
msgid "Please revise upload comment"
-msgstr "Tilpas venligst upload kommentaren"
+msgstr "Tilpas upload kommentaren"
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
@@ -9135,7 +9140,7 @@ msgid "Cancel and return to the previous dialog"
msgstr "Fortryd og gå til foregående dialogboks"
msgid "Please enter a valid chunk size first"
-msgstr "Indtast venligst først en gyldig størrelse for bidderne"
+msgstr "Indtast først en gyldig størrelse for bidderne"
msgid "Illegal chunk size"
msgstr "Ulovlig størrelse af bidder"
@@ -9232,9 +9237,9 @@ msgid ""
"''{2}''. Please <a href=\"urn:advanced-configuration\">configure</a> how to "
"proceed with <strong>multiple changesets</strong>"
msgstr ""
-"{0} objekter overskred de max tilladte {1} objekter i et rettesæt på "
-"serveren ''{2}''. <a href=\"urn:advanced-configuration\">Konfigurér</a> "
-"venligs hvordan det skal foregå med <strong>flere rettesæt</strong>"
+"{0} objekter overskred de maks. tilladte {1} objekter i et rettesæt på "
+"serveren ''{2}''. <a href=\"urn:advanced-configuration\">Konfigurer</a> "
+"hvordan det skal foregå med <strong>flere rettesæt</strong>"
msgid ""
"Uploading <strong>{0} objects</strong> to <strong>multiple "
@@ -9344,7 +9349,7 @@ msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr "Uventet værdi for nøgle ''{0}'' i indstillinger, fik ''{1}''"
msgid "Please select the upload strategy:"
-msgstr "Vælg venligst upload-strategien:"
+msgstr "Vælg upload strategien:"
msgid "Upload data in one request"
msgstr "Upload data i en forespørgsel"
@@ -9391,17 +9396,18 @@ msgstr[0] "({0} anmodning)"
msgstr[1] "({0} anmodninger)"
msgid "Illegal chunk size <= 0. Please enter an integer > 1"
-msgstr "Ulovlig stykstørrelse <= 0. Indtast venligst et heltal > 1"
+msgstr "Ulovlig stykstørrelse <= 0. Indtast et heltal > 1"
msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''"
msgstr ""
-"Stykstørrelse {0} overskrider max rettesætsstørrelse {1} for server ''{2}''"
+"Stykstørrelse {0} overskrider maks. størrelse {1} på rettesæt for server "
+"''{2}''"
msgid "Please enter an integer > 1"
-msgstr "Indtast venligst et heltal > 1"
+msgstr "Indtast et heltal > 1"
msgid "Value ''{0}'' is not a number. Please enter an integer > 1"
-msgstr "Værdi ''{0}'' er ikke et tal. Indtast venligst et heltal > 1"
+msgstr "Værdi ''{0}'' er ikke et tal. Indtast et heltal > 1"
msgid "Objects to add:"
msgstr "Tilføjede objekter:"
@@ -9788,7 +9794,7 @@ msgid ""
"Please use the requested format"
msgstr ""
"Fejl ved fortolkning af datoen.\n"
-"Brug venligst det angivne format"
+"Brug det angivne format"
msgid "Invalid date"
msgstr "Ugyldig dato"
@@ -9883,8 +9889,7 @@ msgstr "Billederne rummer ingen tidsangivelser"
msgid ""
"The selected GPX track does not contain timestamps. Please select another "
"one."
-msgstr ""
-"Det valgte GPX-spor rummer ikke tidsstempler. Vælg venligst et andet."
+msgstr "Det valgte GPX-spor rummer ikke tidsstempler. Vælg et andet."
msgid "GPX Track has no time information"
msgstr "GPX-sporet har ingen tidsangivelser."
@@ -10116,7 +10121,7 @@ msgid "meters"
msgstr "meter"
msgid "Maximum area per request:"
-msgstr "Maksimum område per anmodning:"
+msgstr "Maksimalt område per anmodning:"
msgid "Download near:"
msgstr "Hent nær:"
@@ -10149,7 +10154,7 @@ msgid "Precaching WMS"
msgstr "Forudhenter WMS"
msgid "Please select the imagery layer."
-msgstr "Vælg venligst billedlaget."
+msgstr "Vælg billedlaget."
msgid "Select imagery layer"
msgstr "Vælg billedlag"
@@ -11015,8 +11020,7 @@ msgid "JOSM custom settings files (*.xml)"
msgstr "JOSM tilpasset indstillings-fil (*.xml)"
msgid "Please select some preference keys not marked as default"
-msgstr ""
-"Vælg venligst nogle indstillingsnøgler der ikke er markeret som standard"
+msgstr "Vælg nogle indstillingsnøgler der ikke er markeret som standard"
msgid "Export preferences keys to JOSM customization file"
msgstr "Eksporter indstillingsnøgler til JOSM tilpasningsfil"
@@ -11105,7 +11109,7 @@ msgid "Entry {0}"
msgstr "Punkt {0}"
msgid "Please select the row to edit."
-msgstr "Vælg venligst rækken, der skal redigeres."
+msgstr "Vælg rækken der skal redigeres."
msgid "Select Setting Type:"
msgstr "Vælg indstillingstype:"
@@ -11126,7 +11130,7 @@ msgid "Add setting"
msgstr "Tilføj indstilling"
msgid "Please select the row to delete."
-msgstr "Vælg venligst rækken, der skal slettes"
+msgstr "Vælg rækken der skal slettes"
msgid "Advanced Background: Changed"
msgstr "Avanceret baggrund: Ændret"
@@ -11671,7 +11675,7 @@ msgstr ""
"f.eks. {1}"
msgid "2. Enter maximum zoom (optional)"
-msgstr "2. Indtast maksimum zoom (valgfri)"
+msgstr "2. Indtast maksimalt zoom (valgfri)"
msgid "3. Verify generated TMS URL"
msgstr "3. Verificer genereret TMS URL"
@@ -11842,10 +11846,10 @@ msgid "Add to slippymap chooser: "
msgstr "Tilføj til flytbart kort vælger: "
msgid "Maximum concurrent downloads: "
-msgstr "Højest antal samtidige downloads: "
+msgstr "Maksimalt antal samtidige downloads: "
msgid "Maximum concurrent downloads per host: "
-msgstr "Højest antal samtidige downloads per host: "
+msgstr "Maksimalt antal samtidige downloads per host: "
msgid ""
"That layer does not support any of JOSM''s projections,\n"
@@ -12156,7 +12160,7 @@ msgid "Enter URL"
msgstr "Indtast URL"
msgid "Please select an entry."
-msgstr "Vælg venligst en post."
+msgstr "Vælg en post."
msgid "Edit JOSM Plugin description URL."
msgstr "Rediger JOSM-udvidelsers beskrivelses-URL."
@@ -12443,8 +12447,8 @@ msgid ""
"<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
"validate again.</html>"
msgstr ""
-"<html>''{0}'' er ikke en gyldig OSM API URL.<br>Kontrollér venligst "
-"stavningen og validér igen.</html>"
+"<html>''{0}'' er ikke en gyldig OSM API URL.<br>Kontroller stavningen og "
+"valider igen.</html>"
msgid "Invalid API URL"
msgstr "Ugyldig API URL"
@@ -12454,18 +12458,17 @@ msgid ""
"server.<br>Please check the spelling of ''{1}'' and validate again.</html>"
msgstr ""
"<html>Kunne ikke forme URL ''{0}'' for validering af OSM API "
-"serveren.<br>Kontrollér venligst stavningen af ''{1}'' og validér "
-"igen.</html>"
+"serveren.<br>Kontroller stavningen af ''{1}'' og valider igen.</html>"
msgid ""
"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
"''{1}'' and your Internet connection and validate again.</html>"
msgstr ""
-"<html>Kunne ikke forbinde til URLen ''{0}''.<br>Kontroller venligst "
-"stavningen af ''{1}'' og din internetforbindelse og prøv igen.</html>"
+"<html>Kunne ikke forbinde til URLen ''{0}''.<br>Kontroller stavningen af "
+"''{1}'' og din internetforbindelse og prøv igen.</html>"
msgid "Connection to API failed"
-msgstr "Forbindelse til API slået fejl"
+msgstr "Kunne ikke få Forbindelse til API"
msgid ""
"<html>Failed to retrieve a list of changesets from the OSM API server "
@@ -12474,7 +12477,7 @@ msgid ""
msgstr ""
"<html>Kunne ikke hente en liste over rettesæt fra OSM API serveren "
"på<br>''{1}''. Serveren meldte tilbage med koden {0} i stedet for "
-"200.<br>Kontrollér venligst stavningen af ''{1}'' og validér igen.</html>"
+"200.<br>Kontroller stavningen af ''{1}'' og valider igen.</html>"
msgid ""
"<html>The OSM API server at ''{0}'' did not return a valid response.<br>It "
@@ -12483,7 +12486,7 @@ msgid ""
msgstr ""
"<html>OSM API serveren på ''{0}'' meldte ikke tilbage med et gyldigt "
"svar.<br>Det er sandsynligt at \"{0}\" ikke er en OSM API "
-"server.<br>Kontroller venligst stavemåden af \"{0}\" og validér igen.</html>"
+"server.<br>Kontroller stavemåden af \"{0}\" og valider igen.</html>"
msgid "Authentication"
msgstr "Godkendelse"
@@ -12598,19 +12601,19 @@ msgid "Validation failed. The API URL seems to be invalid."
msgstr "Validering fejlede. API URL’en lader til at være ugyldig."
msgid "OSM API URL must not be empty. Please enter the OSM API URL."
-msgstr "OSM API URL må ikke være tom. Indtast venligst OSM API URL’en."
+msgstr "OSM API URL må ikke være tom. Indtast OSM API URL’en."
msgid "The current value is not a valid URL"
msgstr "Den nuværende værdi er ikke en gyldig URL"
msgid "Please enter the OSM API URL."
-msgstr "Indtast venligst OSM API URL’en"
+msgstr "Indtast OSM API URL’en"
msgid "Proxy settings"
msgstr "Proxy-indstillinger"
msgid "Configure whether to use a proxy server"
-msgstr "Konfigurér om der skal bruges en proxy-server"
+msgstr "Konfigurer om der skal bruges en proxy-server"
msgid "Host:"
msgstr "Vært:"
@@ -12622,8 +12625,7 @@ msgstr "Port:"
msgid ""
"Please enter a username and a password if your proxy requires authentication."
msgstr ""
-"Indtast venligst et brugernavn og en adgangskode hvis din proxy kræver "
-"godkendelse."
+"Indtast et brugernavn og en adgangskode hvis din proxy kræver godkendelse."
msgid "Password:"
msgstr "Adgangskode:"
@@ -12979,6 +12981,9 @@ msgstr ""
"Ødelagte prædefinerede tags \"{0}-{1}\" - antallet af elementer i ''vis "
"værdier'' skal være den samme som i ''værdier''"
+msgid "Detailed information: {0} <> {1}"
+msgstr "Detaljerede oplysninger: {0} <> {1}"
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13061,8 +13066,8 @@ msgid ""
"The current value is not a valid changeset ID. Please enter an integer value "
"> 0"
msgstr ""
-"Den nuværende værdi er ikke et gyldigt rettesætsID. Indtast venligst en "
-"heltalsværdi > 0."
+"Den nuværende værdi er ikke et gyldigt rettesæts ID. Indtast en heltalsværdi "
+"> 0."
msgid "Add a new source to the list."
msgstr "Tilføj en ny kilde til listen."
@@ -13076,8 +13081,7 @@ msgstr "Slet den valgte kilde fra listen."
msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
-"Den aktuelle værdi er ikke et gyldig OSM ID. Indtast venligst en "
-"heltalsværdi > 0"
+"Den aktuelle værdi er ikke et gyldig OSM ID. Indtast en heltalsværdi > 0"
msgid "false: the property is explicitly switched off"
msgstr "falsk: egenskaben er eksplicit slået fra"
@@ -13164,6 +13168,9 @@ msgstr "Downloader punkterne {0} til {1}..."
msgid "Contacting OSM Server..."
msgstr "Kontakter OSM-serveren..."
+msgid "Downloading notes"
+msgstr "Downloader noter"
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Kunne ikke åbne input-strøm for resurse ''{0}''"
@@ -13810,8 +13817,7 @@ msgstr "Kunne ikke åbne forbindelse til API {0}."
msgid ""
"Could not connect to the OSM server. Please check your internet connection."
-msgstr ""
-"Kunne ikke forbinde til osm server. Tjek venligst din internetforbindelse."
+msgstr "Kunne ikke forbinde til osm serveren. Tjek din internetforbindelse."
msgid "Reading error text failed."
msgstr "Indlæsning af fejltekst mislykkedes."
@@ -14611,8 +14617,7 @@ msgid ""
"bug report in our bugtracker using this link:"
msgstr ""
"Du bør også opdatere dine udvidelser. Hvis intet af dette hjælper, så opret "
-"venligst en fejlrapport i vores fejlrapporteringssystem ved hjælp af dette "
-"link:"
+"en fejlrapport i vores fejlrapporteringssystem ved hjælp af dette link:"
msgid ""
"There the error information provided below should already be filled in for "
@@ -14620,8 +14625,8 @@ msgid ""
"supply as much detail as possible."
msgstr ""
"Her burde fejl-informationen nedenunder allerede være udfyldt for dig. "
-"Tilføj venligst informationer om hvordan, fejlen kan reproduceres, og giv så "
-"mange detaljer som muligt."
+"Tilføj informationer om hvordan, fejlen kan reproduceres, og giv så mange "
+"detaljer som muligt."
msgid ""
"Alternatively, if that does not work you can manually fill in the "
@@ -14664,11 +14669,11 @@ msgid_plural ""
"the node, and upload again."
msgstr[0] ""
"<strong>Kunne ikke</strong> slette <strong>punktet {0}</strong>. Det bliver "
-"stadig henvist til fra punkt {1}.<br>Indlæs venligst punktet, fjern "
-"henvisningen til punktet og upload igen"
+"stadig henvist til fra punkt {1}.<br>Indlæs punktet, fjern henvisningen til "
+"punktet og upload igen"
msgstr[1] ""
"<strong>Kunne ikke</strong> slette <strong>punktet {0}</strong>. Det bliver "
-"stadig henvist til fra punkterne {1}.<br>Indlæs venligst punkterne, fjern "
+"stadig henvist til fra punkterne {1}.<br>Indlæs punkterne, fjern "
"henvisningen til punktet og upload igen"
msgid ""
@@ -14681,12 +14686,12 @@ msgid_plural ""
"the node, and upload again."
msgstr[0] ""
"<strong>Kunne ikke</strong> slette <strong>punktet {0}</strong>. Det bliver "
-"stadig henvist til fra vejen {1}.<br>Indlæs venligst vejen, fjern "
-"henvisningen til punktet og upload igen"
+"stadig henvist til fra vejen {1}.<br>Indlæs vejen, fjern henvisningen til "
+"punktet og upload igen"
msgstr[1] ""
"<strong>Kunne ikke</strong> slette <strong>punktet {0}</strong>. Det bliver "
-"stadig henvist til fra vejene {1}.<br>Indlæs venligst vejene, fjern "
-"henvisningen til punktet og upload igen"
+"stadig henvist til fra vejene {1}.<br>Indlæs vejene, fjern henvisningen til "
+"punktet og upload igen"
msgid ""
"<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -14698,12 +14703,12 @@ msgid_plural ""
"reference to the node, and upload again."
msgstr[0] ""
"<strong>Kunne ikke</strong> slette <strong>punktet {0}</strong>. Det bliver "
-"stadig henvist til fra relationen {1}.<br>Indlæs venligst relationen, fjern "
+"stadig henvist til fra relationen {1}.<br>Indlæs relationen, fjern "
"henvisningen til punktet og upload igen"
msgstr[1] ""
"<strong>Kunne ikke</strong> slette <strong>punktet {0}</strong>. Det bliver "
-"stadig henvist til fra relationerne {1}.<br>Indlæs venligst relationerne, "
-"fjern henvisningen til punktet og upload igen"
+"stadig henvist til fra relationerne {1}.<br>Indlæs relationerne, fjern "
+"henvisningen til punktet og upload igen"
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -14715,11 +14720,11 @@ msgid_plural ""
"the way, and upload again."
msgstr[0] ""
"<strong>Kunne ikke</strong> slette <strong>vejen {0}</strong>. Den bliver "
-"stadig henvist til fra punktet {1}.<br>Indlæs venligst punktet, fjern "
-"henvisningen til vejen og upload igen"
+"stadig henvist til fra punktet {1}.<br>Indlæs punktet, fjern henvisningen "
+"til vejen og upload igen"
msgstr[1] ""
"<strong>Kunne ikke</strong> slette <strong>vejen {0}</strong>. Den bliver "
-"stadig henvist til fra punkterne {1}.<br>Indlæs venligst punkterne, fjern "
+"stadig henvist til fra punkterne {1}.<br>Indlæs punkterne, fjern "
"henvisningen til vejen og upload igen"
msgid ""
@@ -14732,12 +14737,12 @@ msgid_plural ""
"the way, and upload again."
msgstr[0] ""
"<strong>Kunne ikke</strong> slette <strong>vejen {0}</strong>. Den bliver "
-"stadig henvist til fra vejen {1}.<br>Indlæs venligst vejen, fjern "
-"henvisningen til vejen og upload igen"
+"stadig henvist til fra vejen {1}.<br>Indlæs vejen, fjern henvisningen til "
+"vejen og upload igen"
msgstr[1] ""
"<strong>Kunne ikke</strong> slette <strong>vejen {0}</strong>. Den bliver "
-"stadig henvist til fra vejene {1}.<br>Indlæs venligst vejene, fjern "
-"henvisningen til vejen og upload igen"
+"stadig henvist til fra vejene {1}.<br>Indlæs vejene, fjern henvisningen til "
+"vejen og upload igen"
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -14749,12 +14754,12 @@ msgid_plural ""
"reference to the way, and upload again."
msgstr[0] ""
"<strong>Kunne ikke</strong> slette <strong>vejen {0}</strong>. Den bliver "
-"stadig henvist til fra relationen {1}.<br>Indlæs venligst relationen, fjern "
+"stadig henvist til fra relationen {1}.<br>Indlæs relationen, fjern "
"henvisningen til vejen og upload igen"
msgstr[1] ""
"<strong>Kunne ikke</strong> slette <strong>vejen {0}</strong>. Den bliver "
-"stadig henvist til fra relationerne {1}.<br>Indlæs venligst relationerne, "
-"fjern henvisningen til vejen og upload igen"
+"stadig henvist til fra relationerne {1}.<br>Indlæs relationerne, fjern "
+"henvisningen til vejen og upload igen"
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -14766,12 +14771,12 @@ msgid_plural ""
"the relation, and upload again."
msgstr[0] ""
"<strong>Kunne ikke</strong> slette <strong>relationen {0}</strong>. Den "
-"bliver stadig henvist til fra punktet {1}.<br>Indlæs venligst punktet, fjern "
+"bliver stadig henvist til fra punktet {1}.<br>Indlæs punktet, fjern "
"henvisningen til vejen og upload igen"
msgstr[1] ""
"<strong>Kunne ikke</strong> slette <strong>relationen {0}</strong>. Den "
-"bliver stadig henvist til fra punkterne {1}.<br>Indlæs venligst punkterne, "
-"fjern henvisningen til vejen og upload igen"
+"bliver stadig henvist til fra punkterne {1}.<br>Indlæs punkterne, fjern "
+"henvisningen til vejen og upload igen"
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -14783,11 +14788,11 @@ msgid_plural ""
"the relation, and upload again."
msgstr[0] ""
"<strong>Kunne ikke</strong> slette <strong>relationen {0}</strong>. Den "
-"bliver stadig henvist til fra vejen {1}.<br>Indlæs venligst vejen, fjern "
-"henvisningen til vejen og upload igen"
+"bliver stadig henvist til fra vejen {1}.<br>Indlæs vejen, fjern henvisningen "
+"til vejen og upload igen"
msgstr[1] ""
"<strong>Kunne ikke</strong> slette <strong>relationen {0}</strong>. Den "
-"bliver stadig henvist til fra vejene {1}.<br>Indlæs venligst vejene, fjern "
+"bliver stadig henvist til fra vejene {1}.<br>Indlæs vejene, fjern "
"henvisningen til vejen og upload igen"
msgid ""
@@ -14800,12 +14805,12 @@ msgid_plural ""
"reference to the relation, and upload again."
msgstr[0] ""
"<strong>Kunne ikke</strong> slette <strong>relationen {0}</strong>. Den "
-"bliver stadig henvist til fra relationen {1}.<br>Indlæs venligst relationen, "
-"fjern henvisningen til vejen og upload igen"
+"bliver stadig henvist til fra relationen {1}.<br>Indlæs relationen, fjern "
+"henvisningen til vejen og upload igen"
msgstr[1] ""
"<strong>Kunne ikke</strong> slette <strong>relationen {0}</strong>. Den "
-"bliver stadig henvist til fra relationerne {1}.<br>Indlæs venligst "
-"relationerne, fjern henvisningen til vejen og upload igen"
+"bliver stadig henvist til fra relationerne {1}.<br>Indlæs relationerne, "
+"fjern henvisningen til vejen og upload igen"
msgid ""
"<html>Uploading to the server <strong>failed</strong> because your "
@@ -14858,7 +14863,7 @@ msgid ""
"<html>Communication with the OSM server ''{0}'' timed out. Please retry "
"later.</html>"
msgstr ""
-"<html>Kommunikationen med OSM serveren ''{0}'' fik timeout. Prøv venligst "
+"<html>Kommunikationen med OSM serveren ''{0}'' tog for lang tid. Prøv "
"senere.</html>"
msgid "no error message available"
@@ -14946,7 +14951,7 @@ msgid ""
"error.<br>This is most likely a temporary problem. Please try again later."
msgstr ""
"<html>OSM serveren<br>''{0}''<br>rapporterede en intern serverfejl.<br>Dette "
-"er sandsynligvis et midlertidigt problem. Prøv venligst igen senere."
+"er sandsynligvis et midlertidigt problem. Prøv igen senere."
msgid "The OSM server ''{0}'' reported a bad request.<br>"
msgstr "OSM serveren ''{0}'' rapporetede en dårlig forespøgsel.<br>"
@@ -14971,8 +14976,8 @@ msgid ""
msgstr ""
"OSM-serveren \"{0}\" kender ikke til et objekt<br>du prøvede at læse, "
"opdatere eller slette. Enten eksisterer det respektive objekt<br>ikke på "
-"serveren eller også bruger du en ugyldig URL til at tilgå<br>det. Kontrollér "
-"venligst serverens adresse \"{0}\" omhyggeligt for stavefejl."
+"serveren eller også bruger du en ugyldig URL til at tilgå<br>det. Kontroller "
+"serverens adresse \"{0}\" omhyggeligt for stavefejl."
msgid ""
"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -15262,7 +15267,7 @@ msgid "Database offline for maintenance"
msgstr "Databasen er utilgængelig på grund af vedligeholdelse"
msgid "You have downloaded too much data. Please try again later."
-msgstr "Du har downloaded for meget data. Prøv venligst igen senere."
+msgstr "Du har downloaded for meget data. Prøv igen senere."
msgid ""
"The maximum bbox size is 0.25, and your request was too large. Either "
@@ -15307,6 +15312,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "buskads"
+msgctxt "natural"
+msgid "wood"
+msgstr "skov"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "associatedStreet"
@@ -15918,6 +15927,9 @@ msgstr "Drone Imagery (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Imagery 2014 (Haiti)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -15945,8 +15957,11 @@ msgstr "OSMIE Civil Parishes"
msgid "OSMIE Baronies"
msgstr "OSMIE Baronies"
-msgid "OSMIE Political"
-msgstr "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr "OSMIE Local Election Areas"
+
+msgid "OSMIE Dail Election Areas"
+msgstr "OSMIE Dail Election Areas"
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
@@ -16324,7 +16339,7 @@ msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-82"
msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
+msgstr "NLS - OS 6-inch County Series 1888-1913"
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -16333,7 +16348,7 @@ msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
-msgstr ""
+msgstr "NLS - OS 25-inch (Scotland) 1892-1905"
msgid "OS 1:25k historic (OSM-Best)"
msgstr "OS 1:25k historic (OSM-Best)"
@@ -16521,6 +16536,9 @@ msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr "OS Town Plans, Paisley 1858 (NLS)"
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "OS Town Plans, Peebles 1856 (NLS)"
@@ -16598,15 +16616,15 @@ msgid ""
"directly by users, but rather as a dependency for other plugins."
msgstr ""
"Tilbyder Apache fælles bibliotek komponenter. Ikke beregnet til at blive "
-"installeret direkte af brugerne, men derimod som en afhængighed til andre "
-"udvidelser."
+"installeret direkte af brugerne, men derimod fra andre udvidelser som en "
+"afhængighed."
msgid ""
"Provides Apache HTTP library. Not meant to be installed directly by users, "
"but rather as a dependency for other plugins."
msgstr ""
"Tilbyder Apache HTTP bibliotek. Ikke beregnet til at blive installeret "
-"direkte af brugerne, men derimod som en afhængighed til andre udvidelser."
+"direkte af brugerne, men derimod fra andre udvidelser som en afhængighed."
msgid ""
"Allows selection of areas in an layer and automatic creation of a way as "
@@ -16661,7 +16679,7 @@ msgstr ""
"(Advarsel: Eksperimentel!) Værktøj til at sammensmelte (flette) data."
msgid "Downloads new data when you pan/zoom"
-msgstr ""
+msgstr "Downloader nye data når du panorerer/zoomer"
msgid "Create a grid of ways."
msgstr "Opret et net af veje."
@@ -16699,6 +16717,14 @@ msgstr ""
"Tillader brugeren at anonymisere tidsangivelser samt hurtigt at slette dele "
"af store GPX-sporinger."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Tilbyder EJML bibliotek til andre JOSM udvidelser. Ikke beregnet til at "
+"blive installeret direkte af brugerne, men derimod fra andre udvidelser som "
+"en afhængighed."
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr "Viser elevationsprofilen og nogle statistiske data for et GPX spor."
@@ -16724,9 +16750,9 @@ msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
-"Leverer dele af GeoVærktøjs biblioteket til andre JOSM udvidelser. Ikke "
-"beregnet til direkte installation af brugere, men som en afhængighed fra "
-"andre udvidelser."
+"Tilbyder dele af GeoVærktøjs biblioteket til andre JOSM udvidelser. Ikke "
+"beregnet til at blive installeret direkte af brugerne, men derimod fra andre "
+"udvidelser som en afhængighed."
msgid ""
"Download GPS points from Globalsat dg100 data logger directly in JOSM."
@@ -16745,6 +16771,14 @@ msgstr "Giver mulighed for at filtrere unødvendige GPS spor fra"
msgid "Visualizes routing information as a routing graph."
msgstr "Visualiserer ruteinformation som en rutegraf."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Tilbyder GSON bibliotek til andre JOSM udvidelser. Ikke beregnet til at "
+"blive installeret direkte af brugerne, men derimod fra andre udvidelser som "
+"en afhængighed."
+
msgid "Simple tool to tag house numbers."
msgstr "Simpelt værktøj til at tagge husnumre."
@@ -16791,8 +16825,8 @@ msgid ""
"directly by users, but rather as a dependency for other plugins."
msgstr ""
"Tilbyder Java Native Access (JNA) bibliotek. Ikke beregnet til at blive "
-"installeret direkte af brugerne, men snarere som en afhængighed af andre "
-"udvidelser."
+"installeret direkte af brugerne, men derimod fra andre udvidelser som en "
+"afhængighed."
msgid ""
"Provides Java Topology Suite (JTS) library and related utilities. Not meant "
@@ -16800,15 +16834,15 @@ msgid ""
"plugins."
msgstr ""
"Tilbyder Java Topology Suite (JTS) bibliotek og relaterede hjælpeprogrammer. "
-"Ikke beregnet til at blive installeret direkte af brugerne, men snarere som "
-"en afhængighed af andre udvidelser."
+"Ikke beregnet til at blive installeret direkte af brugerne, men derimod fra "
+"andre udvidelser som en afhængighed."
msgid ""
"creates a channel digraph and checks a subset of channels if it is a "
"junction or searches in a subset of channels for junctions"
msgstr ""
-"Skaber en kanal digraf og kontrollerer en delmængde af kanaler, hvis det er "
-"et vejkryds eller søgninger i et undersæt af kanaler i kryds"
+"Opretter en kanal digraf og tjekker en delmængde af kanaler hvis det er et "
+"vejkryds eller søger i en delmængde af kanaler i vejkryds"
msgid "Helps vectorizing WMS images."
msgstr "Hjælper med at vektorisere WMS-billeder."
@@ -16824,8 +16858,8 @@ msgid ""
"directly by users, but rather as a dependency for other plugins."
msgstr ""
"Tilbyder Log4J bibliotek til andre JOSM udvidelser. Ikke beregnet til at "
-"blive installeret direkte af brugerne, men snarere som en afhængighed af "
-"andre udvidelser."
+"blive installeret direkte af brugerne, men derimod fra andre udvidelser som "
+"en afhængighed."
msgid ""
"The MapDust Plug-In shows the MapDust bug reports on the map. You can "
@@ -16989,7 +17023,7 @@ msgstr ""
"definerede i filen routes.xml i udvidelsesmappen."
msgid "Provides routing capabilities."
-msgstr "Tilføjer ruteplan-egenskaber"
+msgstr "Tilbyder ruteplan egenskaber"
msgid "Loads data from SDS"
msgstr "Indlæser data fra SDS"
@@ -17033,7 +17067,7 @@ msgstr ""
"tags, såsom Wikipedia"
msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr "Stiller en dialog til redigering af tags i tabelform til rådighed"
+msgstr "Tilbyder en dialog til redigering af tags i tabelform."
msgid ""
"Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17058,7 +17092,7 @@ msgid ""
"Provides helper buttons to allow working with single button mouse (stylus). "
"Activate by holding T and slip map with left mouse button"
msgstr ""
-"Viser hjælpe knapper for at tillade arbejde med enkelt knap mus (pen). "
+"Tilbyder hjælpe knapper for at tillade arbejde med enkelt knap mus (pen). "
"Aktiver ved at holde T og slip kort med venstre museknap"
msgid ""
@@ -17080,7 +17114,7 @@ msgstr "Udvidelse til at signere OSM-data digitalt"
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
-"Giver en enkel GUI til tilføjelse, redigering og sletning af drejebaner."
+"Tilbyder en enkel GUI til tilføjelse, redigering og sletning af svingbaner."
msgid ""
"The turnrestrictions plugin allows to enter maintain information about turn "
@@ -17260,9 +17294,21 @@ msgstr "mudder"
msgid "Lanes"
msgstr "Baner"
+msgid "Lanes in way direction"
+msgstr "Baner i vej retning"
+
+msgid "Lanes opposed to way direction"
+msgstr "Baner modsat vej retning"
+
msgid "Max. speed (km/h)"
msgstr "Maks. hastighed (km/t)"
+msgid "Max. speed in way direction"
+msgstr "Maks. hastighed i vej retning"
+
+msgid "Max. speed opposed to way direction"
+msgstr "Maks. hastighed modsat vej retning"
+
msgid "Bridge"
msgstr "Bro"
@@ -17330,6 +17376,9 @@ msgstr "sidespor"
msgid "spur"
msgstr "fabriksspor"
+msgid "crossover"
+msgstr "krydsningsspor"
+
msgid "Electrified"
msgstr "Elektificeret"
@@ -17424,14 +17473,17 @@ msgstr "separeret"
msgid "isolated"
msgstr "isoleret"
+msgid "outside"
+msgstr "udenfor"
+
msgid "Height (meters)"
msgstr "Højde (meter)"
msgid "Max. width (meters)"
-msgstr "Maks bredde (meter)"
+msgstr "Maks. bredde (meter)"
msgid "Max. height (meters)"
-msgstr "Maks højde (meter)"
+msgstr "Maks. højde (meter)"
msgid "pitch"
msgstr "bane"
@@ -17871,7 +17923,7 @@ msgid "high"
msgstr "høj"
msgid "medium"
-msgstr "medium"
+msgstr "mellem"
msgid "low"
msgstr "lav"
@@ -17968,6 +18020,9 @@ msgstr "Betalingsanlæg"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "Er vandområdet uregelmæssigt (forsvinder sæsonmæssigt)?"
+msgid "In the tidal range"
+msgstr "I tidevandsområde"
+
msgid "culvert"
msgstr "gennemløb"
@@ -17989,12 +18044,88 @@ msgstr "Motorbåd"
msgid "Canoe"
msgstr "Kano"
+msgid "Substance"
+msgstr "Stof"
+
+msgid "water"
+msgstr "vand"
+
+msgid "gas"
+msgstr "gas"
+
+msgid "heat"
+msgstr "varme"
+
+msgid "oil"
+msgstr "olie"
+
+msgid "sewage"
+msgstr "spildevand"
+
+msgid "Support"
+msgstr "Montering"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "stang"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "vægmonteret"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "skilt"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "jord"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Gader"
msgid "Motorway"
msgstr "Motorvej"
+msgid "Placement"
+msgstr "Placering"
+
+msgid "left_of:1"
+msgstr "venstre for:1"
+
+msgid "left_of:2"
+msgstr "venstre for:2"
+
+msgid "left_of:3"
+msgstr "venstre for:3"
+
+msgid "middle_of:1"
+msgstr "midt for:1"
+
+msgid "middle_of:2"
+msgstr "midt for:2"
+
+msgid "middle_of:3"
+msgstr "midt for:3"
+
+msgid "right_of:1"
+msgstr "højre for:1"
+
+msgid "right_of:2"
+msgstr "højre for:2"
+
+msgid "right_of:3"
+msgstr "højre for:3"
+
+msgid "transition"
+msgstr "overgang"
+
msgid "Motorway Link"
msgstr "Motorvejsforbindelse"
@@ -18096,6 +18227,9 @@ msgstr "vej mellem parkeringsbåse"
msgid "drive-through"
msgstr "køre igennem"
+msgid "emergency_access"
+msgstr "brandvej"
+
msgid "Parking Aisle"
msgstr "Vej mellem parkeringsbåse"
@@ -18254,10 +18388,10 @@ msgid "Min. speed (km/h)"
msgstr "Min. hastighed (km/t)"
msgid "Max. axleload (tonnes)"
-msgstr "Maks akselbelastning (ton)"
+msgstr "Maks. akselbelastning (ton)"
msgid "Max. length (meters)"
-msgstr "Maks længde (meter)"
+msgstr "Maks. længde (meter)"
msgid "Overtaking"
msgstr "Overhaling"
@@ -18650,12 +18784,15 @@ msgstr "Vendeplads"
msgid "Turning Loop"
msgstr "Vendeplads med ø"
-msgid "City Limit"
-msgstr "Bygrænse"
+msgid "City Limit Sign"
+msgstr "Byskilt"
msgid "Second Name"
msgstr "Andet navn"
+msgid "Speed Limit Sign"
+msgstr "Skilt med hastighedsbegrænsning"
+
msgid "Speed Camera"
msgstr "Fartkamera"
@@ -18775,6 +18912,12 @@ msgstr "Autoværn"
msgid "Wall"
msgstr "Mur"
+msgid "dry_stone"
+msgstr "tørre sten"
+
+msgid "noise_barrier"
+msgstr "støjskærm"
+
msgid "City Wall"
msgstr "Bymur"
@@ -19185,6 +19328,15 @@ msgstr "CNG (Komprimeret naturgas)"
msgid "Pier"
msgstr "Bådebro"
+msgid "Mooring"
+msgstr "Fortøjning"
+
+msgid "commercial"
+msgstr "erhverv"
+
+msgid "Floating"
+msgstr "Flydende"
+
msgid "Lock Gate"
msgstr "Sluseport"
@@ -19825,12 +19977,6 @@ msgstr "Lufthavn"
msgid "Airport Ground"
msgstr "Lufthavnsområde"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Startbane"
@@ -20014,6 +20160,9 @@ msgstr "Mikrobryggeri"
msgid "Outdoor seating"
msgstr "Udendørsservering"
+msgid "Takeaway"
+msgstr "Tag med"
+
msgid "Fast Food"
msgstr "Fastfood"
@@ -20678,25 +20827,6 @@ msgstr "solur"
msgid "unorthodox"
msgstr "utraditionelt"
-msgid "Support"
-msgstr "Montering"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "stang"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "vægmonteret"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "skilt"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "jord"
-
msgid "Visibility/readability"
msgstr "Synlighed/læsbarhed"
@@ -21276,6 +21406,14 @@ msgid "barn"
msgstr "lade"
msgctxt "building"
+msgid "stable"
+msgstr "hestestal"
+
+msgctxt "building"
+msgid "cabin"
+msgstr "bjælkehytte"
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "gårdlænge"
@@ -21474,32 +21612,6 @@ msgstr "vin"
msgid "Bunker Silo"
msgstr "Plansilo"
-msgid "Pipeline"
-msgstr "Rørledning"
-
-msgid "water"
-msgstr "vand"
-
-msgid "gas"
-msgstr "gas"
-
-msgid "heat"
-msgstr "varme"
-
-msgid "oil"
-msgstr "olie"
-
-msgid "sewage"
-msgstr "spildevand"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "undervands"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "overjordisk"
-
msgid "Crane"
msgstr "Kran"
@@ -21584,6 +21696,23 @@ msgstr "Mineindgang"
msgid "Length in meters"
msgstr "Længde i meter"
+msgid "Pipeline"
+msgstr "Rørledning"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "undervands"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "overjordisk"
+
+msgid "Pipeline Marker"
+msgstr "Rørlednings markør"
+
+msgid "Pipeline Valve"
+msgstr "Rørlednings ventil"
+
msgid "Water Tower"
msgstr "Vandtårn"
@@ -21824,6 +21953,34 @@ msgstr "støtte ved drejebro"
msgid "Bridge outline"
msgstr "Bro omrids"
+msgctxt "preset group"
+msgid "Military"
+msgstr "Militær"
+
+msgid "Airfield"
+msgstr "Flyveplads"
+
+msgid "Barracks"
+msgstr "Barakker"
+
+msgid "Bunker"
+msgstr "Bunker"
+
+msgid "pillbox"
+msgstr "pilleæske"
+
+msgid "munitions"
+msgstr "ammunition"
+
+msgid "hardened_aircraft_shelter"
+msgstr "hårdt fly dække"
+
+msgid "Historic"
+msgstr "Historisk"
+
+msgid "Range"
+msgstr "Øvelsesområde"
+
msgid "Power Plant"
msgstr "Kraftværk"
@@ -22453,7 +22610,7 @@ msgid "Power Line"
msgstr "Uisoleret strømkabel"
msgid "Line type"
-msgstr "Linietype"
+msgstr "Linjetype"
msgid "line"
msgstr "luftlinje"
@@ -22991,6 +23148,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr "Kontorer"
+
+msgctxt "office"
+msgid "Accountant"
+msgstr "Revisor"
+
+msgctxt "office"
+msgid "Administrative"
+msgstr "Administrativ"
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr "Reklamebureau"
+
+msgctxt "office"
+msgid "Architect"
+msgstr "Arkitekt"
+
+msgctxt "office"
+msgid "Association"
+msgstr "Sammenslutning"
+
+msgctxt "office"
+msgid "Private company"
+msgstr "Privat firma"
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr "Uddannelsesinstitution"
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr "Vikarbureau"
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr "Ejendomsmægler"
+
+msgctxt "office"
+msgid "Foundation"
+msgstr "Fond"
+
+msgctxt "office"
+msgid "Government"
+msgstr "Regering"
+
+msgctxt "office"
+msgid "Insurance"
+msgstr "Forsikring"
+
+msgctxt "office"
+msgid "It specialist"
+msgstr "IT-specialist"
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr "Advokat"
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr "Avis"
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr "Ikke-statslig organisation (NGO)"
+
+msgctxt "office"
+msgid "Notary"
+msgstr "Notar"
+
+msgctxt "office"
+msgid "Political party"
+msgstr "Politisk parti"
+
+msgctxt "office"
+msgid "Religion"
+msgstr "Religion"
+
+msgctxt "office"
+msgid "Research"
+msgstr "Forskning"
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr "Skatterådgiver"
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr "Telekommunikation"
+
msgid "Geography"
msgstr "Geografi"
@@ -23345,6 +23593,29 @@ msgstr "Gårdsplads"
msgid "Farmland"
msgstr "Landbrugsjord"
+msgid "Crop"
+msgstr "Afgrøde"
+
+msgctxt "crop"
+msgid "corn"
+msgstr "majs"
+
+msgctxt "crop"
+msgid "grass"
+msgstr "græs"
+
+msgctxt "crop"
+msgid "rice"
+msgstr "ris"
+
+msgctxt "crop"
+msgid "wheat"
+msgstr "hvede"
+
+msgctxt "crop"
+msgid "hop"
+msgstr "humle"
+
msgid "Meadow"
msgstr "Eng"
@@ -23397,7 +23668,7 @@ msgid "Retail"
msgstr "Detailhandel"
msgid "Commercial"
-msgstr "Kommercielt"
+msgstr "Erhverv"
msgid "Industrial"
msgstr "Industri"
@@ -23823,13 +24094,13 @@ msgid "Type of enforcement"
msgstr "Type af håndhævelse"
msgid "maxheight"
-msgstr "maxhøjde"
+msgstr "makshøjde"
msgid "maxweight"
-msgstr "maxvægt"
+msgstr "maksvægt"
msgid "maxspeed"
-msgstr "maxhastighed"
+msgstr "makshastighed"
msgid "mindistance"
msgstr "minafstand"
@@ -23838,13 +24109,13 @@ msgid "check"
msgstr "kontrol"
msgid "Max. height (meters, only if enforcement=maxheight)"
-msgstr "Maks højde (meter, kun hvis håndhævelse er maxhøjde)"
+msgstr "Maks. højde (meter, kun hvis håndhævelse er makshøjde)"
msgid "Max. weight (tonnes, only if enforcement=maxweight)"
-msgstr "Maks vægt (ton, kun hvis håndhævelse er maxvægt)"
+msgstr "Maks. vægt (ton, kun hvis håndhævelse er maksvægt)"
msgid "Max. speed (km/h, only if enforcement=maxspeed)"
-msgstr "Maks fart (km/t, kun hvis håndhævelse er maxhastighed)"
+msgstr "Maks. fart (km/t, kun hvis håndhævelse er makshastighed)"
msgid "location of enforcement device"
msgstr "placering for håndhævelsesenhed"
@@ -24347,6 +24618,9 @@ msgstr "{0} skal være en numerisk værdi"
msgid "{0} must be a positive integer number"
msgstr "{0} skal være et positivt heltal"
+msgid "unusual value of {0}"
+msgstr "usædvanlig værdi for {0}"
+
msgid "relation without type"
msgstr "relation uden type"
@@ -24403,6 +24677,12 @@ msgstr "Vis gadenavne (ved høj zoom)"
msgid "Use alternative turn restriction icon set"
msgstr "Brug alternativ svingbegrænsningsikonsæt"
+msgid "Display fill colour of areas with place=*"
+msgstr "Vis fyldfarve for områder med place=*"
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr "Områder er kun tegnet med fyld omkring deres indre kanter"
+
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV Filer"
@@ -24582,13 +24862,13 @@ msgid "(What does that mean?)"
msgstr "(Hvad betyder det?)"
msgid "Please enter Description about your trace."
-msgstr "Indtast venligst en beskrivelse af dit GPX-spor."
+msgstr "Indtast en beskrivelse af dit GPX-spor."
msgid "Tags (comma delimited)"
msgstr "Tags (kommaseparerede)"
msgid "Please enter tags about your trace."
-msgstr "Indtast venligst nogle nøgleord om dit GPX-spor."
+msgstr "Indtast nogle nøgleord om dit GPX-spor."
msgid "Selected track: {0}"
msgstr "Valgt spor: {0}"
@@ -24618,7 +24898,7 @@ msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr "Uploader GPX-spor: {0}% ({1} af {2})"
msgid "No description provided. Please provide some description."
-msgstr "Ingen beskrivelse er angivet. Tilføj venligst en beskrivelse."
+msgstr "Ingen beskrivelse er angivet. Tilføj en beskrivelse."
msgid "Uploading GPX Track"
msgstr "Uploader GPX-spor"
@@ -24684,10 +24964,10 @@ msgid "Starting Epsilon"
msgstr "Start epsilon"
msgid "Max points count per 1 km"
-msgstr "Max antal punkter per 1 km"
+msgstr "Maks. antal punkter per 1 km"
msgid "Enter key mode"
-msgstr "Vælg tilstand"
+msgstr "Returtast tilstand"
msgid "Auto add tags"
msgstr "Auto tilføj tags"
@@ -24761,7 +25041,7 @@ msgid ""
msgstr ""
"{0} m - længde af linjen\n"
"{1} punkter\n"
-"{2} punkter per km (maksimum)\n"
+"{2} punkter per km (maksimalt)\n"
"{3} punkter per km (gennemsnit)"
msgid "Line information"
@@ -25195,7 +25475,7 @@ msgid "Country code must be 2 letters"
msgstr "Landekode skal være på 2 bogstaver"
msgid "Please enter valid number for starting and ending address"
-msgstr "Angiv venligst et gyldigt nummer for både start- og slutadresse"
+msgstr "Indtast et gyldigt nummer for både start- og slutadresse"
msgid "Alphabetic address must end with a letter"
msgstr "Alfabetisk adresse skal ende med et bogstav"
@@ -25208,10 +25488,10 @@ msgstr ""
"Det første adressebogstav skal være mindre end det sidste adressebogstav"
msgid "Please enter valid number for starting address"
-msgstr "Indtast venligst et gyldigt nummer for startadresse"
+msgstr "Indtast et gyldigt nummer for startadresse"
msgid "Please enter valid number for ending address"
-msgstr "Indtast venligst et gyldigt nummer for slut adresse"
+msgstr "Indtast et gyldigt nummer for slut adresse"
msgid "Starting address number must be less than ending address number"
msgstr "Første adressenummer skal være lavere end sidste adressenummer"
@@ -25652,7 +25932,7 @@ msgid ""
"Maximum pixels a point can be away from a line and still be considered as a "
"member of this line (Default: {0})."
msgstr ""
-"Maksimum pixel et punkt kan være væk fra en linje og stadig betragtes som "
+"Maksimale pixels et punkt kan være væk fra en linje og stadig betragtes som "
"medlem af denne linje (Standard: {0})."
msgid "Distance Tolerance"
@@ -26139,7 +26419,7 @@ msgid ""
"building import size is limited to 1 km2 max."
msgstr ""
"For at undgå matrikelsystemet WMS overbelastes,\n"
-"er størrelsen af bygningsimport begrænset til max. 1 km²."
+"er størrelsen af bygningsimport begrænset til maks. 1 km²."
msgid "Please, enable auto-sourcing and check cadastre millesime."
msgstr "Aktiver automatisk kilde og tjek matrikel dato."
@@ -26411,13 +26691,13 @@ msgid "Use"
msgstr "Brug"
msgid "Please select a scheme to use."
-msgstr "Vælg venligst et skema, du vil benytte"
+msgstr "Vælg et skema til benyttelse"
msgid "Color Scheme"
msgstr "Farveskema"
msgid "Please select the scheme to delete."
-msgstr "Vælg venligst det skema, du vil slette"
+msgstr "Vælg skema til sletning"
msgid "Use the selected scheme from the list."
msgstr "Brug det valgte skema fra listen"
@@ -26557,80 +26837,96 @@ msgid "Invalid reference or subject"
msgstr "Ugyldig reference eller emne"
msgid "Download OSM data continuously"
-msgstr ""
+msgstr "Hent OSM data kontinuerligt"
msgid "Download map data continuously when paning and zooming."
-msgstr ""
+msgstr "Download kortdata kontinuerligt ved panorering og zooming."
msgid "Toggle the continuous download on/off"
-msgstr ""
+msgstr "Slå kontinuerlig download til/fra"
msgid "Download Settings"
-msgstr ""
+msgstr "Download indstillinger"
msgid "Settings for the continuous download."
-msgstr ""
+msgstr "Indstillinger for den kontinuerlige download."
msgid "Activate continuous downloads at startup."
-msgstr ""
+msgstr "Aktiver kontinuerlig download ved opstart."
msgid "Supress the default modal progress monitor when downloading."
-msgstr ""
+msgstr "Undertryk standard dialog med forløb når du downloader."
msgid ""
"If this plugin is active at startup. This default state will not change when "
"you are toggeling the plugin with the menu option."
msgstr ""
+"Hvis denne udvidelse er aktiv ved opstart. Denne standard tilstand vil ikke "
+"ændre sig, når du skifter udvidelsen med menupunktet."
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
msgstr ""
+"Maksimalt antal tråde, der anvendes til downloading, øges dette vil det få "
+"klienten til at sende flere samtidige forespørgsler til serveren."
+
+msgid "Requires restart"
+msgstr "Kræver genstart"
msgid "Max threads"
-msgstr ""
+msgstr "Maks. tråde"
msgid "Maximum number of boxes to download for each pan/zoom."
-msgstr ""
+msgstr "Maksimalt antal kasser til download for hver panorering/zoom."
msgid "Max download boxes"
-msgstr ""
+msgstr "Maks. download kasser"
msgid ""
"Time in milliseconds after a pan/zoom before it starts downloading. "
"Additional changes in the viewport in the waiting time will reset the timer."
msgstr ""
+"Tid i millisekunder efter en panorering/zoom, før download begynder. "
+"Yderligere ændringer i kortvisningen i ventetiden vil nulstille timeren."
msgid "Wait time (milliseconds)"
-msgstr ""
+msgstr "Vente tid (millisekunder)"
msgid ""
"How much extra area around the viewport is it going to download. Setting "
"this to 0 will not download any extra data."
msgstr ""
+"Hvor meget ekstra område omkring kortvisningen der vil blive downloadet. "
+"Angives denne til 0 vil der ikke downloades nogen ekstra data."
msgid "Extra download area"
-msgstr ""
+msgstr "Ekstra download område"
msgid ""
"Max area to download in degrees^2. Increasing this number will cause the "
"plugin to download areas when you are zoomed far out."
msgstr ""
+"Maks. område der hentes i grader^2. Øges dette tal vil få udvidelsen til at "
+"hente områder, når du er zoomet langt ud."
msgid "Max download area"
-msgstr ""
+msgstr "Maks. download område"
msgid "The strategy for finding what areas to request from the server."
-msgstr ""
+msgstr "Strategien for at finde hvilke områder serveren skal anmodes om."
msgid "Download strategy"
-msgstr ""
+msgstr "Download strategi"
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
+"Undertryk dialogen med forløb, som vises mens der downloades. Ved valg af "
+"denne indstilling er der ingen indikation af at noget bliver gjort, og ingen "
+"måde at annullere overførslen."
msgid "Address"
msgstr "Adresse"
@@ -26678,7 +26974,7 @@ msgid "Download Along"
msgstr "Download langs"
msgid "Please select 1 or more ways to download along"
-msgstr "Vælg venligst 1 eller flere veje der skal downloades langs"
+msgstr "Vælg 1 eller flere veje der skal downloades langs"
msgid "Download from OSM along selected ways"
msgstr "Download fra OSM langs valgte veje"
@@ -26738,7 +27034,7 @@ msgid "Edit tool"
msgstr "Rediger værktøj"
msgid "CmdLine:"
-msgstr "CmdLine:"
+msgstr "CmdLinje:"
msgid "External tools"
msgstr "Eksterne værktøjer"
@@ -26932,19 +27228,19 @@ msgid "GPX Data"
msgstr "GPX data"
msgid "Classes element below root child level"
-msgstr ""
+msgstr "Klasse element under rod barn niveau"
msgid "Class element ({0}) outside classes element"
-msgstr ""
+msgstr "Klasse element ({0}) udenfor klasse element"
msgid "Class element without name"
-msgstr ""
+msgstr "Klasse element uden navn"
msgid "Tag element outside basetag and implication elements"
-msgstr ""
+msgstr "Tag element udenfor basetag og implikation elementer"
msgid "Implications element below root child level"
-msgstr ""
+msgstr "Implikation element under rod barn niveau"
msgid "Tag without key"
msgstr "Tag uden nøgle"
@@ -26953,52 +27249,52 @@ msgid "Tag without value (key is {0})"
msgstr "Tag uden værdi (nøgle er {0})"
msgid "Closed classes while it was not open"
-msgstr ""
+msgstr "Lukkede klasse mens den ikke var åben"
msgid "Closed classes element before all class elements were closed"
-msgstr ""
+msgstr "Lukkede klasse element før alle elementer i klasse blev lukket"
msgid "Closed class element while none was open"
-msgstr ""
+msgstr "Lukkede klasse element mens ingen var åben"
msgid "Closed basetags while it was not open"
-msgstr ""
+msgstr "Lukkede basetags mens det ikke var åben"
msgid "Closed implications while it was not open"
-msgstr ""
+msgstr "Lukkede implikation mens det ikke var åben"
msgid "Tag element inside other tag element"
msgstr "Tag element inde i andet tag element"
msgid "Invalid opening xml tag <{0}> in state {1}"
-msgstr ""
+msgstr "Ugyldig åbnings xml-tag <{0}> i tilstand {1}"
msgid "Condition isn''t finished at </condition> tag"
-msgstr ""
+msgstr "Betingelse er ikke færdig ved </condition> tag"
msgid "Closing tag element that was not open"
-msgstr ""
+msgstr "Lukkede tag element der ikke var åben"
msgid "Invalid closing xml tag </{0}> in state {1}"
-msgstr ""
+msgstr "Ugyldig luknings xml-tag </{0}> i tilstand {1}"
msgid "Some tags have not been closed; now in state {0}"
-msgstr ""
+msgstr "Nogle tag er ikke blevet lukkede; nu i tilstand {0}"
msgid "Key element without attribute k"
-msgstr ""
+msgstr "Nøgle element uden attribut k"
msgid "Condition is already finished at <{0}>"
-msgstr ""
+msgstr "Betingelse er allerede færdig ved <{0}>"
msgid "Unknown tag for condition: {0}"
-msgstr ""
+msgstr "Ukendt tag for betingelse: {0}"
msgid "Element must not have children: {0}"
-msgstr ""
+msgstr "Element må ikke have børn: {0}"
msgid "Condition is already finished at </{0}>"
-msgstr ""
+msgstr "Betingelse er allerede færdig ved </{0}>"
msgid "<and> needs at least one child"
msgstr "<and> har brug for mindst et barn"
@@ -27010,16 +27306,16 @@ msgid "<not> needs at least one child"
msgstr "<not> har brug for mindst et barn"
msgid "Wrong closing tag {0} (</{1}> expected)"
-msgstr ""
+msgstr "Forkert afsluttende tag {0} (</{1}> forventet)"
msgid "Condition {0} not yet finished"
-msgstr ""
+msgstr "Betingelse {0} endnu ikke afsluttet"
msgid "Group not yet evaluated"
-msgstr ""
+msgstr "Gruppe endnu ikke evalueret"
msgid "Collection must contain at least one condition"
-msgstr ""
+msgstr "Samling skal indeholde mindst en betingelse"
msgid "No ruleset has been selected!"
msgstr "Intet regelsæt er blevet valgt!"
@@ -27031,6 +27327,8 @@ msgid ""
"Syntax exception in access ruleset:\n"
"{0}"
msgstr ""
+"Syntaks handling i adgangs regelsæt:\n"
+"{0}"
msgid ""
"File not found:\n"
@@ -27080,34 +27378,34 @@ msgid "Bookmark name must not contain ''{0}''!"
msgstr "Bogmærkenavn må ikke indeholde ''{0}''!"
msgid "Access class"
-msgstr ""
+msgstr "Adgangs klasse"
msgid "Access class must not contain ''{0}''!"
-msgstr ""
+msgstr "Adgangs klasse må ikke indeholde ''{0}''!"
msgid "Access types"
-msgstr ""
+msgstr "Adgangs typer"
msgid "Vehicle properties"
msgstr "Køretøjs egenskaber"
msgid "Road requirements"
-msgstr ""
+msgstr "Krav til vej"
msgid "Max. incline up (%, pos.)"
-msgstr "Max. hældning op (%, pos.)"
+msgstr "Maks. hældning op (%, pos.)"
msgid "Maximum incline the vehicle can go up"
-msgstr "Største stigning køretøjet kan køre op ad"
+msgstr "Maksimal stigning køretøjet kan køre op ad"
msgid "Max. incline down (%, pos.)"
-msgstr "Max. hældning ned (%, pos.)"
+msgstr "Maks. hældning ned (%, pos.)"
msgid "Maximum incline the vehicle can go down"
-msgstr "Største hældning køretøjet kan køre ned ad"
+msgstr "Maksimal hældning køretøjet kan køre ned ad"
msgid "Surface blacklist"
-msgstr ""
+msgstr "Sortlistet overflade"
msgid ""
"List of surfaces the vehicle cannot use, values are separated by semicolons "
@@ -27117,22 +27415,22 @@ msgstr ""
"semikolonner (;)"
msgid "max. tracktype grade"
-msgstr ""
+msgstr "Maks. sportype kvalitet"
msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
-msgstr "Dårligste tracktype (1-5) køretøjet stadig kan bruge, 0 for ingen"
+msgstr "Dårligste sportype (1-5) køretøjet stadig kan bruge, 0 for ingen"
msgid "Change bookmark"
msgstr "Ændre bogmærke"
msgid "Edit access parameters"
-msgstr ""
+msgstr "Rediger adgangs parametre"
msgid "Graph View Dialog"
-msgstr ""
+msgstr "Grafvisnings dialog"
msgid "Open the dialog for graph view configuration."
-msgstr "Åbn dialogen for grafen visnings konfiguration."
+msgstr "Åbn dialogen for grafenvisnings konfiguration."
msgid "default"
msgstr "standard"
@@ -27150,16 +27448,17 @@ msgid "Parameters:"
msgstr "Parametre:"
msgid "Coloring:"
-msgstr ""
+msgstr "Farver:"
msgid "Create/update graph"
-msgstr ""
+msgstr "Opret/opdater graf"
msgid "Graphview"
-msgstr ""
+msgstr "Grafvisning"
msgid "Settings for the Graphview plugin that visualizes routing graphs."
msgstr ""
+"Indstillinger for grafvisnings udvidelsen der visualiserer rutegrafer."
msgid "Ruleset"
msgstr "Regelsæt"
@@ -27198,21 +27497,23 @@ msgid "Arrowhead placement"
msgstr "Pilhoved placering"
msgid "New bookmark"
-msgstr ""
+msgstr "Nyt bogmærke"
msgid "Really delete \"{0}\"?"
-msgstr ""
+msgstr "Virkelig slette \"{0}\"?"
msgid "Bookmark deletion"
-msgstr ""
+msgstr "Bogmærke sletning"
msgid ""
"Really restore default bookmarks?\n"
"All manually added or edited bookmarks will be lost!"
msgstr ""
+"Virkelig gendanne standard bogmærker?\n"
+"Alle manuelt tilføjet eller redigeret bogmærker vil gå tabt!"
msgid "Bookmark reset"
-msgstr ""
+msgstr "Nulstil bogmærke"
msgid "Choose node color"
msgstr "Vælg punktfarve"
@@ -27224,19 +27525,19 @@ msgid "Choose arrowhead fill color"
msgstr "Vælg pilhoved fyldfarve"
msgid "Routing graph calculated by the GraphView plugin"
-msgstr ""
+msgstr "Rutegraf beregnet af grafvisnings udvidelsen"
msgid "GraphView layer is not mergable"
-msgstr ""
+msgstr "Grafvisnings lag kan ikke lægges sammen"
msgid "graphview default node"
-msgstr ""
+msgstr "grafvisnings standard punkt"
msgid "graphview default segment"
-msgstr ""
+msgstr "grafvisnings standard segment"
msgid "graphview arrowhead core"
-msgstr ""
+msgstr "grafvisnings pilespids kerne"
msgid ""
"Weights must be given as positive decimal numbers with unit \"t\" or without "
@@ -27625,97 +27926,100 @@ msgid "IRS Adjustment Layer"
msgstr "IRS justeringslag"
msgid "Channel-Digraph created from the active OSM-Layer"
-msgstr ""
+msgstr "Kanal-digraf oprettet fra det aktive OSM-lag"
msgid "Create Channel Digraph"
-msgstr ""
+msgstr "Opret kanal digraf"
msgid "this layer is no osm data layer"
msgstr "dette lag er ikke et OSM datalag"
msgid "Converting OSM graph into Channel Digraph"
-msgstr ""
+msgstr "Konverterer OSM graf til kanal digraf"
msgid "filtering ways"
-msgstr ""
+msgstr "filtrer veje"
msgid "creating Channel-Digraph"
-msgstr ""
+msgstr "opretter kanal-digraf"
msgid "sealing Digraph"
-msgstr ""
+msgstr "forsegler digraf"
msgid "calculating Strong Connectedness"
-msgstr ""
+msgstr "beregner stærk tilknytning"
msgid "creating DigraphLayer"
-msgstr ""
+msgstr "opretter digraf lag"
msgid "JunctionChecking"
-msgstr ""
+msgstr "VejkrydsTjekker"
msgid "Open the junctionchecking window."
-msgstr ""
+msgstr "Åbn vejkryds tjekker vinduet."
msgid "junctions"
-msgstr ""
+msgstr "vejkryds"
msgid "Channel-Digraph creation"
-msgstr ""
+msgstr "Kanal-digraf oprettelse"
msgid "seal Channel Digraph"
-msgstr ""
+msgstr "forsegl kanal digraf"
msgid "calculate strong connected channels"
-msgstr ""
+msgstr "beregn stærkt forbundne kanaler"
msgid "Junctionchecking/junctions searching"
-msgstr ""
+msgstr "Vejkryds tjekker/vejkryds søgning"
msgid "order of junction (n):"
-msgstr ""
+msgstr "vejkryds grad (n):"
msgid "produce OSM-Relations: junction"
-msgstr ""
+msgstr "producerer OSM-relationer: vejkryds"
msgid ""
"if enabled the plugin produces osm-relations from the junction subgraphs"
msgstr ""
+"hvis aktiveret producerer udvidelsen OSM-relationer fra vejkryds undergrafer"
msgid "create the channel digraph"
-msgstr ""
+msgstr "opret kanalen digraf"
msgid "Check "
msgstr "Tjek "
msgid "check the subust for junction properties"
-msgstr ""
+msgstr "tjek delmængden for vejkryds egenskaber"
msgid "Search "
msgstr "Søg "
msgid "search for junctions in the channel subset"
-msgstr ""
+msgstr "søg efter vejkryds i kanalens delmængde"
msgid ""
"The marked channels contains a junctioncandidate (white). To test this "
"candidat mark these channel and press the \"Check\" button again."
msgstr ""
+"De markerede kanaler indeholder en vejkryds kandidat (hvid). For at teste "
+"denne kandidat mærk disse kanaler og tryk på \"Tjek\" knappen igen."
msgid "The marked channels are a {0}-ways junction"
-msgstr ""
+msgstr "De markerede kanaler er et {0}-veje vejkryds"
msgid "The marked channels are not a junction:"
-msgstr ""
+msgstr "De markerede kanaler er ikke et vejkryds:"
msgid "construct channel digraph and search for junctions"
-msgstr ""
+msgstr "konstruerer kanal digraf og søger efter vejkryds"
msgid "Number of {0}-ways junctions found: {1}"
-msgstr ""
+msgstr "Antal {0}-veje vejkryds fundet: {1}"
msgid "generate all combinations from entrie/exit candidates"
-msgstr ""
+msgstr "generere alle kombinationer fra indgangs/udgangs kandidater"
msgid "Direction index ''{0}'' not found"
msgstr "Retnings indeks ''{0}'' blev ikke fundet"
@@ -27793,13 +28097,13 @@ msgid "Maximum number of segments per way"
msgstr "Maksimalt antal segmenter pr. vej"
msgid "Maximum number of nodes in initial trace"
-msgstr "Maks antal punkter i foreløbig sporing"
+msgstr "Maksimalt antal punkter i foreløbig sporing"
msgid "Maximum gray value to count as water (0-255)"
msgstr "Maksimal grå værdi der tæller som vand (0-255)"
msgid "Line simplification accuracy (degrees)"
-msgstr "Line forenklings nøjagtighed (grader)"
+msgstr "Linje forenklings nøjagtighed (grader)"
msgid "Resolution of Landsat tiles (pixels per degree)"
msgstr "Opløsning af Landsat-tern (pixels per grad)"
@@ -27853,15 +28157,15 @@ msgid ""
"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
"in the range 0-255. Default 90."
msgstr ""
-"Maks. grå værdi at acceptere som vand (baseret på Landsat IR-1 data). Kan "
-"være i området 0-255. Standard er 90."
+"Maksimal grå værdi der accepteres som vand (baseret på Landsat IR-1 data). "
+"Kan være i området 0-255. Standard er 90."
msgid ""
"Accuracy of Douglas-Peucker line simplification, measured in "
"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
"0.0003."
msgstr ""
-"Nøjagtighed på Douglas-Peucker line forenkling, målt i grader.<br>Lavere "
+"Nøjagtighed på Douglas-Peucker linje forenkling, målt i grader.<br>Lavere "
"værdier give flere punkter, og mere præcise linjer. Standard 0,0003."
msgid ""
@@ -28593,7 +28897,7 @@ msgid "Update the selected modules"
msgstr "Opdater de valgte moduler"
msgid "Please restart JOSM to activate the downloaded modules."
-msgstr "Genstart venligst JOSM for at aktivere de downloadede moduler."
+msgstr "Genstart JOSM for at aktivere de downloadede moduler."
msgid ""
"All installed modules are up to date. JOSM does not have to download newer "
@@ -28771,7 +29075,7 @@ msgstr "Ingen gyldige koordinater er blevet fundet."
msgid "Invalid file. Bad length on line {0}. Expected {1} columns, got {2}."
msgstr ""
-"Ugyldig fil. Forkert længde på line {0}. Forventede {1} kolonner, fik {2}."
+"Ugyldig fil. Forkert længde på linje {0}. Forventede {1} kolonner, fik {2}."
msgid "XLS files"
msgstr "XLS filer"
@@ -29040,10 +29344,10 @@ msgid "Reading OSM data..."
msgstr "Indlæser OSM data..."
msgid "Transform error: Min X must be smaller than max"
-msgstr "Transformations fejl: Min X skal være mindre end max"
+msgstr "Transformations fejl: Min X skal være mindre end maks."
msgid "Transform error: Min Y must be smaller than max"
-msgstr "Transformations fejl: Min Y skal være mindre end max"
+msgstr "Transformations fejl: Min Y skal være mindre end maks."
msgid "Transform error: Points too close"
msgstr "Transformations fejl: Punkter for tæt"
@@ -29127,7 +29431,7 @@ msgid "East and North"
msgstr "Øst og Nord"
msgid "Top right (max) corner:"
-msgstr "Øverst til højre (max) hjørne:"
+msgstr "Øverst til højre (maks.) hjørne:"
msgid "Projection Preferences"
msgstr "Projektionsindstillinger"
@@ -29169,7 +29473,7 @@ msgid "Could not parse color"
msgstr "Kunne ikke fortolke farve"
msgid "Could not parse max path count"
-msgstr "Kunne ikke fortolke max sti tæller"
+msgstr "Kunne ikke fortolke maks. sti tæller"
msgid "Parsing file"
msgstr "Fortolker fil"
@@ -29184,7 +29488,7 @@ msgid "Removing parallel segments"
msgstr "Fjerner parallelle segmenter"
msgid "Max distance is not a number"
-msgstr "Max afstand er ikke et tal"
+msgstr "Maks. afstand er ikke et tal"
msgid "Joining nodes"
msgstr "Sammenlægger punkter"
@@ -29205,7 +29509,7 @@ msgid "Please set a projection."
msgstr "Sæt en projektion."
msgid "Could not parse numbers. Please check."
-msgstr "Kunne ikke fortolke numre. Kontrollerer venligst."
+msgstr "Kunne ikke fortolke numre. Kontrollerer dem."
msgid "Building JOSM layer"
msgstr "Opbygger JOSM lag"
@@ -29339,40 +29643,46 @@ msgid "Untagged Images"
msgstr "Utaggede billeder"
msgid "Do you want to save current calibration of layer {0}?"
-msgstr ""
+msgstr "Vil du at gemme den aktuelle kalibrering af lag {0}?"
+
+msgid "Select an option"
+msgstr "Vælg en mulighed"
msgid "Load Picture Calibration..."
-msgstr ""
+msgstr "Indlæs billede kalibrering..."
msgid "Loads calibration data from a file"
-msgstr ""
+msgstr "Henter kalibrerings data fra en fil"
msgid "Loading file failed: {0}"
msgstr "Indlæsning af filen fejlede: {0}"
+msgid "Problem occurred"
+msgstr "Problem opstået"
+
msgid "Load World File Calibration..."
-msgstr ""
+msgstr "Indlæs verdens kalibrerings fil..."
msgid "Loads calibration data from a world file"
-msgstr ""
+msgstr "Indlæser kalibrerings data fra en verdens fil"
msgid "Reset Calibration"
-msgstr ""
+msgstr "Nulstil kalibrering"
msgid "Reset calibration"
-msgstr ""
+msgstr "Nulstil kalibrering"
msgid "Calibration reset"
-msgstr ""
+msgstr "Nulstil kalibrering"
msgid "Save Picture Calibration..."
-msgstr ""
+msgstr "Gem billed kalibrering..."
msgid "Saves calibration data to a file"
-msgstr ""
+msgstr "Gem kalibrerings data til en fil"
msgid "Saving file failed: {0}"
-msgstr ""
+msgstr "Kunne ikke gemme fil: {0}"
msgid "New picture layer from clipboard"
msgstr "Nyt billedlag fra udklipsholder"
@@ -29388,102 +29698,107 @@ msgid ""
"layers!\n"
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+"KML kalibrering er i beta fase og kan producere forkert kalibrerede lag!\n"
+"Brug {0} for at uploade dine KML, der blev kalibreret forkert."
+
+msgid "Notification"
+msgstr "Meddelelse"
msgid "PicLayer move"
-msgstr ""
+msgstr "BilledLag flyt"
msgid "Moved"
msgstr "Flyttet"
msgid "Drag to move the picture"
-msgstr ""
+msgstr "Træk for at flytte billedet"
msgid "PicLayer rotate"
-msgstr ""
+msgstr "BilledLag roter"
msgid "Rotated"
-msgstr ""
+msgstr "Roteret"
msgid "Drag to rotate the picture"
-msgstr ""
+msgstr "Træk for at rotere billedet"
msgid "PicLayer scale X"
-msgstr ""
+msgstr "BilledLag skalere X"
msgid "Scaled by X"
-msgstr ""
+msgstr "Skaleret langs X"
msgid "Drag to scale the picture in the X Axis"
-msgstr ""
+msgstr "Træk for at skalere billedet i X-aksen"
msgid "PicLayer scale"
-msgstr ""
+msgstr "BilledLag skalere"
msgid "Scaled"
msgstr "Skaleret"
msgid "Drag to scale the picture in the X and Y Axis"
-msgstr ""
+msgstr "Træk for at skalere billedet i X og Y-aksen"
msgid "PicLayer scale Y"
-msgstr ""
+msgstr "BilledLag skalere Y"
msgid "Scaled by Y"
-msgstr ""
+msgstr "Skaleret langs Y"
msgid "Drag to scale the picture in the Y Axis"
-msgstr ""
+msgstr "Træk for at skalere billedet i Y-aksen"
msgid "PicLayer shear"
-msgstr ""
+msgstr "BilledLag forskydning"
msgid "Sheared"
-msgstr ""
+msgstr "Forskudt"
msgid "Drag to shear the picture"
-msgstr ""
+msgstr "Træk for at forskyde billedet"
msgid "PicLayer Move point"
-msgstr ""
+msgstr "BilledLag flyt punkt"
msgid "Point added/moved"
-msgstr ""
+msgstr "Punkt tilføjet/flyttet"
msgid "Drag or create point on the picture"
-msgstr ""
+msgstr "Træk eller opret punkt på billedet"
msgid "PicLayer Remove point"
-msgstr ""
+msgstr "BilledLag fjern punkt"
msgid "Point removed"
msgstr "Punkt fjernet"
msgid "Remove point on the picture"
-msgstr ""
+msgstr "Fjern punkt på billedet"
msgid "PicLayer Transform point"
-msgstr ""
+msgstr "BilledLag omdan punkt"
msgid "Point transformed"
-msgstr ""
+msgstr "Punkt omdannet"
msgid "Transform point on the picture"
-msgstr ""
+msgstr "Omdan punkt på billedet"
msgid "PicLayer: {0}"
-msgstr "PicLayer: {0}"
+msgstr "BilledLag: {0}"
msgid "Calibration Files"
-msgstr ""
+msgstr "Kalibrerings filer"
msgid "Could not find the map object."
-msgstr ""
+msgstr "Kunne ikke finde kort objektet."
msgid "PicLayer failed to load or import the image."
-msgstr ""
+msgstr "BilledLag kunne ikke hente eller importere billedet."
msgid "Nothing in clipboard"
-msgstr ""
+msgstr "Intet i udklipsholderen"
msgid "The clipboard data is not an image"
msgstr "Udklipsholder data er ikke et billede"
@@ -29492,7 +29807,7 @@ msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
msgstr "Advarsel: kunne ikke håndtere zip fil \"{0}\". Handling var: {1}"
msgid "A calibration file associated to the picture file was found: {0}\n"
-msgstr ""
+msgstr "En kalibrerings fil knyttet til billedfilen blev fundet: {0}\n"
msgid ""
"Set \"{0}\" to yes/no/ask in the preferences\n"
@@ -29503,17 +29818,18 @@ msgstr ""
"kalibrerings-filer"
msgid "Do you want to apply it ?"
-msgstr ""
+msgstr "Ønsker du at anvende det?"
-msgid "Load calibration file ?"
-msgstr ""
+msgid "Load calibration file?"
+msgstr "Indlæs kalibrerings fil?"
msgid "It will be applied automatically."
-msgstr ""
+msgstr "Det vil blive anvendt automatisk."
msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+"Endvidere, fra nu af, kalibrerings filer vil altid blive indlæst automatisk."
msgid "Point info"
msgstr "Punkt info"
@@ -29744,9 +30060,6 @@ msgstr "Stat"
msgid "pending"
msgstr "afventer"
-msgid "outside"
-msgstr "udenfor"
-
msgid "[incomplete]"
msgstr "[ufuldstændig]"
@@ -29817,7 +30130,7 @@ msgid "left hand side"
msgstr "venstre side"
msgid "Maximum distance from route"
-msgstr "Maksimum afstand fra ruten"
+msgstr "Maksimal afstand fra ruten"
msgid "Public Transport: Change stop type"
msgstr "Offentlig Transport: Skift stop type"
@@ -29850,8 +30163,8 @@ msgid ""
"The GPX file doesn''t contain valid trackpoints. Please use a GPX file that "
"has trackpoints."
msgstr ""
-"GPX filen indeholder ikke gyldige sporpunkter. Brug venligst en GPX fil der "
-"har sporpunkter."
+"GPX filen indeholder ikke gyldige sporpunkter. Brug en GPX fil der har "
+"sporpunkter."
msgid "GPX File Trouble"
msgstr "GPX fil-problem"
@@ -30901,34 +31214,37 @@ msgid "GPG"
msgstr "GPG"
msgid "Export sigs..."
-msgstr ""
+msgstr "Eksporter underskrifter..."
msgid "Export all signatures to XML file."
-msgstr "Eksporter alle signaturer til en XML fil."
+msgstr "Eksporter alle underskrifter til en XML fil."
msgid "Export sigs to XML..."
-msgstr ""
+msgstr "Eksporter underskrifter til XML..."
msgid "Save Signatures file"
-msgstr "Gem signaturfil"
+msgstr "Gem underskriftsfil"
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
+"Hent alle refererede men ikke faktisk til stede OSM objekter fra OSM server."
msgid "Download referenced osm objects..."
-msgstr ""
+msgstr "Download refererede OSM objekter..."
msgid "{0} Signatures loaded. All referenced OSM objects found."
-msgstr "{0} signaturer indlæst. Alle refererede OSM objekter fundet."
+msgstr "{0} underskrifter indlæst. Alle refererede OSM objekter fundet."
msgid ""
"{0} of {1} OSM objects are referenced but not there.\n"
"Do you want to load them from OSM-Server?"
msgstr ""
+"{0} af {1} OSM objekter refereres, men er der ikke.\n"
+"Vil du load dem fra OSM-server?"
msgid "Load objects from server"
-msgstr "Indlæs objekter fra serveren"
+msgstr "Load objekter fra serveren"
msgid "Download signed data"
msgstr "Download underskrevet data"
@@ -30941,6 +31257,8 @@ msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
msgstr ""
+"Skaber nyt nøglepar.\n"
+"Indsamler tilfældighed..."
msgid "UID"
msgstr "UID"
@@ -30958,25 +31276,25 @@ msgid "Unknown"
msgstr "Ukendt"
msgid "Object signatures"
-msgstr "Objekt signaturer"
+msgstr "Objekt underskrifter"
msgid "Open object signing window."
-msgstr ""
+msgstr "Åbn objekt underskrivelses vindue."
msgid "Check"
msgstr "Tjek"
msgid "Check all available signatures for selected object."
-msgstr "Kontrollér alle tilgængelige signaturer for valgte objekter."
+msgstr "Kontroller alle tilgængelige underskrifter for valgte objekter."
msgid "Sign"
msgstr "Underskriv"
msgid "Digital sign selected Tags, if you believe they are correct."
-msgstr ""
+msgstr "Digital underskriv valgte tags, hvis du mener de er korrekte."
msgid "Show all available signatures for selected attribute."
-msgstr "Vis alle tilgængelige signaturer for valgte attributter."
+msgstr "Vis alle tilgængelige underskrifter for valgte attributter."
msgid "Show deleted tags and notes if they were signed before"
msgstr "Vis slettede tags og noter, hvis de blev underskrevet inden"
@@ -30985,18 +31303,22 @@ msgid ""
"Use default (and maybe existing) GnuPG directory ({0}) to store new keys and "
"configs."
msgstr ""
+"Brug standard (og måske eksisterende) GnuPG mappe ({0}) til at gemme nye "
+"nøgler og konfigurationer."
msgid "Use separate GnuPG directory ({0}) to store new keys and configs."
msgstr ""
+"Brug separat GnuPG mappe ({0}) til at gemme nye nøgler og konfigurationer."
msgid "Trust OSM Settings"
-msgstr ""
+msgstr "Pålidelig OSM indstillinger"
msgid "Change GPG and privacy settings of the trustosm plugin."
msgstr ""
+"Skift GPG og privatlivs indstillingerne for pålidelig osm udvidelsen."
msgid "Use separate GnuPG configuration directory?"
-msgstr ""
+msgstr "Brug separat GnuPG-konfigurationens mappe?"
msgid "GnuPG"
msgstr "GnuPG"
@@ -31005,19 +31327,19 @@ msgid "Dialog"
msgstr "Dialog"
msgid "Signed key value pair was: {0}={1}"
-msgstr ""
+msgstr "Underskrevet nøgle værdi par var: {0}={1}"
msgid "{0} Signatures found."
-msgstr "{0} signaturer fundet."
+msgstr "{0} underskrifter fundet."
msgid "Signature Info"
-msgstr "Signaturinfo"
+msgstr "Underskriftsinfo"
msgid "Sorry, there are no Signatures for the selected Node."
-msgstr "Beklager, der er ingen signaturer for det valgte punkt."
+msgstr "Beklager, der er ingen underskrifter for det valgte punkt."
msgid "No Signature found"
-msgstr "Ingen signatur fundet"
+msgstr "Ingen underskrifter fundet"
msgid ""
"Selected node was:\n"
@@ -31027,7 +31349,7 @@ msgstr ""
"{0}"
msgid "Sorry, there are no Signatures for the selected Attribute."
-msgstr "Beklager, der er ingen signaturer for den valgte attribut."
+msgstr "Beklager, der er ingen underskrift for den valgte attribut."
msgid ""
"Selected key value pair was:\n"
@@ -31037,16 +31359,16 @@ msgstr ""
"{0}={1}"
msgid "Sorry, there are no Signatures for the selected Segment."
-msgstr "Beklager, der er ingen signaturer for det valgte segment."
+msgstr "Beklager, der er ingen underskrifter for det valgte segment."
msgid "Selected WaySegment was:"
msgstr "Valgt VejSegment var:"
msgid "Signature Files"
-msgstr "Signaturfiler"
+msgstr "Underskrftsfiler"
msgid "OSM Signature Files"
-msgstr "OSM signaturfiler"
+msgstr "OSM underskriftsfiler"
msgid "Only digits allowed in osmid: ''{0}''."
msgstr "Kun cifre tilladt i osmid: ''{0}''."
@@ -31058,10 +31380,10 @@ msgid "Prepare stuff..."
msgstr "Forbereder ting..."
msgid "Parsing Signature data..."
-msgstr "Fortolker signaturdata..."
+msgstr "Fortolker underskriftsdata..."
msgid "The Signature is broken!"
-msgstr "Signaturen er ødelagt!"
+msgstr "Underskriften er ødelagt!"
msgid "Manipulation Warning"
msgstr "Manipulations advarsel"
@@ -31087,11 +31409,11 @@ msgid ""
"uploading it to the OSM-server."
msgstr ""
"Objektet med ID \"{0}\" ({1}) er netop oprettet.\n"
-"Du kan ikke signere det, da signaturen vil miste sin ID-reference efter "
-"upload til OSM-serveren."
+"Du kan ikke underskrive det, da underskriften vil miste sin ID-reference "
+"efter upload til OSM-serveren."
msgid "Signing canceled!"
-msgstr ""
+msgstr "Underskrivning afbrudt!"
msgid "Please give a tolerance in meters"
msgstr "Angiv en tolerance i meter"
@@ -31109,7 +31431,7 @@ msgid "Web Recherche"
msgstr "Web søgning"
msgid "Trusted persons told me"
-msgstr ""
+msgstr "Pålidelige personer fortalte mig"
msgid "Which source did you use?"
msgstr "Hvilken kilde har du brugt?"
@@ -31157,7 +31479,7 @@ msgid "Choose an expiry date for the key:"
msgstr "Vælg en udløbsdato for nøglen:"
msgid "Create a new signing key"
-msgstr ""
+msgstr "Opret en ny underskrivelse nøgle"
msgid "No such lane."
msgstr "Sådan et spor findes ikke."
@@ -31167,32 +31489,32 @@ msgid ""
"missing lanes tags.</html>"
msgstr ""
"<html>Antallet af spor er ikke angivet for en eller flere veje; tilføj "
-"venligst manglende lanes tags.</html>"
+"manglende spor tags.</html>"
msgid ""
"<html>An error occurred while constructing the model. Please run the "
"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
msgstr ""
-"<html>Der opstod en fejl ved konstruktion af modellen. Kør venligst "
-"validering for at sikre at data er konsistent.<br><br>Fejl: {0}</html>"
+"<html>Der opstod en fejl ved konstruktion af modellen. Kør validering for at "
+"sikre at data er konsistent.<br><br>Fejl: {0}</html>"
msgid "Edit turn relations and lane lengths for selected node."
msgstr "Rediger sving-relationer og sporlængder for det valgte punkt."
msgid "Validate turn- and lane-length-relations for consistency."
-msgstr "Validér sving- og sporlængde-relation konsistens."
+msgstr "Valider sving- og sporlængde-relation konsistens."
msgid "Turn Lanes"
-msgstr "Svingspor"
+msgstr "Svingbaner"
msgid "Edit turn lanes"
-msgstr "Rediger svingspor"
+msgstr "Rediger svingbaner"
msgid "Quick-Fix"
-msgstr "Hurtig-fiks"
+msgstr "Hurtig-ret"
msgid "Revalidate all turnlanes-relations."
-msgstr "Genvalidér alle svingspor-relationer."
+msgstr "Genvalider alle svingbaner-relationer."
msgid "Automatically fixes the issue."
msgstr "Ret automatisk problemet."
@@ -32038,7 +32360,7 @@ msgid ""
"24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg 42' 52.13\" N, 21 "
"deg 11' 47.60\" E</li></ul>"
msgstr ""
-"Indtast koordinaterne for de nye punkter, en for hver linie.<br/>Hvis du "
+"Indtast koordinaterne for de nye punkter, en for hver linje.<br/>Hvis du "
"indtaster to linjer med samme koordinater vil der blive genereret dublerede "
"punkter.<br/>Du kan adskille længdegrad og breddegrad med mellemrum, komma "
"eller semikolon.<br/>Brug positive tal eller N, E bogstaverne til at angive "
@@ -32355,7 +32677,7 @@ msgid "no deinterlacing"
msgstr "ingen deinterlacing"
msgid "deinterlacing using line doubling"
-msgstr "deinterlacing via liniefordobling"
+msgstr "deinterlacing via linjefordobling"
msgid "deinterlacing using linear interpolation"
msgstr "deinterlacing via lineær interpolation"
diff --git a/i18n/po/de.po b/i18n/po/de.po
index 24ce1d4..82a2f41 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-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-29 20:38+0000\n"
-"Last-Translator: Simon Legner <Unknown>\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-23 17:33+0000\n"
+"Last-Translator: Klumbumbus <Unknown>\n"
"Language-Team: JOSM\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:41+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:41+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: de\n"
"X-Poedit-SearchPath-0: .\n"
"X-Poedit-Basepath: /home/simon/src/josm.all/i18n\n"
@@ -177,6 +177,13 @@ msgstr "Erweiterungen"
msgid "About JOSM..."
msgstr "Über JOSM …"
+msgid "Failed to locate resource ''{0}''."
+msgstr "Ressource ''{0}'' wurde nicht gefunden."
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+"Die Ressource ''{0}'' konnte nicht geladen werden. Die Fehlermeldung ist: {1}"
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -591,7 +598,7 @@ msgid "New offset"
msgstr "Neuer Versatz"
msgid "Adjust the position of this imagery layer"
-msgstr "Position der Hintergrundebene anpassen"
+msgstr "Position der Hintergrundbildebene anpassen"
msgid "Adjust imagery offset"
msgstr "Hintergrundbildversatz anpassen"
@@ -2364,14 +2371,12 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Objekte auswählen, bewegen, skalieren und rotieren"
-msgid "Move elements"
-msgstr "Elemente verschieben"
-
-msgid "Move them"
-msgstr "Verschieben"
-
-msgid "Undo move"
-msgstr "Verschieben rückgängig machen"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
+"Sind Sie sicher, dass Sie Elemente mit angefügten Linien, die durch Filter "
+"ausgeblendet sind, verschieben möchten?"
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2390,6 +2395,15 @@ msgstr[1] ""
"Anzahl von Elementen ist oftmals unbeabsichtigt.\n"
"Wollen Sie sie wirklich verschieben?"
+msgid "Move elements"
+msgstr "Elemente verschieben"
+
+msgid "Move them"
+msgstr "Verschieben"
+
+msgid "Undo move"
+msgstr "Verschieben rückgängig machen"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Maustaste loslassen, um Objekte im Rechteck auszuwählen."
@@ -2597,6 +2611,9 @@ msgstr "MapCSS-Selektor"
msgid "add toolbar button"
msgstr "Als Schaltfläche in Werkzeugleiste"
+msgid "Invalid search expression"
+msgstr "Ungültiger Suchausdruck"
+
msgid "Filter"
msgstr "Filter"
@@ -2618,9 +2635,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Ungültiger Suchausdruck"
-
msgid "basic examples"
msgstr "Einfache Beispiele"
@@ -3509,13 +3523,13 @@ msgstr "Britisches System"
msgid "Nautical Mile"
msgstr "Seemeile"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-"Die Ressource ''{0}'' konnte nicht geladen werden. Die Fehlermeldung ist: {1}"
-
msgid "UNKNOWN"
msgstr "UNBEKANNT"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+"Fehler beim Lesen der Revisions-Information aus der Revisions-Datei: {0}"
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
"Unerwartete JOSM-Versionsnummer in der Revisions-Datei, der Wert ist ''{0}''"
@@ -5246,12 +5260,20 @@ msgstr "Hilfe"
msgid "Menu: {0}"
msgstr "Menü: {0}"
+msgid "Main toolbar"
+msgstr "Hauptwerkzeugleiste"
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+"Schaltet die Sichtbarkeit der Hauptwerkzeugleiste (d.h. die horizontale "
+"Werkzeugleiste) um"
+
msgid "Edit toolbar"
msgstr "Werkzeugleiste bearbeiten"
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
-msgstr ""
-"Werkzeugleiste »Bearbeiten« (z.B. das Vertikalwerkzeug) ein-/ausblenden"
+msgstr "Werkzeugleiste »Bearbeiten« (senkrechtes Werkzeug) ein-/ausblenden"
msgid "Preset preferences"
msgstr "Objektvorlagen-Einstellungen"
@@ -5260,7 +5282,7 @@ 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 "Bildeinstellungen"
+msgstr "Hintergrundbild-Einstellungen"
msgid "Click to open the imagery tab in the preferences"
msgstr ""
@@ -5424,7 +5446,7 @@ msgstr "bis Kachel"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -6327,26 +6349,17 @@ msgstr "Konflikte auflösen"
msgid "Resolve conflicts for ''{0}''"
msgstr "Konflikte lösen für ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Bitte bestätigen Sie, dass <strong>1 Objekt</strong> aus <strong>1 "
-"Relation</strong> entfernt werden soll.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Bitte bestätigen Sie, dass <strong>1 Objekt</strong> aus <strong>{0} "
-"Relationen</strong> entfernt werden soll.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+"Bitte bestätigen Sie das Entfernen von <strong>{0} Objekt</strong>."
+msgstr[1] ""
+"Bitte bestätigen Sie das Entfernen von <strong>{0} Objekten</strong>."
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Bitte bestätigen Sie, dass <strong>{0} Objekte</strong> aus "
-"<strong>{1} Relationen</strong> entfernt werden sollen.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] "{0} Relation ist betroffen."
+msgstr[1] "{0} Relationen sind betroffen."
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7689,14 +7702,17 @@ msgstr "Merkmale/Mitgliedschaften"
msgid "Tags for selected objects."
msgstr "Merkmale für ausgewählte Objekte."
+msgid "<different>"
+msgstr "<unterschiedlich>"
+
msgid "Member Of"
msgstr "Element von"
msgid "Position"
msgstr "Position"
-msgid "<different>"
-msgstr "<unterschiedlich>"
+msgid "Tag filter"
+msgstr "Schlagwortfilter"
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Objekte: {2} / Schlagwörter: {0} / Mitgliedschaften: {1}"
@@ -8459,7 +8475,7 @@ msgid ""
"i.e.,parent relations and for nodes, additionally, parent ways"
msgstr ""
"Wählen Sie aus, ob Verweise auf das Objekt ebenfalls heruntergeladen werden "
-"soll, z.B. Eltern-Relationen und für Punkte zusätzlich die Linien"
+"sollen, d.h. Eltern-Relationen und für Punkte zusätzlich die Linien"
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
@@ -10787,7 +10803,7 @@ msgid ""
msgstr ""
"<html>Der automatische Erwerb einer OAuth-Zugriffskennung vom OSM-Server ist "
"fehlgeschlagen.<br><br>Bitte versuchen Sie es erneut oder nutzen Sie einen "
-"andere Autorisierungsmethode,<br>z.B. die halbautomatische oder manuelle "
+"andere Autorisierungsmethode,<br>d.h. die halbautomatische oder manuelle "
"Autorisierung.</html>"
msgid "OAuth authorization failed"
@@ -12063,17 +12079,18 @@ msgid "Tile cache directory: "
msgstr "Kachel-Zwischenspeicherverzeichnis: "
msgid "Maximum size of disk cache (per imagery) in MB: "
-msgstr "Maximale Größe des Festplattenzwischenspeichers (pro Bild) in MB: "
+msgstr ""
+"Maximale Größe des Festplattenzwischenspeichers (pro Hintergrundbild) in MB: "
msgid "Tiles zoom offset:"
msgstr "Kachelzoomversatz:"
msgid "Imagery Preferences"
-msgstr "Bildeinstellungen"
+msgstr "Hintergrundbild-Einstellungen"
msgid "Modify list of imagery layers displayed in the Imagery menu"
msgstr ""
-"Liste der Hintergrundbildebenen bearbeiten, die im Hintergundbildmenü "
+"Liste der Hintergrundbildebenen bearbeiten, die im Hintergrundbildmenü "
"angezeigt werden"
msgid "Common Settings"
@@ -12086,7 +12103,7 @@ msgid "TMS Settings"
msgstr "TMS-Einstellungen"
msgid "Imagery providers"
-msgstr "Bildanbieter"
+msgstr "Hintergrundbildanbieter"
msgid "Offset bookmarks"
msgstr "Versatz-Lesezeichen"
@@ -13227,13 +13244,13 @@ msgstr "Neue Relation"
msgid ""
"The preset <i>{0}</i> cannot be applied since nothing has been selected!"
msgstr ""
-"Die Voreinstellung <i>{0}</i> kann nicht angewendet werden, da nichts "
-"ausgewählt wurde!"
+"Die Vorlage <i>{0}</i> kann nicht angewendet werden, da nichts ausgewählt "
+"wurde!"
msgid ""
"The preset <i>{0}</i> cannot be applied since the selection is unsuitable!"
msgstr ""
-"Die Voreinstellung <i>{0}</i> kann nicht angewendet werden, da die Auswahl "
+"Die Vorlage <i>{0}</i> kann nicht angewendet werden, da die Auswahl "
"ungeeignet ist!"
msgid "Change {0} object"
@@ -13332,6 +13349,9 @@ msgstr ""
"Defekte Objektvorlage \"{0}-{1}\" - Anzahl der Datenworte in "
"''display_values'' und in ''values'' müssen gleich sein"
+msgid "Detailed information: {0} <> {1}"
+msgstr "Detaillierte Information: {0} <> {1}"
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13436,7 +13456,7 @@ msgid "false: the property is explicitly switched off"
msgstr "falsch: Diese Eigenschaft wurde explizit ausgeschaltet"
msgid "true: the property is explicitly switched on"
-msgstr "wahr: diese Eigenschaft wurde explizit angeschaltet"
+msgstr "wahr: diese Eigenschaft wurde explizit eingeschaltet"
msgid ""
"partial: different selected objects have different values, do not change"
@@ -13524,6 +13544,9 @@ msgstr "Punkte {0} bis {1} werden heruntergeladen…"
msgid "Contacting OSM Server..."
msgstr "Zum OSM-Server wird verbunden …"
+msgid "Downloading notes"
+msgstr "OSM-Notizen herunterladen"
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
"Das Öffnen eines Eingabestroms für die Resource ''{0}'' ist fehlgeschlagen."
@@ -15755,6 +15778,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "Buschland"
+msgctxt "natural"
+msgid "wood"
+msgstr "Wald"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "Zugeordnete Straße"
@@ -16366,6 +16393,9 @@ msgstr "Dronenbilder (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Dronenbilder 2014 (Haiti)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16393,8 +16423,11 @@ msgstr "OSMIE Gemeinden"
msgid "OSMIE Baronies"
msgstr "OSMIE Baronien"
-msgid "OSMIE Political"
-msgstr "OSMIE Politisch"
+msgid "OSMIE Local Election Areas"
+msgstr "OSMIE Kommunalwahlgebiete"
+
+msgid "OSMIE Dail Election Areas"
+msgstr "OSMIE Dail (Unterhaus) Wahlgebiete"
msgid "Lodi - Italy"
msgstr "Lodi - Italien"
@@ -16769,19 +16802,19 @@ msgid "Surrey Air Survey"
msgstr "Surrey Air Survey"
msgid "NLS - OS 6-inch Scotland 1842-82"
-msgstr "NLS - OS 6-inch Scotland 1842-82"
+msgstr "NLS - OS 6 Zoll Schottland 1842-82"
msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
+msgstr "NLS - OS 6 Zoll Grafschaftenserie 1888-1913"
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1. Serie 1937-61"
msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr "NLS - OS 1-inch 7th Series 1955-61"
+msgstr "NLS - OS 1 Zoll 7. Serie 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
-msgstr ""
+msgstr "NLS - OS 25 Zoll (Schottland) 1892-1905"
msgid "OS 1:25k historic (OSM-Best)"
msgstr "OS 1:25k historic (OSM-Best)"
@@ -16969,6 +17002,9 @@ msgstr "OS Stadtpläne, Nairn 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "OS Stadtpläne, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr "OS Stadtpläne, Paisley 1858 (NLS)"
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "OS Stadtpläne, Peebles 1856 (NLS)"
@@ -17045,16 +17081,16 @@ msgid ""
"Provides Apache Commons library components. Not meant to be installed "
"directly by users, but rather as a dependency for other plugins."
msgstr ""
-"Stellt Apache-Commons-Bibliothekskomponenten bereit. Nicht dazu gedacht, "
-"direkt von Nutzern installiert zu werden, sondern als eine Abhängigkeit für "
-"andere Erweiterungen."
+"Stellt Apache-Commons-Bibliothekskomponenten bereit. Nicht bestimmt zur "
+"direkten Installation durch Benutzer, sondern als Abhängigkeit für andere "
+"Erweiterungen."
msgid ""
"Provides Apache HTTP library. Not meant to be installed directly by users, "
"but rather as a dependency for other plugins."
msgstr ""
-"Stellt eine Apache-HTTP-Bibliothek bereit. Nicht dazu gedacht, direkt von "
-"Nutzern installiert zu werden, sondern als eine Abhängigkeit für andere "
+"Stellt eine Apache-HTTP-Bibliothek bereit. Nicht bestimmt zur direkten "
+"Installation durch Benutzer, sondern als Abhängigkeit für andere "
"Erweiterungen."
msgid ""
@@ -17110,7 +17146,7 @@ msgid "(Warning: Experimental!) Tool for conflating (merging) data."
msgstr "(Warnung: Experimentell!) Werkzeug zum Zusammenführen von Daten."
msgid "Downloads new data when you pan/zoom"
-msgstr ""
+msgstr "Lädt neue Daten herunter, während Sie verschieben/zoomen"
msgid "Create a grid of ways."
msgstr "Erzeugt ein Liniengitter."
@@ -17148,6 +17184,14 @@ msgstr ""
"Erlaubt es Nutzer Zeitstempel zu anonymisieren und Teile großer GPX-Spuren "
"schnell zu löschen."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Stellt die EJML-Bibliothek für andere JOSM-Erweiterungen bereit. Nicht "
+"bestimmt zur direkten Installation durch Benutzer, sondern als Abhängigkeit "
+"für andere Erweiterungen."
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr "Höhenprofil und statistische Daten einer GPX-Spur anzeigen."
@@ -17173,9 +17217,9 @@ msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
-"Stellt Teile der GeoTools-Bibliothek für andere JOSM-Erweiterungen zur "
-"Verfügung. Nicht bestimmt zur direkten Installation durch Benutzer, sondern "
-"als Abhängigkeit für andere Erweiterungen."
+"Stellt Teile der GeoTools-Bibliothek für andere JOSM-Erweiterungen bereit. "
+"Nicht bestimmt zur direkten Installation durch Benutzer, sondern als "
+"Abhängigkeit für andere Erweiterungen."
msgid ""
"Download GPS points from Globalsat dg100 data logger directly in JOSM."
@@ -17194,6 +17238,14 @@ msgstr "Ermöglicht das Ausfiltern nicht benötigter GPS-Spuren"
msgid "Visualizes routing information as a routing graph."
msgstr "Visualisiert Routeninformationen als Routengraph."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Stellt die GSON-Bibliothek für andere JOSM-Erweiterungen bereit. Nicht "
+"bestimmt zur direkten Installation durch Benutzer, sondern als Abhängigkeit "
+"für andere Erweiterungen."
+
msgid "Simple tool to tag house numbers."
msgstr "Einfaches Werkzeug zum Erfassen von Hausnummern."
@@ -17249,8 +17301,9 @@ msgid ""
"to be installed directly by users, but rather as a dependency for other "
"plugins."
msgstr ""
-"Stellt die Java Topology Suite (JTS) für andere Plugins bereit (ist nicht "
-"für eine direkte Installation durch den Benutzer vorgesehen)."
+"Stellt die Java Topology Suite (JTS) und zugehörige Werkzeuge bereit. Nicht "
+"bestimmt zur direkten Installation durch Benutzer, sondern als Abhängigkeit "
+"für andere Erweiterungen."
msgid ""
"creates a channel digraph and checks a subset of channels if it is a "
@@ -17273,8 +17326,9 @@ msgid ""
"Provides the Log4j library for other JOSM plugins. Not meant to be installed "
"directly by users, but rather as a dependency for other plugins."
msgstr ""
-"Stellt die Log4j-Bibliothek für andere Plugins bereit (ist nicht für eine "
-"direkte Installation durch den Benutzer vorgesehen)."
+"Stellt die Log4j-Bibliothek für andere JOSM-Plugins bereit. Nicht bestimmt "
+"zur direkten Installation durch Benutzer, sondern als Abhängigkeit für "
+"andere Erweiterungen."
msgid ""
"The MapDust Plug-In shows the MapDust bug reports on the map. You can "
@@ -17708,7 +17762,7 @@ msgid "clay"
msgstr "Lehm, Asche"
msgid "dirt"
-msgstr "Dreck"
+msgstr "Unbefestigte Straße"
msgid "fine_gravel"
msgstr "feiner Schotter"
@@ -17719,9 +17773,21 @@ msgstr "Schlick & Moor"
msgid "Lanes"
msgstr "Spuren"
+msgid "Lanes in way direction"
+msgstr "Spuren in Linienrichtung"
+
+msgid "Lanes opposed to way direction"
+msgstr "Spuren entgegen der Linienrichtung"
+
msgid "Max. speed (km/h)"
msgstr "Höchstgeschwindigkeit (km/h)"
+msgid "Max. speed in way direction"
+msgstr "Höchstgeschwindigkeit in Linienrichtung"
+
+msgid "Max. speed opposed to way direction"
+msgstr "Höchstgeschwindigkeit entgegen der Linienrichtung"
+
msgid "Bridge"
msgstr "Brücke"
@@ -17789,6 +17855,9 @@ msgstr "Nebengleis"
msgid "spur"
msgstr "Firmenanschlussgleis"
+msgid "crossover"
+msgstr "Überleitgleis"
+
msgid "Electrified"
msgstr "Elektrifiziert"
@@ -17883,6 +17952,9 @@ msgstr "separat"
msgid "isolated"
msgstr "isoliert"
+msgid "outside"
+msgstr "außerhalb"
+
msgid "Height (meters)"
msgstr "Höhe (in Meter)"
@@ -18428,6 +18500,9 @@ msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
"Tritt die Wasserfläche zeitweise auf (verschwindet je nach Jahreszeit)?"
+msgid "In the tidal range"
+msgstr "Im Gezeitenhub"
+
msgid "culvert"
msgstr "Durchlass"
@@ -18449,12 +18524,88 @@ msgstr "Motorboote"
msgid "Canoe"
msgstr "Boote ohne Motor oder Segel"
+msgid "Substance"
+msgstr "Medium"
+
+msgid "water"
+msgstr "Wasser"
+
+msgid "gas"
+msgstr "Gas"
+
+msgid "heat"
+msgstr "Wärme"
+
+msgid "oil"
+msgstr "Öl"
+
+msgid "sewage"
+msgstr "Abwasser"
+
+msgid "Support"
+msgstr "Anbringung"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "Mast"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "wandhängend"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "Plakatwand"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "bodenmontiert"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Straßen"
msgid "Motorway"
msgstr "Autobahn"
+msgid "Placement"
+msgstr "Platzierung"
+
+msgid "left_of:1"
+msgstr "links von 1. Spur"
+
+msgid "left_of:2"
+msgstr "links von 2. Spur"
+
+msgid "left_of:3"
+msgstr "links von 3. Spur"
+
+msgid "middle_of:1"
+msgstr "mittig von 1. Spur"
+
+msgid "middle_of:2"
+msgstr "mittig von 2. Spur"
+
+msgid "middle_of:3"
+msgstr "mittig von 3. Spur"
+
+msgid "right_of:1"
+msgstr "rechts von 1. Spur"
+
+msgid "right_of:2"
+msgstr "rechts von 2. Spur"
+
+msgid "right_of:3"
+msgstr "rechts von 3. Spur"
+
+msgid "transition"
+msgstr "Übergang"
+
msgid "Motorway Link"
msgstr "Autobahnanschluss"
@@ -18556,6 +18707,9 @@ msgstr "Parkplatzweg"
msgid "drive-through"
msgstr "Durchfahrtsbedienung"
+msgid "emergency_access"
+msgstr "Notzugang"
+
msgid "Parking Aisle"
msgstr "Parkplatzweg"
@@ -19113,12 +19267,15 @@ msgstr "Wendestelle"
msgid "Turning Loop"
msgstr "Wendeschleife"
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr "Ortseingangsschild"
msgid "Second Name"
msgstr "Zweiter Name"
+msgid "Speed Limit Sign"
+msgstr "Höchstgeschwindigkeitszeichen"
+
msgid "Speed Camera"
msgstr "Geschwindigkeitsüberwachung"
@@ -19238,6 +19395,12 @@ msgstr "Leitplanke"
msgid "Wall"
msgstr "Mauer"
+msgid "dry_stone"
+msgstr "Trockenmauer"
+
+msgid "noise_barrier"
+msgstr "Lärmschutzwand"
+
msgid "City Wall"
msgstr "Stadtmauer"
@@ -19649,6 +19812,15 @@ msgstr "CNG (komprimiertes Erdgas)"
msgid "Pier"
msgstr "Anlegestelle (Pier)"
+msgid "Mooring"
+msgstr "Liegeplatz"
+
+msgid "commercial"
+msgstr "Gewerblich"
+
+msgid "Floating"
+msgstr "Schwimmend"
+
msgid "Lock Gate"
msgstr "Schleusentor"
@@ -19716,7 +19888,7 @@ msgid "Disused Rail"
msgstr "Strecke eingestellt"
msgid "Abandoned Rail"
-msgstr "Strecke aufgelassen"
+msgstr "Strecke aufgegeben"
msgid "Level Crossing"
msgstr "Bahnübergang"
@@ -20290,12 +20462,6 @@ msgstr "Flughafen"
msgid "Airport Ground"
msgstr "Flugplatz"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Start-/Landebahn"
@@ -20479,6 +20645,9 @@ msgstr "Hausbrauerei"
msgid "Outdoor seating"
msgstr "Sitzgelegenheiten im Freien"
+msgid "Takeaway"
+msgstr "Zum Mitnehmen"
+
msgid "Fast Food"
msgstr "Imbiss (Fast Food)"
@@ -21142,25 +21311,6 @@ msgstr "Sonnenuhr"
msgid "unorthodox"
msgstr "unkonventionell"
-msgid "Support"
-msgstr "Hilfe"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "Mast"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "wandhängend"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "Plakatwand"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "bodenmontiert"
-
msgid "Visibility/readability"
msgstr "Ablesbarkeit"
@@ -21740,6 +21890,14 @@ msgid "barn"
msgstr "Scheune"
msgctxt "building"
+msgid "stable"
+msgstr "Stall"
+
+msgctxt "building"
+msgid "cabin"
+msgstr "Hütte"
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "unbewohntes Gebäude auf einem Bauernhof"
@@ -21938,32 +22096,6 @@ msgstr "Wein"
msgid "Bunker Silo"
msgstr "Fahrsilo"
-msgid "Pipeline"
-msgstr "Pipeline"
-
-msgid "water"
-msgstr "Wasser"
-
-msgid "gas"
-msgstr "Gas"
-
-msgid "heat"
-msgstr "Wärme"
-
-msgid "oil"
-msgstr "Öl"
-
-msgid "sewage"
-msgstr "Abwasser"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "unterseeisch"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "überirdisch"
-
msgid "Crane"
msgstr "Stationärer Kran"
@@ -22048,6 +22180,23 @@ msgstr "Stollenzugang"
msgid "Length in meters"
msgstr "Länge in Metern"
+msgid "Pipeline"
+msgstr "Pipeline"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "unterseeisch"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "überirdisch"
+
+msgid "Pipeline Marker"
+msgstr "Pipelinehinweisschild"
+
+msgid "Pipeline Valve"
+msgstr "Pipelineventil"
+
msgid "Water Tower"
msgstr "Wasserturm"
@@ -22247,7 +22396,7 @@ msgid "simple-suspension"
msgstr "Seilbrücke"
msgid "humpback"
-msgstr "Bogenbrücke"
+msgstr "Buckelbrücke"
msgid "Movable Bridge"
msgstr "Bewegliche Brücke"
@@ -22288,6 +22437,34 @@ msgstr "Drehpfeiler"
msgid "Bridge outline"
msgstr "Brückenumriss"
+msgctxt "preset group"
+msgid "Military"
+msgstr "Militär"
+
+msgid "Airfield"
+msgstr "Flugplatz"
+
+msgid "Barracks"
+msgstr "Kasernen"
+
+msgid "Bunker"
+msgstr "Bunker"
+
+msgid "pillbox"
+msgstr "Unterstand"
+
+msgid "munitions"
+msgstr "Munition"
+
+msgid "hardened_aircraft_shelter"
+msgstr "Flugzeugschutzbau"
+
+msgid "Historic"
+msgstr "Historisch"
+
+msgid "Range"
+msgstr "Gebiet"
+
msgid "Power Plant"
msgstr "Kraftwerk"
@@ -23455,6 +23632,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr "Büros"
+
+msgctxt "office"
+msgid "Accountant"
+msgstr "Buchhalter"
+
+msgctxt "office"
+msgid "Administrative"
+msgstr "Behörde"
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr "Werbeagentur"
+
+msgctxt "office"
+msgid "Architect"
+msgstr "Architekt"
+
+msgctxt "office"
+msgid "Association"
+msgstr "Verein"
+
+msgctxt "office"
+msgid "Private company"
+msgstr "Privatunternehmen"
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr "Bildungseinrichtung"
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr "Arbeitsvermittlung"
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr "Immobilienmakler"
+
+msgctxt "office"
+msgid "Foundation"
+msgstr "Stiftung"
+
+msgctxt "office"
+msgid "Government"
+msgstr "Regierung"
+
+msgctxt "office"
+msgid "Insurance"
+msgstr "Versicherung"
+
+msgctxt "office"
+msgid "It specialist"
+msgstr "IT-Spezialist"
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr "Anwalt"
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr "Zeitung"
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr "Nichtregierungsorganisation (NGO)"
+
+msgctxt "office"
+msgid "Notary"
+msgstr "Notar"
+
+msgctxt "office"
+msgid "Political party"
+msgstr "Politische Partei"
+
+msgctxt "office"
+msgid "Religion"
+msgstr "Religion"
+
+msgctxt "office"
+msgid "Research"
+msgstr "Forschung"
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr "Steuerberater"
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr "Telekommunikation"
+
msgid "Geography"
msgstr "Geografie"
@@ -23813,6 +24081,29 @@ msgstr "Bauernhof"
msgid "Farmland"
msgstr "Ackerland"
+msgid "Crop"
+msgstr "Zuschneiden"
+
+msgctxt "crop"
+msgid "corn"
+msgstr "Mais"
+
+msgctxt "crop"
+msgid "grass"
+msgstr "Gras"
+
+msgctxt "crop"
+msgid "rice"
+msgstr "Reis"
+
+msgctxt "crop"
+msgid "wheat"
+msgstr "Weizen"
+
+msgctxt "crop"
+msgid "hop"
+msgstr "Hopfen"
+
msgid "Meadow"
msgstr "Wiese"
@@ -24825,6 +25116,9 @@ msgstr "{0} muss eine Zahl sein"
msgid "{0} must be a positive integer number"
msgstr "{0} muss eine positive Ganzzahl sein"
+msgid "unusual value of {0}"
+msgstr "ungewöhnlicher Wert von {0}"
+
msgid "relation without type"
msgstr "Relation ohne Typ"
@@ -24882,6 +25176,12 @@ msgstr "Straßenbezeichnungen anzeigen (bei hohem Zoom)"
msgid "Use alternative turn restriction icon set"
msgstr "Verwende alternative Symbole für Abbiegebeschränkungen"
+msgid "Display fill colour of areas with place=*"
+msgstr "Füllfarbe von Flächen mit place=* anzeigen"
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr "Flächen werden nur um deren Innenkanten herum gefüllt gezeichnet"
+
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV-Dateien"
@@ -27065,80 +27365,103 @@ msgid "Invalid reference or subject"
msgstr "Ungültige Referenz / ungültiges Ziel"
msgid "Download OSM data continuously"
-msgstr ""
+msgstr "OSM-Daten kontinuierlich herunterladen"
msgid "Download map data continuously when paning and zooming."
msgstr ""
+"Kartendaten während dem Verschieben und Zoomen kontinuierlich herunterladen."
msgid "Toggle the continuous download on/off"
-msgstr ""
+msgstr "Kontinuierliches Herunterladen ein-/ausschalten"
msgid "Download Settings"
-msgstr ""
+msgstr "Herunterladeeinstellungen"
msgid "Settings for the continuous download."
-msgstr ""
+msgstr "Einstellungen für das kontinuierliche Herunterladen."
msgid "Activate continuous downloads at startup."
-msgstr ""
+msgstr "Kontinuierliches Herunterladen beim Start aktivieren."
msgid "Supress the default modal progress monitor when downloading."
msgstr ""
+"Standardmäßige modale Fortschrittsanzeige beim Herunterladen unterdrücken."
msgid ""
"If this plugin is active at startup. This default state will not change when "
"you are toggeling the plugin with the menu option."
msgstr ""
+"Ob diese Erweiterung beim Start aktiv ist. Diese Vorgabe wird durch ein-"
+"/ausschalten der Erweiterung mittels Menüoption nicht verändert."
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
msgstr ""
+"Maximale Anzahl von Prozessen zum Herunterladen von Daten. Ein höherer Wert "
+"führt zu mehr gleichzeitigen Serveranfragen."
+
+msgid "Requires restart"
+msgstr "Neustart erforderlich"
msgid "Max threads"
-msgstr ""
+msgstr "Max. Aktivitätsträger"
msgid "Maximum number of boxes to download for each pan/zoom."
msgstr ""
+"Maximale Anzahl an herunterzuladenden Kästen für jedes Verschieben/Zoomen."
msgid "Max download boxes"
-msgstr ""
+msgstr "Max. Herunterladekästen"
msgid ""
"Time in milliseconds after a pan/zoom before it starts downloading. "
"Additional changes in the viewport in the waiting time will reset the timer."
msgstr ""
+"Zeit in Millisekunden nach einem Schwenk/Zoom bevor es mit dem Herunterladen "
+"beginnt. Weitere Änderungen der Ansicht in der Wartezeit starten den "
+"Zeitgeber neu."
msgid "Wait time (milliseconds)"
-msgstr ""
+msgstr "Wartezeit (Millisekunden)"
msgid ""
"How much extra area around the viewport is it going to download. Setting "
"this to 0 will not download any extra data."
msgstr ""
+"Wie viel zusätzliche Fläche um die aktuelle Ansicht herum heruntergeladen "
+"wird. Wenn dies auf 0 gesetzt wird, werden keine zusätzlichen Daten "
+"heruntergeladen."
msgid "Extra download area"
-msgstr ""
+msgstr "Zusätzlicher Herunterladebereich"
msgid ""
"Max area to download in degrees^2. Increasing this number will cause the "
"plugin to download areas when you are zoomed far out."
msgstr ""
+"Maximal heruntergeladene Fläche in Grad². Eine Vergrößerung dieser Zahl "
+"sorgt dafür, dass Flächen heruntergeladen werden, wenn weit herausgezoomt "
+"wird."
msgid "Max download area"
-msgstr ""
+msgstr "Max. Herunterladebereich"
msgid "The strategy for finding what areas to request from the server."
msgstr ""
+"Die Strategie zur Bestimmung welche Gebiete vom Server angefordert werden."
msgid "Download strategy"
-msgstr ""
+msgstr "Herunterladestrategie"
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
+"Unterdrücke den Fortschrittsmonitor, der während des Herunterladens "
+"angezeigt wird. Wenn diese Option aktiv ist gibt es keinen Hinweis, dass "
+"etwas getan wird, und keine Möglichkeit das Herunterladen abzubrechen."
msgid "Address"
msgstr "Adresse"
@@ -27385,7 +27708,7 @@ msgid "Connection Error."
msgstr "Verbindungsfehler."
msgid "configure the connected DG100"
-msgstr "Angeschlossenen DG100 einstellen"
+msgstr "angeschlossenen DG100 konfigurieren"
msgid "delete data after import"
msgstr "Daten nach Import löschen"
@@ -29910,6 +30233,9 @@ msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
"Sollen die aktuellen Kalibrierdaten der Ebene {0} gespeichert werden?"
+msgid "Select an option"
+msgstr "Wählen Sie eine Option aus"
+
msgid "Load Picture Calibration..."
msgstr "Bildeinstellungen laden …"
@@ -29919,6 +30245,9 @@ msgstr "Lädt Kalibrierungsparameter aus einer Datei"
msgid "Loading file failed: {0}"
msgstr "Laden der Datei ist fehlgeschlagen: {0}"
+msgid "Problem occurred"
+msgstr "Problem aufgetreten"
+
msgid "Load World File Calibration..."
msgstr "Weltdatei-Kalibrierung laden …"
@@ -29961,6 +30290,9 @@ msgstr ""
"kalibrierte Ebenen erzeugen!\n"
"Bitte {0} zum Hochladen von falsch kalibrierten KMLs verwenden."
+msgid "Notification"
+msgstr "Benachrichtigung"
+
msgid "PicLayer move"
msgstr "PicLayer-Bewegung"
@@ -30077,7 +30409,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "Möchten Sie dies anwenden?"
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr "Kalibrierungsdatei laden?"
msgid "It will be applied automatically."
@@ -30316,9 +30648,6 @@ msgstr "Bundesland"
msgid "pending"
msgstr "ausstehend"
-msgid "outside"
-msgstr "außerhalb"
-
msgid "[incomplete]"
msgstr "[unvollständig]"
diff --git a/i18n/po/de_DE.po b/i18n/po/de_DE.po
index e58e98d..c14117f 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2011-07-10 12:32+0000\n"
"Last-Translator: ralekuja <Unknown>\n"
"Language-Team: German (Germany) <de_DE at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 05:05+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 05:05+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -170,6 +170,12 @@ msgstr "Plugins"
msgid "About JOSM..."
msgstr "Über JOSM ..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2140,13 +2146,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2160,6 +2162,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2354,6 +2365,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2372,9 +2386,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3169,12 +3180,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "UNBEKANNT"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4766,6 +4777,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4938,7 +4956,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5740,20 +5758,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6985,13 +6998,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11948,6 +11964,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12110,6 +12129,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13949,6 +13971,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14555,6 +14581,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14582,7 +14611,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15158,6 +15190,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15303,6 +15338,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15341,6 +15381,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15774,9 +15819,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15844,6 +15901,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15938,6 +15998,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16478,6 +16541,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16499,12 +16565,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16606,6 +16748,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17145,12 +17290,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17268,6 +17416,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17672,6 +17826,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18310,12 +18473,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18499,6 +18656,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19161,25 +19321,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19759,6 +19900,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19957,32 +20106,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20067,6 +20190,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20307,6 +20447,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21472,6 +21640,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21811,6 +22070,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22794,6 +23076,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22849,6 +23134,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24827,7 +25118,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24870,9 +25164,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27457,6 +27751,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27466,6 +27763,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27505,6 +27805,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27618,7 +27921,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27855,9 +28158,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/el.po b/i18n/po/el.po
index f10fad1..bcde407 100644
--- a/i18n/po/el.po
+++ b/i18n/po/el.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-10-14 13:30+0000\n"
"Last-Translator: aitolos <Unknown>\n"
"Language-Team: Greek <el at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:43+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:42+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: el\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -174,6 +174,12 @@ msgstr "Πρόσθετα"
msgid "About JOSM..."
msgstr "Περί του JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2281,14 +2287,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Επιλογή, μετακίνηση, κλίμακα και περιστροφή αντικειμένων"
-msgid "Move elements"
-msgstr "Μετακίνηση στοιχείων"
-
-msgid "Move them"
-msgstr "Μετακινησέ τα"
-
-msgid "Undo move"
-msgstr "Αναίρεση μετακίνησης"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2301,6 +2303,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr "Μετακίνηση στοιχείων"
+
+msgid "Move them"
+msgstr "Μετακινησέ τα"
+
+msgid "Undo move"
+msgstr "Αναίρεση μετακίνησης"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
"Αφήστε το πλήκτρο του ποντικιού για να επιλέξετε τα αντικείμενα μέσα στο "
@@ -2502,6 +2513,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr "Μη έγκυρη έκφραση αναζήτησης"
+
msgid "Filter"
msgstr "Φίλτρο"
@@ -2523,9 +2537,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Μη έγκυρη έκφραση αναζήτησης"
-
msgid "basic examples"
msgstr "βασικά παραδείγματα"
@@ -3347,12 +3358,12 @@ msgstr "Βρετανικό (Imperial)"
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "ΆΓΝΩΣΤΟ"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4976,6 +4987,13 @@ msgstr "Βοήθεια"
msgid "Menu: {0}"
msgstr "Μενού: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "Επεξεργασία εργαλειοθήκης"
@@ -5150,14 +5168,10 @@ msgstr "μέχρι το πλακίδιο"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Εναλλακτικά μπορείτε να εισάγετε μια <strong>διεύθυνση "
-"πλακιδίου</strong> για ένα μοναδικό πλακίδιο της μορφής <i>επίπεδο "
-"εστίασης/x/y</i>, π.χ. <i>15/256/223</i>. Διευθύνσεις πλακιδίων της μορφής "
-"<i>εστίαση,x,y</i> ή <i>εστίαση;x;y</i> είναι επίσης έγκυρες.</html>"
msgid "Tile address:"
msgstr "Διεύθυνση πλακιδίου:"
@@ -5971,26 +5985,15 @@ msgstr "Επίλυση συγκρούσεων"
msgid "Resolve conflicts for ''{0}''"
msgstr "Επίλυση συγκρούσεων για ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Παρακαλώ επιβεβαιώστε την απομάκρυνση <strong>1 αντικειμένου</strong> "
-"από <strong>1 σχέση</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Παρακαλώ επιβεβαιώστε την απομάκρυνση <strong>1 αντικειμένου</strong> "
-"από <strong>{0} σχέσεις</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Παρακαλώ επιβεβαιώστε την απομάκρυνση <strong>{0} "
-"αντικειμένων</strong> από <strong>{1} σχέσεις</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7245,14 +7248,17 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr "<διαφορετικά>"
+
msgid "Member Of"
msgstr "Μέλος του"
msgid "Position"
msgstr "Θέση"
-msgid "<different>"
-msgstr "<διαφορετικά>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -12313,6 +12319,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12475,6 +12484,9 @@ msgstr "Λήψη σημείων {0} ως {1}..."
msgid "Contacting OSM Server..."
msgstr "Επικοινωνία με τον διακομιστή OSM"
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -14346,6 +14358,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "θαμνότοπος"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14952,6 +14968,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14979,7 +14998,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15555,6 +15577,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15700,6 +15725,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15738,6 +15768,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -16174,9 +16209,21 @@ msgstr "λάσπη"
msgid "Lanes"
msgstr "Λωρίδες κυκλοφορίας"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Μεγ. Ταχύτητα (χαω)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Γέφυρα"
@@ -16244,6 +16291,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Ηλεκτροκίνηση"
@@ -16338,6 +16388,9 @@ msgstr "χωριστά"
msgid "isolated"
msgstr "απομονωμένο"
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr "Ύψος (μέτρα)"
@@ -16878,6 +16931,9 @@ msgstr "Διόδια"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16899,12 +16955,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "νερό"
+
+msgid "gas"
+msgstr "αέριο"
+
+msgid "heat"
+msgstr "θέρμανση"
+
+msgid "oil"
+msgstr "πετρέλαιο"
+
+msgid "sewage"
+msgstr "απόβλητα"
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Οδοί"
msgid "Motorway"
msgstr "Αυτοκινητόδρομος"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -17006,6 +17138,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17545,12 +17680,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
-msgstr "Όρια πόλης"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Δεύτερο Όνομα"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Κάμερα ελέγχου ταχύτητας"
@@ -17668,6 +17806,12 @@ msgstr ""
msgid "Wall"
msgstr "Τοίχος"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -18072,6 +18216,15 @@ msgstr ""
msgid "Pier"
msgstr "Αποβάθρα"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18710,12 +18863,6 @@ msgstr "Αεροδρόμιο"
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr ""
@@ -18899,6 +19046,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast Food"
@@ -19561,25 +19711,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -20159,6 +20290,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -20357,32 +20496,6 @@ msgstr "κρασί"
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "Αγωγός"
-
-msgid "water"
-msgstr "νερό"
-
-msgid "gas"
-msgstr "αέριο"
-
-msgid "heat"
-msgstr "θέρμανση"
-
-msgid "oil"
-msgstr "πετρέλαιο"
-
-msgid "sewage"
-msgstr "απόβλητα"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "υποβρύχια"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "επίγεια"
-
msgid "Crane"
msgstr "Γερανός"
@@ -20467,6 +20580,23 @@ msgstr ""
msgid "Length in meters"
msgstr "Μήκος σε μέτρα"
+msgid "Pipeline"
+msgstr "Αγωγός"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "υποβρύχια"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "επίγεια"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Υδραγωγείο"
@@ -20707,6 +20837,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "Εργοστάσιο ηλεκτρισμού"
@@ -21872,6 +22030,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Γεωγραφία"
@@ -22211,6 +22460,29 @@ msgstr ""
msgid "Farmland"
msgstr "Χωράφι"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Λειβάδι"
@@ -23194,6 +23466,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -23249,6 +23524,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -25232,7 +25513,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -25275,9 +25559,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27884,6 +28168,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27893,6 +28180,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27932,6 +28222,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -28045,7 +28338,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -28284,9 +28577,6 @@ msgstr "Πολιτεία"
msgid "pending"
msgstr "εκκρεμεί"
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/en_AU.po b/i18n/po/en_AU.po
index 76d7c8e..539a03e 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-06-08 12:52+0000\n"
"Last-Translator: Mark Pulley <mrpulley at lizzy.com.au>\n"
"Language-Team: English (Australia) <en_AU at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 05:03+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 05:04+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -172,6 +172,12 @@ msgstr "Plug-ins"
msgid "About JOSM..."
msgstr "About JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Failed to load resource ''{0}'', error is {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2285,14 +2291,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Select, move, scale and rotate objects"
-msgid "Move elements"
-msgstr "Move elements"
-
-msgid "Move them"
-msgstr "Move them"
-
-msgid "Undo move"
-msgstr "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2311,6 +2313,15 @@ msgstr[1] ""
"an error.\n"
"Really move them?"
+msgid "Move elements"
+msgstr "Move elements"
+
+msgid "Move them"
+msgstr "Move them"
+
+msgid "Undo move"
+msgstr "Undo move"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Release the mouse button to select the objects in the rectangle."
@@ -2514,6 +2525,9 @@ msgstr ""
msgid "add toolbar button"
msgstr "add toolbar button"
+msgid "Invalid search expression"
+msgstr "Invalid search expression"
+
msgid "Filter"
msgstr "Filter"
@@ -2535,9 +2549,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Invalid search expression"
-
msgid "basic examples"
msgstr "basic examples"
@@ -3399,12 +3410,12 @@ msgstr "Imperial"
msgid "Nautical Mile"
msgstr "Nautical Mile"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Failed to load resource ''{0}'', error is {1}."
-
msgid "UNKNOWN"
msgstr "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -5071,6 +5082,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "Menu: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "Edit toolbar"
@@ -5247,14 +5265,10 @@ msgstr "up to tile"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
-"too.</html>"
msgid "Tile address:"
msgstr "Tile address:"
@@ -6123,26 +6137,15 @@ msgstr "Resolve conflicts"
msgid "Resolve conflicts for ''{0}''"
msgstr "Resolve conflicts for ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7440,14 +7443,17 @@ msgstr "Tags/Memberships"
msgid "Tags for selected objects."
msgstr "Tags for selected objects."
+msgid "<different>"
+msgstr "<different>"
+
msgid "Member Of"
msgstr "Member Of"
msgid "Position"
msgstr "Position"
-msgid "<different>"
-msgstr "<different>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -12789,6 +12795,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12969,6 +12978,9 @@ msgstr "Downloading points {0} to {1}..."
msgid "Contacting OSM Server..."
msgstr "Contacting OSM Server..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Failed to open input stream for resource ''{0}''"
@@ -14924,6 +14936,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -15530,6 +15546,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -15557,7 +15576,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -16133,6 +16155,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -16285,6 +16310,11 @@ msgstr ""
"Allows the user to anonymise timestamps and delete parts of huge GPX tracks "
"very fast."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -16324,6 +16354,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr "Visualises routing information as a routing graph."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -16782,9 +16817,21 @@ msgstr "mud"
msgid "Lanes"
msgstr "Lanes"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Max. speed (km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Bridge"
@@ -16852,6 +16899,9 @@ msgstr "siding"
msgid "spur"
msgstr "spur"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Electrified"
@@ -16946,6 +16996,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr "Height (metres)"
@@ -17486,6 +17539,9 @@ msgstr "Toll"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -17507,12 +17563,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "water"
+
+msgid "gas"
+msgstr "gas"
+
+msgid "heat"
+msgstr "heat"
+
+msgid "oil"
+msgstr "oil"
+
+msgid "sewage"
+msgstr "sewage"
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Streets"
msgid "Motorway"
msgstr "Motorway"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Motorway Link"
@@ -17614,6 +17746,9 @@ msgstr "parking_aisle"
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Parking Aisle"
@@ -18153,12 +18288,15 @@ msgstr "Turning Circle"
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
-msgstr "City Limit"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Second Name"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Speed Camera"
@@ -18276,6 +18414,12 @@ msgstr ""
msgid "Wall"
msgstr "Wall"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "City Wall"
@@ -18680,6 +18824,15 @@ msgstr "CNG (Compressed Natural Gas)"
msgid "Pier"
msgstr "Pier"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Lock Gate"
@@ -19318,12 +19471,6 @@ msgstr "Airport"
msgid "Airport Ground"
msgstr "Airport Ground"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Runway"
@@ -19507,6 +19654,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast Food"
@@ -20169,25 +20319,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -20767,6 +20898,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -20965,32 +21104,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "Pipeline"
-
-msgid "water"
-msgstr "water"
-
-msgid "gas"
-msgstr "gas"
-
-msgid "heat"
-msgstr "heat"
-
-msgid "oil"
-msgstr "oil"
-
-msgid "sewage"
-msgstr "sewage"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr "Crane"
@@ -21075,6 +21188,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr "Pipeline"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Water Tower"
@@ -21315,6 +21445,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -22480,6 +22638,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Geography"
@@ -22819,6 +23068,29 @@ msgstr "Farmyard"
msgid "Farmland"
msgstr "Farmland"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Meadow"
@@ -23802,6 +24074,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -23857,6 +24132,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -25880,7 +26161,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -25923,9 +26207,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -28532,6 +28816,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "Load Picture Calibration..."
@@ -28541,6 +28828,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr "Loading file failed: {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -28580,6 +28870,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "PicLayer move"
@@ -28693,7 +28986,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -28930,9 +29223,6 @@ msgstr "State"
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/en_CA.po b/i18n/po/en_CA.po
index b343ec6..3e327bc 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2010-09-24 17:25+0000\n"
"Last-Translator: Johann Beda <Unknown>\n"
"Language-Team: English (Canada) <en_CA at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 05:05+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 05:06+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr "Plug-ins"
msgid "About JOSM..."
msgstr "About JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2137,13 +2143,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2157,6 +2159,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2351,6 +2362,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2369,9 +2383,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3166,10 +3177,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4763,6 +4774,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4935,7 +4953,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5737,20 +5755,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6982,13 +6995,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11945,6 +11961,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12107,6 +12126,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13943,6 +13965,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14549,6 +14575,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14576,7 +14605,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15152,6 +15184,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15297,6 +15332,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15335,6 +15375,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15768,9 +15813,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15838,6 +15895,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15932,6 +15992,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16472,6 +16535,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16493,12 +16559,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16600,6 +16742,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17139,12 +17284,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17262,6 +17410,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17666,6 +17820,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18304,12 +18467,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18493,6 +18650,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19155,25 +19315,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19753,6 +19894,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19951,32 +20100,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20061,6 +20184,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20301,6 +20441,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21466,6 +21634,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21805,6 +22064,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22788,6 +23070,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22843,6 +23128,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24817,7 +25108,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24860,9 +25154,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27447,6 +27741,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27456,6 +27753,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27495,6 +27795,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27608,7 +27911,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27845,9 +28148,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/en_GB.po b/i18n/po/en_GB.po
index 697475b..2da30a0 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-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-29 11:01+0000\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-16 16:25+0000\n"
"Last-Translator: Dee-earlsoft <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-10-30 05:03+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 05:03+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: de\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -175,6 +175,12 @@ msgstr "Plug-ins"
msgid "About JOSM..."
msgstr "About JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Failed to load resource ''{0}'', error is {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2288,14 +2294,12 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Select, move, scale and rotate objects"
-msgid "Move elements"
-msgstr "Move elements"
-
-msgid "Move them"
-msgstr "Move them"
-
-msgid "Undo move"
-msgstr "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2314,6 +2318,15 @@ msgstr[1] ""
"an error.\n"
"Really move them?"
+msgid "Move elements"
+msgstr "Move elements"
+
+msgid "Move them"
+msgstr "Move them"
+
+msgid "Undo move"
+msgstr "Undo move"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Release the mouse button to select the objects in the rectangle."
@@ -2517,6 +2530,9 @@ msgstr "MapCSS selector"
msgid "add toolbar button"
msgstr "add toolbar button"
+msgid "Invalid search expression"
+msgstr "Invalid search expression"
+
msgid "Filter"
msgstr "Filter"
@@ -2538,9 +2554,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Invalid search expression"
-
msgid "basic examples"
msgstr "basic examples"
@@ -3402,12 +3415,12 @@ msgstr "Imperial"
msgid "Nautical Mile"
msgstr "Nautical Mile"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Failed to load resource ''{0}'', error is {1}."
-
msgid "UNKNOWN"
msgstr "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -5078,6 +5091,14 @@ msgstr "Help"
msgid "Menu: {0}"
msgstr "Menu: {0}"
+msgid "Main toolbar"
+msgstr "Main toolbar"
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+
msgid "Edit toolbar"
msgstr "Edit toolbar"
@@ -5254,12 +5275,12 @@ msgstr "up to tile"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
@@ -6130,26 +6151,15 @@ msgstr "Resolve conflicts"
msgid "Resolve conflicts for ''{0}''"
msgstr "Resolve conflicts for ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] "Please confirm to remove <strong>{0} object</strong>."
+msgstr[1] "Please confirm to remove <strong>{0} objects</strong>."
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] "{0} relation is affected."
+msgstr[1] "{0} relations are affected."
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7460,14 +7470,17 @@ msgstr "Tags/Memberships"
msgid "Tags for selected objects."
msgstr "Tags for selected objects."
+msgid "<different>"
+msgstr "<different>"
+
msgid "Member Of"
msgstr "Member Of"
msgid "Position"
msgstr "Position"
-msgid "<different>"
-msgstr "<different>"
+msgid "Tag filter"
+msgstr "Tag filter"
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -12890,6 +12903,9 @@ msgstr ""
"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
"must be the same as in ''values''"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13072,6 +13088,9 @@ msgstr "Downloading points {0} to {1}..."
msgid "Contacting OSM Server..."
msgstr "Contacting OSM Server..."
+msgid "Downloading notes"
+msgstr "Downloading notes"
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Failed to open input stream for resource ''{0}''"
@@ -15203,6 +15222,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "scrub"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "associatedStreet"
@@ -15814,6 +15837,9 @@ msgstr "Drone Imagery (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Imagery 2014 (Haiti)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -15841,8 +15867,11 @@ msgstr "OSMIE Civil Parishes"
msgid "OSMIE Baronies"
msgstr "OSMIE Baronies"
-msgid "OSMIE Political"
-msgstr "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr "OSMIE Local Election Areas"
+
+msgid "OSMIE Dail Election Areas"
+msgstr "OSMIE Dail Election Areas"
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
@@ -16220,7 +16249,7 @@ msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-82"
msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
+msgstr "NLS - OS 6-inch County Series 1888-1913"
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -16229,7 +16258,7 @@ msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
-msgstr ""
+msgstr "NLS - OS 25-inch (Scotland) 1892-1905"
msgid "OS 1:25k historic (OSM-Best)"
msgstr "OS 1:25k historic (OSM-Best)"
@@ -16417,6 +16446,9 @@ msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr "OS Town Plans, Paisley 1858 (NLS)"
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "OS Town Plans, Peebles 1856 (NLS)"
@@ -16553,7 +16585,7 @@ msgid "(Warning: Experimental!) Tool for conflating (merging) data."
msgstr "(Warning: Experimental!) Tool for conflating (merging) data."
msgid "Downloads new data when you pan/zoom"
-msgstr ""
+msgstr "Downloads new data when you pan/zoom"
msgid "Create a grid of ways."
msgstr "Create a grid of ways."
@@ -16590,6 +16622,13 @@ msgstr ""
"Allows the user to anonymise timestamps and delete parts of huge GPX tracks "
"very fast."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
"Shows the elevation profile and some statistical data of a GPX track."
@@ -16634,6 +16673,11 @@ msgstr "Allows to filter out unnecessary GPS tracks"
msgid "Visualizes routing information as a routing graph."
msgstr "Visualises routing information as a routing graph."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "Simple tool to tag house numbers."
@@ -17142,9 +17186,21 @@ msgstr "mud"
msgid "Lanes"
msgstr "Lanes"
+msgid "Lanes in way direction"
+msgstr "Lanes in way direction"
+
+msgid "Lanes opposed to way direction"
+msgstr "Lanes opposed to way direction"
+
msgid "Max. speed (km/h)"
msgstr "Max. speed (km/h)"
+msgid "Max. speed in way direction"
+msgstr "Max. speed in way direction"
+
+msgid "Max. speed opposed to way direction"
+msgstr "Max. speed opposed to way direction"
+
msgid "Bridge"
msgstr "Bridge"
@@ -17182,7 +17238,7 @@ msgid "Width (meters)"
msgstr "Width (metres)"
msgid "Sidewalk"
-msgstr "Sidewalk"
+msgstr "Pavement"
msgctxt "sidewalk"
msgid "both"
@@ -17212,6 +17268,9 @@ msgstr "siding"
msgid "spur"
msgstr "spur"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Electrified"
@@ -17306,6 +17365,9 @@ msgstr "separated"
msgid "isolated"
msgstr "isolated"
+msgid "outside"
+msgstr "outside"
+
msgid "Height (meters)"
msgstr "Height (metres)"
@@ -17850,6 +17912,9 @@ msgstr "Toll"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "Is the water body intermittent (disappears seasonally)?"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr "culvert"
@@ -17871,12 +17936,88 @@ msgstr "Motorboat"
msgid "Canoe"
msgstr "Canoe"
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "water"
+
+msgid "gas"
+msgstr "gas"
+
+msgid "heat"
+msgstr "heat"
+
+msgid "oil"
+msgstr "oil"
+
+msgid "sewage"
+msgstr "sewage"
+
+msgid "Support"
+msgstr "Support"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "pole"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "wall_mounted"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "billboard"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "ground"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Streets"
msgid "Motorway"
msgstr "Motorway"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Motorway Link"
@@ -17911,7 +18052,7 @@ msgid "Unclassified"
msgstr "Unclassified"
msgid "Street has no name"
-msgstr ""
+msgstr "Street has no name"
msgid "Passing Places"
msgstr "Passing Places"
@@ -17978,6 +18119,9 @@ msgstr "parking_aisle"
msgid "drive-through"
msgstr "drive-through"
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Parking Aisle"
@@ -18532,12 +18676,15 @@ msgstr "Turning Circle"
msgid "Turning Loop"
msgstr "Turning loop"
-msgid "City Limit"
-msgstr "City Limit"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Second Name"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Speed Camera"
@@ -18545,10 +18692,10 @@ msgid "Traffic Mirror"
msgstr "Traffic Mirror"
msgid "Highway milestone"
-msgstr ""
+msgstr "Highway milestone"
msgid "Distance (kilometers)"
-msgstr ""
+msgstr "Distance (kilometers)"
msgctxt "junction=yes"
msgid "Named Junction"
@@ -18657,6 +18804,12 @@ msgstr "Guard rail"
msgid "Wall"
msgstr "Wall"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "City Wall"
@@ -19067,6 +19220,15 @@ msgstr "CNG (Compressed Natural Gas)"
msgid "Pier"
msgstr "Pier"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Lock Gate"
@@ -19181,7 +19343,7 @@ msgid "Railway Switch"
msgstr "Railway switch"
msgid "Railway milestone"
-msgstr ""
+msgstr "Railway milestone"
msgid "Aerialway"
msgstr "Aerialway"
@@ -19707,12 +19869,6 @@ msgstr "Airport"
msgid "Airport Ground"
msgstr "Airport Ground"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Runway"
@@ -19786,7 +19942,7 @@ msgid "Alpine Hut"
msgstr "Alpine Hut"
msgid "Wilderness Hut"
-msgstr ""
+msgstr "Wilderness Hut"
msgid "Access rights"
msgstr "Access rights"
@@ -19798,7 +19954,7 @@ msgid "seasonal"
msgstr "seasonal"
msgid "Reservation"
-msgstr ""
+msgstr "Reservation"
msgid "required"
msgstr ""
@@ -19896,6 +20052,9 @@ msgstr "Microbrewery"
msgid "Outdoor seating"
msgstr "Outdoor seating"
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast Food"
@@ -20448,15 +20607,15 @@ msgstr "Toilets/Restrooms"
msgctxt "restroom"
msgid "Female"
-msgstr ""
+msgstr "Female"
msgctxt "restroom"
msgid "Male"
-msgstr ""
+msgstr "Male"
msgctxt "restroom"
msgid "Unisex"
-msgstr ""
+msgstr "Unisex"
msgid "flush"
msgstr "flush"
@@ -20559,25 +20718,6 @@ msgstr "sundial"
msgid "unorthodox"
msgstr "unorthodox"
-msgid "Support"
-msgstr "Support"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "pole"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "wall_mounted"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "billboard"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "ground"
-
msgid "Visibility/readability"
msgstr "Visibility/readability"
@@ -20654,7 +20794,7 @@ msgid "Recycling Centre"
msgstr "Recycling Centre"
msgid "Waste Basket/Trash Can"
-msgstr "Waste basket/Trash can"
+msgstr "Waste Basket/Trash Can"
msgid "Waste Disposal/Dumpster"
msgstr "Waste disposal/Dumpster"
@@ -20785,10 +20925,10 @@ msgid "Count"
msgstr "Count"
msgid "Compressed Air"
-msgstr ""
+msgstr "Compressed Air"
msgid "Valves"
-msgstr ""
+msgstr "Valves"
msgid "Dunlop (Woods)"
msgstr ""
@@ -21157,6 +21297,14 @@ msgid "barn"
msgstr "barn"
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "farm_auxiliary"
@@ -21355,32 +21503,6 @@ msgstr "wine"
msgid "Bunker Silo"
msgstr "Bunker Silo"
-msgid "Pipeline"
-msgstr "Pipeline"
-
-msgid "water"
-msgstr "water"
-
-msgid "gas"
-msgstr "gas"
-
-msgid "heat"
-msgstr "heat"
-
-msgid "oil"
-msgstr "oil"
-
-msgid "sewage"
-msgstr "sewage"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "underwater"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "overground"
-
msgid "Crane"
msgstr "Crane"
@@ -21465,6 +21587,23 @@ msgstr "Adit"
msgid "Length in meters"
msgstr "Length in metres"
+msgid "Pipeline"
+msgstr "Pipeline"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "underwater"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "overground"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Water Tower"
@@ -21705,10 +21844,38 @@ msgstr ""
msgid "Bridge outline"
msgstr "Bridge outline"
-msgid "Power Plant"
-msgstr "Power Plant"
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
-msgid "Output forms of energy (optional):"
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
+msgid "Power Plant"
+msgstr "Power Plant"
+
+msgid "Output forms of energy (optional):"
msgstr "Output forms of energy (optional):"
msgid "Power Generator"
@@ -22627,7 +22794,7 @@ msgid "Ticket"
msgstr "Ticket"
msgid "For the body"
-msgstr ""
+msgstr "For the body"
msgid "Chemist"
msgstr "Chemist"
@@ -22705,7 +22872,7 @@ msgid "Pet"
msgstr "Pet"
msgid "Photo"
-msgstr ""
+msgstr "Photo"
msgid "Funeral Directors"
msgstr "Funeral Directors"
@@ -22872,6 +23039,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr "Offices"
+
+msgctxt "office"
+msgid "Accountant"
+msgstr "Accountant"
+
+msgctxt "office"
+msgid "Administrative"
+msgstr "Administrative"
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr "Advertising agency"
+
+msgctxt "office"
+msgid "Architect"
+msgstr "Architect"
+
+msgctxt "office"
+msgid "Association"
+msgstr "Association"
+
+msgctxt "office"
+msgid "Private company"
+msgstr "Private company"
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr "Educational institution"
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr "Employment agency"
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr "Estate agent"
+
+msgctxt "office"
+msgid "Foundation"
+msgstr "Foundation"
+
+msgctxt "office"
+msgid "Government"
+msgstr "Government"
+
+msgctxt "office"
+msgid "Insurance"
+msgstr "Insurance"
+
+msgctxt "office"
+msgid "It specialist"
+msgstr "IT specialist"
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr "Lawyer"
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr "Newspaper"
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr "Non-governmental organisation (NGO)"
+
+msgctxt "office"
+msgid "Notary"
+msgstr "Notary"
+
+msgctxt "office"
+msgid "Political party"
+msgstr "Political party"
+
+msgctxt "office"
+msgid "Religion"
+msgstr "Religion"
+
+msgctxt "office"
+msgid "Research"
+msgstr "Research"
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr "Tax advisor"
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr "Telecommunication"
+
msgid "Geography"
msgstr "Geography"
@@ -23227,6 +23485,29 @@ msgstr "Farmyard"
msgid "Farmland"
msgstr "Farmland"
+msgid "Crop"
+msgstr "Crop"
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Meadow"
@@ -23777,7 +24058,7 @@ msgid "lwn"
msgstr ""
msgid "infrastructure"
-msgstr ""
+msgstr "infrastructure"
msgid "natural"
msgstr "natural"
@@ -23786,16 +24067,16 @@ msgid "Piste Route"
msgstr "Piste Route"
msgid "link segment"
-msgstr ""
+msgstr "link segment"
msgid "shortcut segment"
-msgstr ""
+msgstr "shortcut segment"
msgid "variant segment"
-msgstr ""
+msgstr "variant segment"
msgid "entry points"
-msgstr ""
+msgstr "entry points"
msgid "Ski Route"
msgstr "Ski Route"
@@ -23828,7 +24109,7 @@ msgid "Route Network"
msgstr "Route Network"
msgid "member"
-msgstr ""
+msgstr "member"
msgid "Associated Street"
msgstr "Associated Street"
@@ -23840,19 +24121,19 @@ msgid "Street"
msgstr "Street"
msgid "ways being part of street"
-msgstr ""
+msgstr "ways being part of street"
msgid "addresses belonging to the street"
-msgstr ""
+msgstr "addresses belonging to the street"
msgid "houses belonging to the street"
-msgstr ""
+msgstr "houses belonging to the street"
msgid "anything related to the street"
-msgstr ""
+msgstr "anything related to the street"
msgid "Destination Sign"
-msgstr ""
+msgstr "Destination Sign"
msgid "Destination written on sign (w/o distance)"
msgstr "Destination written on sign (w/o distance)"
@@ -23867,7 +24148,7 @@ msgid "Colour of text"
msgstr "Colour of text"
msgid "Colour of border/arrow"
-msgstr ""
+msgstr "Colour of border/arrow"
msgid "last way before junction"
msgstr "last way before junction"
@@ -23879,7 +24160,7 @@ msgid "first way after junction"
msgstr "first way after junction"
msgid "position of sign"
-msgstr ""
+msgstr "position of sign"
msgid "Waterway"
msgstr "Waterway"
@@ -23897,7 +24178,7 @@ msgid "ditch"
msgstr ""
msgid "Name of river/lake/sea/ocean it runs into"
-msgstr ""
+msgstr "Name of river/lake/sea/ocean it runs into"
msgid "Reference Sandre (FR)"
msgstr ""
@@ -23915,34 +24196,34 @@ msgid "Reference GNBC (CA)"
msgstr ""
msgid "waterways (no riverbank)"
-msgstr ""
+msgstr "waterways (no riverbank)"
msgid "branch waterways (no riverbank)"
-msgstr ""
+msgstr "branch waterways (no riverbank)"
msgid "spring of waterway"
-msgstr ""
+msgstr "spring of waterway"
msgid "Length (meters)"
msgstr "Length (metres)"
msgid "ways supported by (on top of) the bridge"
-msgstr ""
+msgstr "ways supported by (on top of) the bridge"
msgid "ways passing under the bridge"
-msgstr ""
+msgstr "ways passing under the bridge"
msgid "way forming the outline footprint"
-msgstr ""
+msgstr "way forming the outline footprint"
msgid "edge ways parallel to ''across''"
-msgstr ""
+msgstr "edge ways parallel to ''across''"
msgid "ways passing through the tunnel"
-msgstr ""
+msgstr "ways passing through the tunnel"
msgid "edge ways parallel to ''through''"
-msgstr ""
+msgstr "edge ways parallel to ''through''"
msgid "Tunnel Start"
msgstr "Tunnel Start"
@@ -23981,10 +24262,10 @@ msgid "{0} without {1}, {2} or {3}"
msgstr "{0} without {1}, {2} or {3}"
msgid "{0} together with {1}"
-msgstr ""
+msgstr "{0} together with {1}"
msgid "incomplete object: only {0}"
-msgstr ""
+msgstr "incomplete object: only {0}"
msgid "incomplete object: only {0} and {1}"
msgstr "incomplete object: only {0} and {1}"
@@ -23993,7 +24274,7 @@ msgid "{0} together with addr:*"
msgstr "{0} together with addr:*"
msgid "{0} together with {1} and conflicting values"
-msgstr ""
+msgstr "{0} together with {1} and conflicting values"
msgid "{0} on suspicious object"
msgstr "{0} on suspicious object"
@@ -24020,16 +24301,16 @@ msgid "incomplete usage of {0} on a way without {1}"
msgstr "incomplete usage of {0} on a way without {1}"
msgid "Same value of {0} and {1}"
-msgstr ""
+msgstr "Same value of {0} and {1}"
msgid "Same value of {0}, {1} and {2}"
-msgstr ""
+msgstr "Same value of {0}, {1} and {2}"
msgid "{0} and {1} together with {2} and conflicting values"
-msgstr ""
+msgstr "{0} and {1} together with {2} and conflicting values"
msgid "Suspicious tag combination: {0} and {1}"
-msgstr ""
+msgstr "Suspicious tag combination: {0} and {1}"
msgid "{0}={1} is deprecated"
msgstr "{0}={1} is deprecated"
@@ -24080,12 +24361,14 @@ msgid ""
"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
"''both''."
msgstr ""
+"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
+"''both''."
msgid "Unspecific tag {0}"
-msgstr ""
+msgstr "Unspecific tag {0}"
msgid "Definition of {0} is unclear"
-msgstr ""
+msgstr "Definition of {0} is unclear"
msgid ""
"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
@@ -24168,6 +24451,8 @@ msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
msgstr ""
+"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For pavements use "
+"''{3}'' instead."
msgid "{0} with multiple values"
msgstr "{0} with multiple values"
@@ -24195,6 +24480,7 @@ msgstr ""
msgid ""
"{0}: tonne is default; period is separator; if units, put space then unit"
msgstr ""
+"{0}: tonne is default; period is separator; if units, put space then unit"
msgid "unusual {0} format"
msgstr "unusual {0} format"
@@ -24203,6 +24489,8 @@ msgid ""
"{0}: kilometers is default; period is separator; if units, put space then "
"unit"
msgstr ""
+"{0}: kilometres is default; period is separator; if units, put space then "
+"unit"
msgid "voltage should be in volts with no units/delimiter/spaces"
msgstr "voltage should be in volts with no units/delimiter/spaces"
@@ -24222,6 +24510,9 @@ msgstr "{0} must be a numeric value"
msgid "{0} must be a positive integer number"
msgstr "{0} must be a positive integer number"
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr "relation without type"
@@ -24276,7 +24567,13 @@ msgid "Display street labels (at high zoom)"
msgstr "Display street labels (at high zoom)"
msgid "Use alternative turn restriction icon set"
-msgstr ""
+msgstr "Use alternative turn restriction icon set"
+
+msgid "Display fill colour of areas with place=*"
+msgstr "Display fill colour of areas with place=*"
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr "Areas are drawn with fill only around their inner edges"
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV Files"
@@ -24586,7 +24883,7 @@ msgid "Add fixed points on spacebar"
msgstr "Add fixed points on spacebar"
msgid "Allow edit existing ways"
-msgstr ""
+msgstr "Allow edit existing ways"
msgid "Draw closed polygons only"
msgstr "Draw closed polygons only"
@@ -24887,28 +25184,28 @@ msgid "OSM Recommendation"
msgstr "OSM Recommendation"
msgid "Recommend categories to your newly created instances."
-msgstr ""
+msgstr "Recommend categories to your newly created instances."
msgid "Training process configuration"
-msgstr ""
+msgstr "Training process configuration"
msgid "Model Settings"
-msgstr ""
+msgstr "Model Settings"
msgid "Select objects or create new objects and get recommendation."
-msgstr ""
+msgstr "Select objects or create new objects and get recommendation."
msgid "Add Recommendation"
-msgstr ""
+msgstr "Add Recommendation"
msgid "Add a recommended key/value pair to your object"
msgstr "Add a recommended key/value pair to your object"
msgid "Train a Model"
-msgstr ""
+msgstr "Train a Model"
msgid "Start the training engine!"
-msgstr ""
+msgstr "Start the training engine!"
msgid "Edit opening hours"
msgstr "Edit opening hours"
@@ -25130,61 +25427,70 @@ msgid ""
"An intersection point would fall outside its adjacent nodes.\n"
"This is an unsupported scenario.\n"
msgstr ""
+"An intersection point would fall outside its adjacent nodes.\n"
+"This is an unsupported scenario.\n"
msgid "Undocumented problem occured.\n"
-msgstr ""
+msgstr "Undocumented problem occured.\n"
msgid "AlignWayS: Alignment not possible"
-msgstr ""
+msgstr "AlignWayS: Alignment not possible"
msgid "Align way segment"
-msgstr ""
+msgstr "Align way segment"
msgid ""
"Please select two segments that don''t share any nodes\n"
" or put the pivot on their common node.\n"
msgstr ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
msgid "Align Way Segments: Modes"
-msgstr ""
+msgstr "Align Way Segments: Modes"
msgid "Align Ways control panel"
-msgstr ""
+msgstr "Align Ways control panel"
msgid "This panel activates in Align Ways mode:"
-msgstr ""
+msgstr "This panel activates in Align Ways mode:"
msgid "Length preserved"
-msgstr ""
+msgstr "Length preserved"
msgid "Angle preserved"
-msgstr ""
+msgstr "Angle preserved"
msgid "Align with:"
-msgstr ""
+msgstr "Align with:"
msgid ""
"<html>Aligns the way segment to the reference so that its length is "
"preserved.</html>"
msgstr ""
+"<html>Aligns the way segment to the reference so that its length is "
+"preserved.</html>"
msgid ""
"<html>Aligns the way segment to the reference so that the angles of its "
"adjacent segments are preserved.<br/>The length of the aligned segment is "
"likely to change as result.</html>"
msgstr ""
+"<html>Aligns the way segment to the reference so that the angles of its "
+"adjacent segments are preserved.<br/>The length of the aligned segment is "
+"likely to change as result.</html>"
msgid "I''m ready!"
-msgstr ""
+msgstr "I''m ready!"
msgid "AlignWays Tips"
-msgstr ""
+msgstr "AlignWays Tips"
msgid "AlignWays: What''s New..."
-msgstr ""
+msgstr "AlignWays: What''s New..."
msgid "Align Ways mode"
-msgstr ""
+msgstr "Align Ways mode"
msgid "Parameter ''{0}'' must not be null"
msgstr "Parameter ''{0}'' must not be null"
@@ -25193,33 +25499,41 @@ msgid ""
"Segment to be aligned cannot be the same with the reference segment.\n"
"Please choose a different segment to be aligned."
msgstr ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
msgid "AlignWayS message"
-msgstr ""
+msgstr "AlignWayS message"
msgid ""
"Reference segment cannot be the same with the segment to be aligned.\n"
"Please choose a different reference segment."
msgstr ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
-msgstr ""
+msgstr "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
msgid ": Align segments; Alt-click: Clear selection"
-msgstr ""
+msgstr ": Align segments; Alt-click: Clear selection"
msgid ""
"Ctrl-click: select reference way segment; Click: select way segment to be "
"aligned"
msgstr ""
+"Ctrl-click: select reference way segment; Click: select way segment to be "
+"aligned"
msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
-msgstr ""
+msgstr "Click: select way segment to be aligned; Alt-click: Clear selection"
msgid ""
"Ctrl-Click: select reference way segment; Click: select way segment to be "
"aligned"
msgstr ""
+"Ctrl-Click: select reference way segment; Click: select way segment to be "
+"aligned"
msgid ""
"Welcome to the</span><br>\n"
@@ -25248,6 +25562,16 @@ msgid ""
"</html>\n"
"\n"
msgstr ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
msgid ""
"<html>\n"
@@ -25379,129 +25703,137 @@ msgstr ""
"\n"
msgid "Don''t show this again"
-msgstr ""
+msgstr "Don''t show this again"
msgid "What''s new..."
-msgstr ""
+msgstr "What''s new..."
msgid "Added <b>angle preserving</b> aligning mode"
-msgstr ""
+msgstr "Added <b>angle preserving</b> aligning mode"
msgid "Various improvements and bugfixes"
-msgstr ""
+msgstr "Various improvements and bugfixes"
msgid "Errr..."
msgstr ""
msgid "Browser not supported."
-msgstr ""
+msgstr "Browser not supported."
msgid "Building address"
msgstr "Building address"
msgid "empty"
-msgstr ""
+msgstr "empty"
msgid "skip"
-msgstr ""
+msgstr "skip"
msgid "House number:"
msgstr "House number:"
msgid "Street:"
-msgstr ""
+msgstr "Street:"
msgid "Post code:"
-msgstr ""
+msgstr "Post code:"
msgid "Building:"
-msgstr ""
+msgstr "Building:"
msgid "Tags:"
-msgstr ""
+msgstr "Tags:"
msgid "Name:"
-msgstr ""
+msgstr "Name:"
msgid "updated building info"
-msgstr ""
+msgstr "updated building info"
msgid "Tag Element"
-msgstr ""
+msgstr "Tag Element"
msgid "Select an item to tag."
-msgstr ""
+msgstr "Select an item to tag."
msgid "Tag Building"
-msgstr ""
+msgstr "Tag Building"
msgid "Tools: {0}"
-msgstr ""
+msgstr "Tools: {0}"
msgid "Area Selection"
-msgstr ""
+msgstr "Area Selection"
msgid "Select an area (e.g. building) from an underlying image."
-msgstr ""
+msgstr "Select an area (e.g. building) from an underlying image."
msgid "Area Selector"
-msgstr ""
+msgstr "Area Selector"
msgid "Created area"
-msgstr ""
+msgstr "Created area"
msgid "Unable to detect a polygon where you clicked."
-msgstr ""
+msgstr "Unable to detect a polygon where you clicked."
msgid "Error Report"
-msgstr ""
+msgstr "Error Report"
msgid "Something went wrong!"
-msgstr ""
+msgstr "Something went wrong!"
msgid "Please file a bug report on the github project page under"
-msgstr ""
+msgstr "Please file a bug report on the github project page under"
msgid ""
"Let us know what you did and what happend add the following text to the bug "
"report, so we can find the source of the issue."
msgstr ""
+"Let us know what you did and what happened, add the following text to the "
+"bug report, so we can find the source of the issue."
msgid "Area Selector - Preferences"
-msgstr ""
+msgstr "Area Selector - Preferences"
msgid "Settings for the area detection algorithm."
-msgstr ""
+msgstr "Settings for the area detection algorithm."
msgid "Boofcv - high resolution images"
-msgstr ""
+msgstr "Boofcv - high resolution images"
msgid "Custom - low resolution images"
-msgstr ""
+msgstr "Custom - low resolution images"
msgid ""
"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
"Boofcv and uses the custom algorithm as a fallback."
msgstr ""
+"Choose which algorithm should be used. \"Auto\" tries to find an area with "
+"Boofcv and uses the custom algorithm as a fallback."
msgid "Algorithm"
-msgstr ""
+msgstr "Algorithm"
msgid ""
"Maximum pixels a point can be away from a line and still be considered as a "
"member of this line (Default: {0})."
msgstr ""
+"Maximum pixels a point can be away from a line and still be considered as a "
+"member of this line (Default: {0})."
msgid "Distance Tolerance"
-msgstr ""
+msgstr "Distance Tolerance"
msgid ""
"Lines with a smaller angle (degrees) than this will be combined to one line "
"(Default {0})."
msgstr ""
+"Lines with a smaller angle (degrees) than this will be combined to one line "
+"(Default {0})."
msgid "Angle Tolerance"
-msgstr ""
+msgstr "Angle Tolerance"
msgid ""
"The color threshold defines how much a color may differ from the selected "
@@ -25516,7 +25848,7 @@ msgid "Color Threshold"
msgstr "Colour Threshold"
msgid "Use HSV based algorithm"
-msgstr ""
+msgstr "Use HSV based algorithm"
msgid ""
"Use hue and saturation instead of RGB distinction to select matching colors."
@@ -25524,10 +25856,10 @@ msgstr ""
"Use hue and saturation instead of RGB distinction to select matching colours."
msgid "How often thinning operation should be applied (Default {0})."
-msgstr ""
+msgstr "How often thinning operation should be applied (Default {0})."
msgid "Thinning Iterations"
-msgstr ""
+msgstr "Thinning Iterations"
msgid "show address dialog"
msgstr "show address dialogue"
@@ -25536,31 +25868,31 @@ msgid "Show Address Dialog after mapping an area"
msgstr "Show Address Dialogue after mapping an area"
msgid "merge nodes"
-msgstr ""
+msgstr "merge nodes"
msgid "Merge nodes with existing nodes"
-msgstr ""
+msgstr "Merge nodes with existing nodes"
msgid "Debug"
-msgstr ""
+msgstr "Debug"
msgid "Debugging mode will write images for each processing step."
-msgstr ""
+msgstr "Debugging mode will write images for each processing step."
msgid "Street Name:"
msgstr "Street Name:"
msgid "Big buildings mode"
-msgstr ""
+msgstr "Big buildings mode"
msgid "Rotate crosshair"
-msgstr ""
+msgstr "Rotate crosshair"
msgid "Advanced settings"
-msgstr ""
+msgstr "Advanced settings"
msgid "Buildings tags:"
-msgstr ""
+msgstr "Buildings tags:"
msgid "Cannot place building outside of the world."
msgstr "Cannot place building outside of the world."
@@ -25575,10 +25907,10 @@ msgid "Use Address dialog"
msgstr "Use Address dialogue"
msgid "Auto-select building"
-msgstr ""
+msgstr "Auto-select building"
msgid "Use address nodes under buildings"
-msgstr ""
+msgstr "Use address nodes under buildings"
msgid "Buildings width:"
msgstr "Buildings width:"
@@ -25587,65 +25919,65 @@ msgid "Length step:"
msgstr "Length step:"
msgid "Advanced..."
-msgstr ""
+msgstr "Advanced..."
msgid "Draw buildings"
msgstr "Draw buildings"
msgid "Point on the corner of the building to start drawing"
-msgstr ""
+msgstr "Point on the corner of the building to start drawing"
msgid "Point on opposite end of the building"
-msgstr ""
+msgstr "Point on opposite end of the building"
msgid "Set width of the building"
-msgstr ""
+msgstr "Set width of the building"
msgid "Merge address points"
-msgstr ""
+msgstr "Merge address points"
msgid "Move tags from address nodes inside buildings to building ways"
-msgstr ""
+msgstr "Move tags from address nodes inside buildings to building ways"
msgid "Select both address nodes and building ways to merge"
-msgstr ""
+msgstr "Select both address nodes and building ways to merge"
msgid "No address nodes found in the selection"
-msgstr ""
+msgstr "No address nodes found in the selection"
msgid "No building ways found in the selection"
-msgstr ""
+msgstr "No building ways found in the selection"
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] ""
+msgstr[0] "There is {0} building with multiple address nodes inside"
+msgstr[1] "There are {0} buildings with multiple address nodes inside"
msgid "There is {0} building with address conflicts"
msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "There is {0} building with address conflicts"
+msgstr[1] "There are {0} buildings with address conflicts"
msgid "No address nodes inside buildings found"
-msgstr ""
+msgstr "No address nodes inside buildings found"
msgid "on polygon"
-msgstr ""
+msgstr "on polygon"
msgid "Add address"
-msgstr ""
+msgstr "Add address"
msgid "Helping tool for tag address"
-msgstr ""
+msgstr "Helping tool for tag address"
msgid "CadastreFR - Buildings"
msgstr ""
msgid "Next no"
-msgstr ""
+msgstr "Next no"
msgid "Enter addresses"
-msgstr ""
+msgstr "Enter addresses"
msgid ""
"Location \"{0}\" found in cache.\n"
@@ -25682,7 +26014,7 @@ msgid "Martinique Fort Desaix cache file (.UTM3)"
msgstr "Martinique Fort Desaix cache file (.UTM3)"
msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr ""
+msgstr "Reunion RGR92 cache file (.UTM4)"
msgid "CadastreGrabber: Illegal url."
msgstr "CadastreGrabber: Illegal url."
@@ -25715,6 +26047,9 @@ msgid ""
"configuration.\n"
"Layers ''Building'' and ''Parcel'' added by default."
msgstr ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
msgid ""
"Warning: failed to put option pane dialog always on top. Exception was: {0}"
@@ -25731,7 +26066,7 @@ msgstr ""
"projections and retry"
msgid "Change the current projection"
-msgstr ""
+msgstr "Change the current projection"
msgid "Replace original background by JOSM background color."
msgstr "Replace original background by JOSM background colour."
@@ -25749,28 +26084,28 @@ msgid "Disable image cropping during georeferencing."
msgstr "Disable image cropping during georeferencing."
msgid "Use \"Tableau d''assemblage\""
-msgstr ""
+msgstr "Use \"Tableau d''assemblage\""
msgid "Replace grey shades by white color only"
msgstr "Replace grey shades by white colour only"
msgid "Select first WMS layer in list."
-msgstr ""
+msgstr "Select first WMS layer in list."
msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
-msgstr ""
+msgstr "Don''t use relation for addresses (but \"addr:street\" on elements)."
msgid "off"
-msgstr ""
+msgstr "off"
msgid "25 m"
-msgstr ""
+msgstr "25 m"
msgid "50 m"
-msgstr ""
+msgstr "50 m"
msgid "100 m"
-msgstr ""
+msgstr "100 m"
msgid "symbol"
msgstr "symbol"
@@ -25888,7 +26223,7 @@ msgid "Layers:"
msgstr "Layers:"
msgid "Sea, rivers, swimming pools."
-msgstr ""
+msgstr "Sea, rivers, swimming pools."
msgid "Buildings, covers, underground constructions."
msgstr "Buildings, covers, underground constructions."
@@ -25920,6 +26255,7 @@ msgstr "Raster images grab multiplier:"
msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgid "Replace greyscale by white color (smaller files and memory usage)."
msgstr "Replace greyscale by white colour (smaller files and memory usage)."
@@ -25928,7 +26264,7 @@ msgid "Display crosspieces:"
msgstr "Display crosspieces:"
msgid "Allows an automatic caching"
-msgstr ""
+msgstr "Allows an automatic caching"
msgid "Oldest files are automatically deleted when this size is exceeded"
msgstr "Oldest files are automatically deleted when this size is exceeded"
@@ -25941,10 +26277,10 @@ msgstr ""
"grabbing."
msgid "Enable this to use the tag \"add:street\" on nodes."
-msgstr ""
+msgstr "Enable this to use the tag \"add:street\" on nodes."
msgid "Unexpected file extension. {0}"
-msgstr ""
+msgstr "Unexpected file extension. {0}"
msgid "Add \"source=...\" to elements?"
msgstr "Add \"source=...\" to elements?"
@@ -26004,13 +26340,13 @@ msgid "Only on vectorized layers"
msgstr "Only on vectorised layers"
msgid "Cancel current grab"
-msgstr ""
+msgstr "Cancel current grab"
msgid "Cancel current grab (only vector images)"
-msgstr ""
+msgstr "Cancel current grab (only vector images)"
msgid "Cadastre grab"
-msgstr ""
+msgstr "Cadastre grab"
msgid "Download Image from French Cadastre WMS"
msgstr "Download Image from French Cadastre WMS"
@@ -26019,7 +26355,7 @@ msgid "Cadastre: {0}"
msgstr "Cadastre: {0}"
msgid "Georeference an image"
-msgstr ""
+msgstr "Georeference an image"
msgid "Grab non-georeferenced image"
msgstr "Grab non-georeferenced image"
@@ -26035,7 +26371,7 @@ msgstr ""
"Do you want to use them ?"
msgid "Load layer from cache"
-msgstr ""
+msgstr "Load layer from cache"
msgid "Load location from cache (only if cache is enabled)"
msgstr "Load location from cache (only if cache is enabled)"
@@ -26057,7 +26393,7 @@ msgid "The location {0} is already on screen. Cache not loaded."
msgstr "The location {0} is already on screen. Cache not loaded."
msgid "(optional)"
-msgstr ""
+msgstr "(optional)"
msgid "Change location"
msgstr "Change location"
@@ -26066,10 +26402,10 @@ msgid "Set a new location for the next request"
msgstr "Set a new location for the next request"
msgid "Add a new municipality layer"
-msgstr ""
+msgstr "Add a new municipality layer"
msgid "Commune"
-msgstr ""
+msgstr "Commune"
msgid ""
"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -26088,13 +26424,13 @@ msgid "Add new layer"
msgstr "Add new layer"
msgid "Open Cadastre Preferences"
-msgstr ""
+msgstr "Open Cadastre Preferences"
msgid "Refine georeferencing"
-msgstr ""
+msgstr "Refine georeferencing"
msgid "Improve georeferencing (only raster images)"
-msgstr ""
+msgstr "Improve georeferencing (only raster images)"
msgid "Reset cookie"
msgstr "Reset cookie"
@@ -26103,16 +26439,16 @@ msgid "Get a new cookie (session timeout)"
msgstr "Get a new cookie (session timeout)"
msgid "Save image as..."
-msgstr ""
+msgstr "Save image as..."
msgid "PNG files (*.png)"
msgstr "PNG files (*.png)"
msgid "GeoTiff files (*.tif)"
-msgstr ""
+msgstr "GeoTiff files (*.tif)"
msgid "Export image (only raster images)"
-msgstr ""
+msgstr "Export image (only raster images)"
msgid ""
"Click first corner for image cropping\n"
@@ -26145,6 +26481,8 @@ msgid ""
"Ooops. I failed to catch all coordinates\n"
"correctly. Retry please."
msgstr ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgid "Enter cadastre east,north position"
msgstr "Enter cadastre east,north position"
@@ -26156,7 +26494,7 @@ msgid "East"
msgstr "East"
msgid "I use the mouse"
-msgstr ""
+msgstr "I use the mouse"
msgid "Set {0} Lambert coordinates"
msgstr "Set {0} Lambert coordinates"
@@ -26171,7 +26509,7 @@ msgid "Adjust WMS"
msgstr "Adjust WMS"
msgid "Adjust the position of the WMS layer (saved for raster images only)"
-msgstr ""
+msgstr "Adjust the position of the WMS layer (saved for raster images only)"
msgid ""
"More than one WMS layer present\n"
@@ -26181,10 +26519,10 @@ msgstr ""
"Select one of them first, then retry"
msgid "Reset offset"
-msgstr ""
+msgstr "Reset offset"
msgid "Reset offset (only vector images)"
-msgstr ""
+msgstr "Reset offset (only vector images)"
msgid "Blank Layer"
msgstr "Blank Layer"
@@ -26196,7 +26534,7 @@ msgid "Is not vectorized."
msgstr "Is not vectorised."
msgid "Bounding box: {0}"
-msgstr ""
+msgstr "Bounding box: {0}"
msgid "Image size (px): {0}/{1}"
msgstr "Image size (px): {0}/{1}"
@@ -26224,7 +26562,7 @@ msgid "Cache Lambert Zone Error"
msgstr "Cache Lambert Zone Error"
msgid "canvec tile helper"
-msgstr ""
+msgstr "canvec tile helper"
msgid "Use"
msgstr "Use"
@@ -26251,208 +26589,224 @@ msgid "Color Schemes"
msgstr "Colour Schemes"
msgid "Conflate object pair"
-msgstr ""
+msgstr "Conflate object pair"
msgid "Added {0} object to subject layer"
msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Added {0} object to subject layer"
+msgstr[1] "Added {0} objects to subject layer"
msgid "Conflation"
-msgstr ""
+msgstr "Conflation"
msgid "Activates the conflation plugin"
-msgstr ""
+msgstr "Activates the conflation plugin"
msgid "Matches"
-msgstr ""
+msgstr "Matches"
msgid "Reference only"
-msgstr ""
+msgstr "Reference only"
msgid "Subject only"
-msgstr ""
+msgstr "Subject only"
msgid "Matches ({0})"
-msgstr ""
+msgstr "Matches ({0})"
msgid "Reference only ({0})"
-msgstr ""
+msgstr "Reference only ({0})"
msgid "Subject only ({0})"
-msgstr ""
+msgstr "Subject only ({0})"
msgid "Configure"
msgstr "Configure"
msgid "Configure conflation options"
-msgstr ""
+msgstr "Configure conflation options"
msgid "Delete {0} conflation matches"
-msgstr ""
+msgstr "Delete {0} conflation matches"
msgid "Remove {0} unmatched objects"
-msgstr ""
+msgstr "Remove {0} unmatched objects"
msgid "Remove selected matches"
-msgstr ""
+msgstr "Remove selected matches"
msgid "Conflate"
-msgstr ""
+msgstr "Conflate"
msgid "Conflate selected objects"
-msgstr ""
+msgstr "Conflate selected objects"
msgid "Conflation: {0}"
-msgstr ""
+msgstr "Conflation: {0}"
msgid "Cannot replace geometry."
-msgstr ""
+msgstr "Cannot replace geometry."
msgid "Zoom to selected primitive(s)"
-msgstr ""
+msgstr "Zoom to selected primitive(s)"
msgid "Select selected primitive(s)"
-msgstr ""
+msgstr "Select selected primitive(s)"
msgid "Select the primitives currently selected in the list"
-msgstr ""
+msgstr "Select the primitives currently selected in the list"
msgid "Match finder settings"
-msgstr ""
+msgstr "Match finder settings"
msgid "Match finder method"
-msgstr ""
+msgstr "Match finder method"
msgid "Threshold distance"
-msgstr ""
+msgstr "Threshold distance"
msgid "Distances greater than this will result in a score of zero."
-msgstr ""
+msgstr "Distances greater than this will result in a score of zero."
msgid "Centroid distance"
-msgstr ""
+msgstr "Centroid distance"
msgid "Hausdorff distance"
-msgstr ""
+msgstr "Hausdorff distance"
msgid "Configure conflation settings"
-msgstr ""
+msgstr "Configure conflation settings"
msgid "Generate matches"
-msgstr ""
+msgstr "Generate matches"
msgid "Subject"
-msgstr ""
+msgstr "Subject"
msgid "Selections must be made for both reference and subject."
-msgstr ""
+msgstr "Selections must be made for both reference and subject."
msgid "Incomplete selections"
-msgstr ""
+msgstr "Incomplete selections"
msgid "Restore subject selection"
-msgstr ""
+msgstr "Restore subject selection"
msgid "Restore reference selection"
-msgstr ""
+msgstr "Restore reference selection"
msgid "Freeze subject selection"
-msgstr ""
+msgstr "Freeze subject selection"
msgid "No valid OSM data layer present."
-msgstr ""
+msgstr "No valid OSM data layer present."
msgid "Error freezing selection"
-msgstr ""
+msgstr "Error freezing selection"
msgid "Nothing is selected, please try again."
-msgstr ""
+msgstr "Nothing is selected, please try again."
msgid "Empty selection"
-msgstr ""
+msgstr "Empty selection"
msgid "Invalid reference or subject"
-msgstr ""
+msgstr "Invalid reference or subject"
msgid "Download OSM data continuously"
-msgstr ""
+msgstr "Download OSM data continuously"
msgid "Download map data continuously when paning and zooming."
-msgstr ""
+msgstr "Download map data continuously when paning and zooming."
msgid "Toggle the continuous download on/off"
-msgstr ""
+msgstr "Toggle the continuous download on/off"
msgid "Download Settings"
-msgstr ""
+msgstr "Download Settings"
msgid "Settings for the continuous download."
-msgstr ""
+msgstr "Settings for the continuous download."
msgid "Activate continuous downloads at startup."
-msgstr ""
+msgstr "Activate continuous downloads at startup."
msgid "Supress the default modal progress monitor when downloading."
-msgstr ""
+msgstr "Supress the default modal progress monitor when downloading."
msgid ""
"If this plugin is active at startup. This default state will not change when "
"you are toggeling the plugin with the menu option."
msgstr ""
+"If this plugin is active at startup. This default state will not change when "
+"you are toggling the plugin with the menu option."
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
msgstr ""
+"Maximum number of threads used for downloading, increasing this will cause "
+"the client to send more concurrent queries to the server."
+
+msgid "Requires restart"
+msgstr "Requires restart"
msgid "Max threads"
-msgstr ""
+msgstr "Max threads"
msgid "Maximum number of boxes to download for each pan/zoom."
-msgstr ""
+msgstr "Maximum number of boxes to download for each pan/zoom."
msgid "Max download boxes"
-msgstr ""
+msgstr "Max download boxes"
msgid ""
"Time in milliseconds after a pan/zoom before it starts downloading. "
"Additional changes in the viewport in the waiting time will reset the timer."
msgstr ""
+"Time in milliseconds after a pan/zoom before it starts downloading. "
+"Additional changes in the viewport in the waiting time will reset the timer."
msgid "Wait time (milliseconds)"
-msgstr ""
+msgstr "Wait time (milliseconds)"
msgid ""
"How much extra area around the viewport is it going to download. Setting "
"this to 0 will not download any extra data."
msgstr ""
+"How much extra area around the viewport is it going to download. Setting "
+"this to 0 will not download any extra data."
msgid "Extra download area"
-msgstr ""
+msgstr "Extra download area"
msgid ""
"Max area to download in degrees^2. Increasing this number will cause the "
"plugin to download areas when you are zoomed far out."
msgstr ""
+"Max area to download in degrees^2. Increasing this number will cause the "
+"plugin to download areas when you are zoomed far out."
msgid "Max download area"
-msgstr ""
+msgstr "Max download area"
msgid "The strategy for finding what areas to request from the server."
-msgstr ""
+msgstr "The strategy for finding what areas to request from the server."
msgid "Download strategy"
-msgstr ""
+msgstr "Download strategy"
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgid "Address"
-msgstr ""
+msgstr "Address"
msgid "Split area"
msgstr "Split area"
@@ -26488,28 +26842,28 @@ msgid "TCX Files (*.tcx)"
msgstr "TCX Files (*.tcx)"
msgid "Download along..."
-msgstr ""
+msgstr "Download along..."
msgid "Download OSM data along the selected ways."
-msgstr ""
+msgstr "Download OSM data along the selected ways."
msgid "Download Along"
-msgstr ""
+msgstr "Download Along"
msgid "Please select 1 or more ways to download along"
-msgstr ""
+msgstr "Please select 1 or more ways to download along"
msgid "Download from OSM along selected ways"
-msgstr ""
+msgstr "Download from OSM along selected ways"
msgid "{0} intermediate nodes to download."
-msgstr ""
+msgstr "{0} intermediate nodes to download."
msgid "between {0} {1} and {2} {3}"
-msgstr ""
+msgstr "between {0} {1} and {2} {3}"
msgid " adding {0} {1}"
-msgstr ""
+msgstr " adding {0} {1}"
msgid "Layer for editing GPX tracks"
msgstr "Layer for editing GPX tracks"
@@ -26533,111 +26887,114 @@ msgid "No GPX data layer found."
msgstr "No GPX data layer found."
msgid "External tool error"
-msgstr ""
+msgstr "External tool error"
msgid "Error executing the script:"
-msgstr ""
+msgstr "Error executing the script:"
msgid ""
"Child script have returned invalid data.\n"
"\n"
"stderr contents:"
msgstr ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
msgid "exttool:{0}"
-msgstr ""
+msgstr "exttool:{0}"
msgid "External Tool: {0}"
-msgstr ""
+msgstr "External Tool: {0}"
msgid "Edit tool"
-msgstr ""
+msgstr "Edit tool"
msgid "CmdLine:"
-msgstr ""
+msgstr "CmdLine:"
msgid "External tools"
-msgstr ""
+msgstr "External tools"
msgid "Delete tool \"{0}\"?"
-msgstr ""
+msgstr "Delete tool \"{0}\"?"
msgid "Are you sure?"
msgstr "Are you sure?"
msgid "New tool..."
-msgstr ""
+msgstr "New tool..."
msgid "Install"
-msgstr ""
+msgstr "Install"
msgid "Public"
-msgstr ""
+msgstr "Public"
msgid "Could not get server response, check logs"
-msgstr ""
+msgstr "Could not get server response, check logs"
msgid "Failed to login as {0}:"
-msgstr ""
+msgstr "Failed to login as {0}:"
msgid "The server did not return user ID"
-msgstr ""
+msgstr "The server did not return user ID"
msgid "Failed to get messages as {0}:"
-msgstr ""
+msgstr "Failed to get messages as {0}:"
msgid "GeoChat"
-msgstr ""
+msgstr "GeoChat"
msgid "Open GeoChat panel"
-msgstr ""
+msgstr "Open GeoChat panel"
msgid "Zoom in to see messages"
-msgstr ""
+msgstr "Zoom in to see messages"
msgid "Login"
-msgstr ""
+msgstr "Login"
msgid "Enable autologin"
-msgstr ""
+msgstr "Enable autologin"
msgid "{0} user"
msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} user"
+msgstr[1] "{0} users"
msgid "not logged in"
-msgstr ""
+msgstr "not logged in"
msgid "Failed to log in to GeoChat:"
-msgstr ""
+msgstr "Failed to log in to GeoChat:"
msgid "Failed to send message:"
-msgstr ""
+msgstr "Failed to send message:"
msgid "User {0} has left"
-msgstr ""
+msgstr "User {0} has left"
msgid "User {0} is mapping nearby"
-msgstr ""
+msgstr "User {0} is mapping nearby"
msgid "Users mapping nearby:"
-msgstr ""
+msgstr "Users mapping nearby:"
msgid "Private chat"
-msgstr ""
+msgstr "Private chat"
msgid "Close tab"
-msgstr ""
+msgstr "Close tab"
msgid "Logout"
-msgstr ""
+msgstr "Logout"
msgid "Clear log"
-msgstr ""
+msgstr "Clear log"
msgid "Show users on map"
-msgstr ""
+msgstr "Show users on map"
msgid "Position only"
msgstr "Position only"
@@ -26733,64 +27090,64 @@ msgid "Import"
msgstr "Import"
msgid "GPS Blams"
-msgstr ""
+msgstr "GPS Blams"
msgid "GPSBlam"
-msgstr ""
+msgstr "GPSBlam"
msgid "select gpx points and \"blam!\", find centre and direction of spread"
-msgstr ""
+msgstr "select gpx points and \"blam!\", find centre and direction of spread"
msgid "Add EGPX layer"
-msgstr ""
+msgstr "Add EGPX layer"
msgid "GPX Data"
-msgstr ""
+msgstr "GPX Data"
msgid "Classes element below root child level"
-msgstr ""
+msgstr "Classes element below root child level"
msgid "Class element ({0}) outside classes element"
-msgstr ""
+msgstr "Class element ({0}) outside classes element"
msgid "Class element without name"
-msgstr ""
+msgstr "Class element without name"
msgid "Tag element outside basetag and implication elements"
-msgstr ""
+msgstr "Tag element outside basetag and implication elements"
msgid "Implications element below root child level"
-msgstr ""
+msgstr "Implications element below root child level"
msgid "Tag without key"
-msgstr ""
+msgstr "Tag without key"
msgid "Tag without value (key is {0})"
-msgstr ""
+msgstr "Tag without value (key is {0})"
msgid "Closed classes while it was not open"
-msgstr ""
+msgstr "Closed classes while it was not open"
msgid "Closed classes element before all class elements were closed"
-msgstr ""
+msgstr "Closed classes element before all class elements were closed"
msgid "Closed class element while none was open"
-msgstr ""
+msgstr "Closed class element while none was open"
msgid "Closed basetags while it was not open"
-msgstr ""
+msgstr "Closed basetags while it was not open"
msgid "Closed implications while it was not open"
-msgstr ""
+msgstr "Closed implications while it was not open"
msgid "Tag element inside other tag element"
-msgstr ""
+msgstr "Tag element inside other tag element"
msgid "Invalid opening xml tag <{0}> in state {1}"
-msgstr ""
+msgstr "Invalid opening xml tag <{0}> in state {1}"
msgid "Condition isn''t finished at </condition> tag"
-msgstr ""
+msgstr "Condition isn''t finished at </condition> tag"
msgid "Closing tag element that was not open"
msgstr "Closing tag element that was not open"
@@ -26847,6 +27204,8 @@ msgid ""
"Syntax exception in access ruleset:\n"
"{0}"
msgstr ""
+"Syntax exception in access ruleset:\n"
+"{0}"
msgid ""
"File not found:\n"
@@ -26884,7 +27243,7 @@ msgid "weight (t)"
msgstr "weight (t)"
msgid "axleload (t)"
-msgstr ""
+msgstr "axleload (t)"
msgid "Bookmark name"
msgstr "Bookmark name"
@@ -26936,7 +27295,7 @@ msgid "max. tracktype grade"
msgstr "max. tracktype grade"
msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
-msgstr ""
+msgstr "Worst tracktype (1-5) the vehicle can still use, 0 for none"
msgid "Change bookmark"
msgstr "Change bookmark"
@@ -27045,10 +27404,10 @@ msgid "Routing graph calculated by the GraphView plugin"
msgstr "Routing graph calculated by the GraphView plugin"
msgid "GraphView layer is not mergable"
-msgstr ""
+msgstr "GraphView layer is not mergable"
msgid "graphview default node"
-msgstr ""
+msgstr "graphview default node"
msgid "graphview default segment"
msgstr "graphview default segment"
@@ -27060,41 +27419,51 @@ msgid ""
"Weights must be given as positive decimal numbers with unit \"t\" or without "
"unit."
msgstr ""
+"Weights must be given as positive decimal numbers with unit \"t\" or without "
+"unit."
msgid ""
"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
"\"mi\" or without unit.\n"
"Alternatively, the format FEET'' INCHES\" can be used."
msgstr ""
+"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
+"\"mi\" or without unit.\n"
+"Alternatively, the format FEET'' INCHES\" can be used."
msgid ""
"Speeds should be given as numbers without unit or as numbers followed by "
"\"mph\"."
msgstr ""
+"Speeds should be given as numbers without unit or as numbers followed by "
+"\"mph\"."
msgid ""
"Inclines must be given as positive decimal numbers with followed by \"%\"."
msgstr ""
+"Inclines must be given as positive decimal numbers with followed by \"%\"."
msgid "Tracktype grades must be given as integers between 0 and 5."
-msgstr ""
+msgstr "Tracktype grades must be given as integers between 0 and 5."
msgid ""
"Surface values must not contain any of the following characters: '','', '' "
"'{' '', '' '}' '', ''='', ''|''"
msgstr ""
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '', '' '}' '', ''='', ''|''"
msgid "Imagery XML Files"
-msgstr ""
+msgstr "Imagery XML Files"
msgid "Save Imagery XML file"
-msgstr ""
+msgstr "Save Imagery XML file"
msgid "XML Imagery Bounds"
-msgstr ""
+msgstr "XML Imagery Bounds"
msgid "Generate Imagery XML bounds for the selection"
-msgstr ""
+msgstr "Generate Imagery XML bounds for the selection"
msgid "edit bounds for selected defaults"
msgstr "edit bounds for selected defaults"
@@ -27118,7 +27487,7 @@ msgid "Calibration Layer"
msgstr "Calibration Layer"
msgid "A deprecated calibration geometry of {0} nodes by {1}"
-msgstr ""
+msgstr "A deprecated calibration geometry of {0} nodes by {1}"
msgid "A calibration geometry of {0} nodes by {1}"
msgstr "A calibration geometry of {0} nodes by {1}"
@@ -27136,7 +27505,7 @@ msgid "Are you sure this calibration geometry is aligned badly?"
msgstr "Are you sure this calibration geometry is aligned badly?"
msgid "Warning: deprecation is basically irreversible!"
-msgstr ""
+msgstr "Warning: deprecation is basically irreversible!"
msgid "To store imagery offsets you must be a registered OSM user."
msgstr "To store imagery offsets you must be a registered OSM user."
@@ -27213,34 +27582,34 @@ msgstr ""
"find the corresponding feature on the imagery layer and move it accordingly."
msgid "Deprecated by {0} on {1}"
-msgstr ""
+msgstr "Deprecated by {0} on {1}"
msgid "Created by {0} on {1}"
-msgstr ""
+msgstr "Created by {0} on {1}"
msgid "Offset Information"
-msgstr ""
+msgstr "Offset Information"
msgid "Report this offset"
-msgstr ""
+msgstr "Report this offset"
msgid "You are to notify moderators of this offset. Why?"
-msgstr ""
+msgstr "You are to notify moderators of this offset. Why?"
msgid "Reporting the offset..."
-msgstr ""
+msgstr "Reporting the offset..."
msgid "An imagery offset of {0}"
-msgstr ""
+msgstr "An imagery offset of {0}"
msgid "Imagery ID"
-msgstr ""
+msgstr "Imagery ID"
msgid "A calibration geometry of {0} nodes"
-msgstr ""
+msgstr "A calibration geometry of {0} nodes"
msgid "Determined right here"
-msgstr ""
+msgstr "Determined right here"
msgid "Determined {0} away"
msgstr "Determined {0} away"
@@ -27328,7 +27697,7 @@ msgid "Start adjusting"
msgstr "Start adjusting"
msgid "There are currently no imagery layer to adjust."
-msgstr ""
+msgstr "There are currently no imagery layer to adjust."
msgid "No layers to adjust"
msgstr "No layers to adjust"
@@ -27407,19 +27776,19 @@ msgstr ""
"highlight tracks"
msgid "Delete this"
-msgstr ""
+msgstr "Delete this"
msgid "Delete this&older"
-msgstr ""
+msgstr "Delete this & older"
msgid "km/h"
-msgstr ""
+msgstr "km/h"
msgid "Track name: "
-msgstr ""
+msgstr "Track name: "
msgid "Update IRS adjustment layer"
-msgstr ""
+msgstr "Update IRS adjustment layer"
msgid ""
"This option creates IRS adjustment layer and a little way inside it. You "
@@ -27427,18 +27796,22 @@ msgid ""
"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
"with [irs rectify] in subject."
msgstr ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
+"with [irs rectify] in subject."
msgid "IRS Adjustment Layer"
-msgstr ""
+msgstr "IRS Adjustment Layer"
msgid "Channel-Digraph created from the active OSM-Layer"
-msgstr ""
+msgstr "Channel-Digraph created from the active OSM-Layer"
msgid "Create Channel Digraph"
-msgstr ""
+msgstr "Create Channel Digraph"
msgid "this layer is no osm data layer"
-msgstr ""
+msgstr "this layer is no osm data layer"
msgid "Converting OSM graph into Channel Digraph"
msgstr "Converting OSM graph into Channel Digraph"
@@ -27447,53 +27820,54 @@ msgid "filtering ways"
msgstr "filtering ways"
msgid "creating Channel-Digraph"
-msgstr ""
+msgstr "creating Channel-Digraph"
msgid "sealing Digraph"
-msgstr ""
+msgstr "sealing Digraph"
msgid "calculating Strong Connectedness"
-msgstr ""
+msgstr "calculating Strong Connectedness"
msgid "creating DigraphLayer"
-msgstr ""
+msgstr "creating DigraphLayer"
msgid "JunctionChecking"
-msgstr ""
+msgstr "JunctionChecking"
msgid "Open the junctionchecking window."
-msgstr ""
+msgstr "Open the junctionchecking window."
msgid "junctions"
msgstr "junctions"
msgid "Channel-Digraph creation"
-msgstr ""
+msgstr "Channel-Digraph creation"
msgid "seal Channel Digraph"
msgstr "seal Channel Digraph"
msgid "calculate strong connected channels"
-msgstr ""
+msgstr "calculate strong connected channels"
msgid "Junctionchecking/junctions searching"
-msgstr ""
+msgstr "Junctionchecking/junctions searching"
msgid "order of junction (n):"
-msgstr ""
+msgstr "order of junction (n):"
msgid "produce OSM-Relations: junction"
-msgstr ""
+msgstr "produce OSM-Relations: junction"
msgid ""
"if enabled the plugin produces osm-relations from the junction subgraphs"
msgstr ""
+"if enabled the plugin produces osm-relations from the junction subgraphs"
msgid "create the channel digraph"
-msgstr ""
+msgstr "create the channel digraph"
msgid "Check "
-msgstr ""
+msgstr "Check "
msgid "check the subust for junction properties"
msgstr ""
@@ -27502,30 +27876,32 @@ msgid "Search "
msgstr "Search "
msgid "search for junctions in the channel subset"
-msgstr ""
+msgstr "search for junctions in the channel subset"
msgid ""
"The marked channels contains a junctioncandidate (white). To test this "
"candidat mark these channel and press the \"Check\" button again."
msgstr ""
+"The marked channels contains a junctioncandidate (white). To test this "
+"candidate mark these channel and press the \"Check\" button again."
msgid "The marked channels are a {0}-ways junction"
-msgstr ""
+msgstr "The marked channels are a {0}-ways junction"
msgid "The marked channels are not a junction:"
-msgstr ""
+msgstr "The marked channels are not a junction:"
msgid "construct channel digraph and search for junctions"
-msgstr ""
+msgstr "construct channel digraph and search for junctions"
msgid "Number of {0}-ways junctions found: {1}"
-msgstr ""
+msgstr "Number of {0}-ways junctions found: {1}"
msgid "generate all combinations from entrie/exit candidates"
-msgstr ""
+msgstr "generate all combinations from entry/exit candidates"
msgid "Direction index ''{0}'' not found"
-msgstr ""
+msgstr "Direction index ''{0}'' not found"
msgid "The starting location was not within the bbox"
msgstr "The starting location was not within the bbox"
@@ -27765,25 +28141,25 @@ msgid "Continuously center the LiveGPS layer to current position."
msgstr "Continuously centre the LiveGPS layer to current position."
msgid "Open MapDust"
-msgstr ""
+msgstr "Open MapDust"
msgid "MapDust bug reports"
-msgstr ""
+msgstr "MapDust bug reports"
msgid "Activates the MapDust bug reporter plugin"
-msgstr ""
+msgstr "Activates the MapDust bug reporter plugin"
msgid "Missing input data"
-msgstr ""
+msgstr "Missing input data"
msgid "Mapillary Images"
-msgstr ""
+msgstr "Mapillary Images"
msgid "Mapillary layer"
-msgstr ""
+msgstr "Mapillary layer"
msgid "Total images:"
-msgstr ""
+msgstr "Total images:"
msgid "images"
msgstr ""
@@ -29091,6 +29467,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "Load Picture Calibration..."
@@ -29100,6 +29479,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr "Loading file failed: {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -29139,6 +29521,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "PicLayer move"
@@ -29254,8 +29639,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "Do you want to apply it ?"
-msgid "Load calibration file ?"
-msgstr "Load calibration file ?"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr "It will be applied automatically."
@@ -29493,9 +29878,6 @@ msgstr "State"
msgid "pending"
msgstr "pending"
-msgid "outside"
-msgstr "outside"
-
msgid "[incomplete]"
msgstr "[incomplete]"
diff --git a/i18n/po/eo.po b/i18n/po/eo.po
index e7eed85..eed55d8 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2012-10-03 21:33+0000\n"
"Last-Translator: Michael Moroni <michael.moroni at openmailbox.org>\n"
"Language-Team: Esperanto <eo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:38+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:38+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: eo\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr "Kromprogramoj"
msgid "About JOSM..."
msgstr "Pri JOSM…"
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2133,13 +2139,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2153,6 +2155,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2347,6 +2358,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2365,9 +2379,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3162,12 +3173,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "NEKONATA"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4759,6 +4770,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4931,7 +4949,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5733,20 +5751,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6978,13 +6991,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11941,6 +11957,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12103,6 +12122,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13943,6 +13965,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14549,6 +14575,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14576,7 +14605,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15152,6 +15184,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15297,6 +15332,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15335,6 +15375,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15768,9 +15813,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15838,6 +15895,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15932,6 +15992,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16472,6 +16535,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16493,12 +16559,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "akvo"
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr "oleo"
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16600,6 +16742,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17139,12 +17284,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17262,6 +17410,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17666,6 +17820,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18304,12 +18467,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18493,6 +18650,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19155,25 +19315,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19753,6 +19894,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19951,32 +20100,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr "akvo"
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr "oleo"
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20061,6 +20184,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20301,6 +20441,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21466,6 +21634,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21805,6 +22064,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22788,6 +23070,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22843,6 +23128,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24817,7 +25108,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24860,9 +25154,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27447,6 +27741,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27456,6 +27753,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27495,6 +27795,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27608,7 +27911,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27845,9 +28148,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/es.po b/i18n/po/es.po
index a79bbb1..1b7bb51 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-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-29 18:41+0000\n"
-"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-10-31 19:28+0000\n"
+"Last-Translator: cdavila <cdavilam at orangecorreo.es>\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-10-30 04:58+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:58+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: es\n"
"X-Language: es_ES\n"
"X-Source-Language: C\n"
@@ -174,6 +174,12 @@ msgstr "Complementos"
msgid "About JOSM..."
msgstr "Acerca de JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Fallo al cargar el recurso \"{0}\", el error es: {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2334,14 +2340,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Seleccionar, mover, escalar y girar los objetos"
-msgid "Move elements"
-msgstr "Mover elementos"
-
-msgid "Move them"
-msgstr "Moverlos"
-
-msgid "Undo move"
-msgstr "Deshacer mover"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2360,6 +2362,15 @@ msgstr[1] ""
"general un error.\n"
"¿Realmente desea moverlos?"
+msgid "Move elements"
+msgstr "Mover elementos"
+
+msgid "Move them"
+msgstr "Moverlos"
+
+msgid "Undo move"
+msgstr "Deshacer mover"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
"Soltar el botón del ratón para seleccionar los objetos en el rectángulo."
@@ -2570,6 +2581,9 @@ msgstr "Selector de MapCSS"
msgid "add toolbar button"
msgstr "añadir botón a la barra de herramientas"
+msgid "Invalid search expression"
+msgstr "Expresión inválida de búsqueda"
+
msgid "Filter"
msgstr "Filtrar"
@@ -2590,9 +2604,6 @@ msgstr ""
"Expresión inválida de búsqueda: \n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Expresión inválida de búsqueda"
-
msgid "basic examples"
msgstr "ejemplos básicos"
@@ -3482,12 +3493,12 @@ msgstr "Imperial"
msgid "Nautical Mile"
msgstr "Milla náutica"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Fallo al cargar el recurso \"{0}\", el error es: {1}."
-
msgid "UNKNOWN"
msgstr "DESCONOCIDO"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
"Número de versión JOSM inesperado en el archivo de revisión, el valor es "
@@ -5217,6 +5228,13 @@ msgstr "Ayuda"
msgid "Menu: {0}"
msgstr "Menú: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "Editar barra de herramientas"
@@ -5398,14 +5416,10 @@ msgstr "hasta la tesela"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Alternativamente puede introducir una <strong>dirección de "
-"tesela</strong> para una única tesela en el formato <i>zoomlevel/x/y</i>, es "
-"decir, <i>15/256/223</i>. Las direcciones de teselas en el formato "
-"<i>zoom,x,y</i> o <i>zoom;x;y</i> son válidas también.<html>"
msgid "Tile address:"
msgstr "Dirección de la tesela:"
@@ -6316,26 +6330,15 @@ msgstr "Resolver los conflictos"
msgid "Resolve conflicts for ''{0}''"
msgstr "Resolver los conflictos de ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Confirme el borrado de <strong>1 objeto</strong> de <strong>1 "
-"relación</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Confirme el borrado de <strong>1 objeto</strong> de <strong>{0} "
-"relaciones</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Confirme el borrado de <strong>{0} objetos</strong> de <strong>{1} "
-"relaciones</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7687,14 +7690,17 @@ msgstr "Etiquetas/Miembros"
msgid "Tags for selected objects."
msgstr "Etiquetas para los objetos seleccionados."
+msgid "<different>"
+msgstr "<diferente>"
+
msgid "Member Of"
msgstr "Miembro de"
msgid "Position"
msgstr "Posición"
-msgid "<different>"
-msgstr "<diferente>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Objectos: {2} / Etiquetas: {0} / Miembros: {1}"
@@ -13319,6 +13325,9 @@ msgstr ""
"Etiquetado predeterminado roto \"{0}-{1}\" - el número de objetos en "
"''display_values'' debe coincidir con ''values''"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13510,6 +13519,9 @@ msgstr "Descargando puntos {0} al {1}..."
msgid "Contacting OSM Server..."
msgstr "Contactando con el servidor OSM..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Fallo al abrir canal de lectura para el recurso \"{0}\""
@@ -15725,6 +15737,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "monte bajo (arbustos, matorral o maleza)"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "Calle Asociada"
@@ -16338,6 +16354,9 @@ msgstr "Imágenes aéreas de drones (Haití)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Avión no tripulado Imágenes 2014 (Haití)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Oficina de Guerra de Irlanda del Norte 1:25k GSGS 3906"
@@ -16365,8 +16384,11 @@ msgstr "OSMIE Civil Parishes"
msgid "OSMIE Baronies"
msgstr "OSMIE Baronies"
-msgid "OSMIE Political"
-msgstr "OSMIE Político"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
+msgstr ""
msgid "Lodi - Italy"
msgstr "Lodi - Italia"
@@ -16941,6 +16963,9 @@ msgstr "Planos urbanos OS, Nairn 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "Planos urbanos OS, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "Planos urbanos OS, Peebles 1856 (NLS)"
@@ -17121,6 +17146,11 @@ msgstr ""
"Permite al usuario que la marca de tiempo sea anónima y borrar las partes "
"más grandes del GPX que suelen corresponder a trazas muy rápidas."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
"Muestra el perfil de elevación y algunos datos estadísticos de una traza GPX"
@@ -17173,6 +17203,11 @@ msgstr "Permite filtrar las trazas GPS innecesarias"
msgid "Visualizes routing information as a routing graph."
msgstr "Visualiza la información de enrutamiento como un grafo de red."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "Sencilla herramienta para etiquetar números de policía."
@@ -17709,9 +17744,21 @@ msgstr "lodazal"
msgid "Lanes"
msgstr "Carriles"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Velocidad max. (km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Puente"
@@ -17779,6 +17826,9 @@ msgstr "vía muerta"
msgid "spur"
msgstr "ramal"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Electrificado"
@@ -17873,6 +17923,9 @@ msgstr "separado"
msgid "isolated"
msgstr "aislado"
+msgid "outside"
+msgstr "fuera"
+
msgid "Height (meters)"
msgstr "Altura (en metros)"
@@ -18418,6 +18471,9 @@ msgstr "Peaje"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "¿Es la masa de agua intermitente (desaparece estacionalmente)?"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr "alcantarilla"
@@ -18439,12 +18495,88 @@ msgstr "Lancha"
msgid "Canoe"
msgstr "Canoa"
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "agua"
+
+msgid "gas"
+msgstr "gas"
+
+msgid "heat"
+msgstr "vapor o agua caliente"
+
+msgid "oil"
+msgstr "petróleo"
+
+msgid "sewage"
+msgstr "aguas residuales"
+
+msgid "Support"
+msgstr "Soporte"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "poste"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "montado en la pared"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "cartelera"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "tierra"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Calles/Carreteras"
msgid "Motorway"
msgstr "Autopista"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Enlace de autopista"
@@ -18548,6 +18680,9 @@ msgstr ""
"carril de servicio para usuarios (comida rápida, banca, colegios, "
"aeropuerto, etc.)"
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Pasillo de aparcamiento"
@@ -19106,12 +19241,15 @@ msgstr "Círculo de giro"
msgid "Turning Loop"
msgstr "Bucle de retorno"
-msgid "City Limit"
-msgstr "Límite de ciudad"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Nombre alternativo"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Rádar de tráfico"
@@ -19231,6 +19369,12 @@ msgstr "Guardarraíl, bionda o quitamiedos"
msgid "Wall"
msgstr "Muro"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Muralla"
@@ -19645,6 +19789,15 @@ msgstr "GNC (Gas Natural Comprimido)"
msgid "Pier"
msgstr "Embarcadero"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Esclusa"
@@ -20287,12 +20440,6 @@ msgstr "Aeropuerto"
msgid "Airport Ground"
msgstr "Campo de aviación"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Pista"
@@ -20476,6 +20623,9 @@ msgstr "Cervecería artesanal"
msgid "Outdoor seating"
msgstr "Mesas al aire libre"
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Establecimiento de comida rápida"
@@ -21141,25 +21291,6 @@ msgstr "reloj de sol"
msgid "unorthodox"
msgstr "no ortodoxo"
-msgid "Support"
-msgstr "Soporte"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "poste"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "montado en la pared"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "cartelera"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "tierra"
-
msgid "Visibility/readability"
msgstr "Visibilidad/legibilidad"
@@ -21739,6 +21870,14 @@ msgid "barn"
msgstr "granero"
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "auxiliar para campo o granja"
@@ -21937,32 +22076,6 @@ msgstr "vino"
msgid "Bunker Silo"
msgstr "Silo de búnker"
-msgid "Pipeline"
-msgstr "Tubería"
-
-msgid "water"
-msgstr "agua"
-
-msgid "gas"
-msgstr "gas"
-
-msgid "heat"
-msgstr "vapor o agua caliente"
-
-msgid "oil"
-msgstr "petróleo"
-
-msgid "sewage"
-msgstr "aguas residuales"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "submarino"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "en superficie"
-
msgid "Crane"
msgstr "Grúa"
@@ -22047,6 +22160,23 @@ msgstr "Entrada a galería"
msgid "Length in meters"
msgstr "Longitud en metros"
+msgid "Pipeline"
+msgstr "Tubería"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "submarino"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "en superficie"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Torre de agua"
@@ -22287,6 +22417,34 @@ msgstr "muelle pivot"
msgid "Bridge outline"
msgstr "esquema Puente"
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "Planta generadora de energía"
@@ -23454,6 +23612,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Geografía"
@@ -23665,7 +23914,7 @@ msgid "Woodland where timber production does not dominate use."
msgstr "Área forestada donde la producción de leña no domina el uso."
msgid "Forest"
-msgstr "Plantación forestal"
+msgstr "Explotación forestal"
msgid "Cutline"
msgstr "Líneas de corte (interrupción lineal en un bosque)"
@@ -23812,6 +24061,29 @@ msgstr "Edificio agrario"
msgid "Farmland"
msgstr "Tierra de labranza"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Prado"
@@ -24830,6 +25102,9 @@ msgstr "{0} debe ser un valor numérico"
msgid "{0} must be a positive integer number"
msgstr "{0} debe ser un número entero positivo"
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr "relation sin type"
@@ -24886,6 +25161,12 @@ 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 "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Archivos CSV Columbus V-900"
@@ -27107,7 +27388,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -27150,9 +27434,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -29938,6 +30222,9 @@ msgstr "Imágenes sin etiquetar"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "¿Desea guardar la calibración actual de la capa {0}?"
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "Cargar calibración de imágenes..."
@@ -29947,6 +30234,9 @@ msgstr "Carga datos de calibración de un fichero"
msgid "Loading file failed: {0}"
msgstr "Falló la carga del fichero: {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr "Cargar la Calibracióndel Archivo Mundial..."
@@ -29990,6 +30280,9 @@ msgstr ""
"Por favor utilice {0} para subir sus KML que hayan sido calibrados "
"incorrectamente."
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "Mover Capa de Imagen(PicLayer)"
@@ -30106,8 +30399,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "¿Desea aplicarlo?"
-msgid "Load calibration file ?"
-msgstr "¿Cargar archivo de calibración?"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr "Se aplicará automáticamente."
@@ -30349,9 +30642,6 @@ msgstr "Estado/Provincia"
msgid "pending"
msgstr "pendiente"
-msgid "outside"
-msgstr "fuera"
-
msgid "[incomplete]"
msgstr "[incompleto]"
diff --git a/i18n/po/et.po b/i18n/po/et.po
index 5c5dd9f..45f78cc 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-08-12 16:11+0000\n"
"Last-Translator: AivoK <aivo.kuhlberg at hot.ee>\n"
"Language-Team: Estonian <et at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:39+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:38+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: et\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -174,6 +174,12 @@ msgstr "Pluginad"
msgid "About JOSM..."
msgstr "JOSMi kohta"
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2200,14 +2206,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Vali, liiguta, skaleeri ja pööra objekte"
-msgid "Move elements"
-msgstr "Liiguta elemente"
-
-msgid "Move them"
-msgstr "Liiguta elemente"
-
-msgid "Undo move"
-msgstr "Võta liigutamine tagasi"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2226,6 +2228,15 @@ msgstr[1] ""
"sageli viga.\n"
"Kas liigutan tõesti?"
+msgid "Move elements"
+msgstr "Liiguta elemente"
+
+msgid "Move them"
+msgstr "Liiguta elemente"
+
+msgid "Undo move"
+msgstr "Võta liigutamine tagasi"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2423,6 +2434,9 @@ msgstr ""
msgid "add toolbar button"
msgstr "lisa nupuks tööriistareale"
+msgid "Invalid search expression"
+msgstr "Vigane otsinguavaldis"
+
msgid "Filter"
msgstr "Filter"
@@ -2444,9 +2458,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Vigane otsinguavaldis"
-
msgid "basic examples"
msgstr "lihtsad näited"
@@ -3257,12 +3268,12 @@ msgstr "Briti mõõdustik"
msgid "Nautical Mile"
msgstr "Meremiilid"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "TUNDMATU"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4854,6 +4865,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "Menüü: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "Redigeerimisriba"
@@ -5026,7 +5044,7 @@ msgstr "paanini"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5830,20 +5848,15 @@ msgstr "Lahenda vastuolud"
msgid "Resolve conflicts for ''{0}''"
msgstr "Lahenda \"{0}\" vastuolud"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7090,14 +7103,17 @@ msgstr "Sildid/Liikmed"
msgid "Tags for selected objects."
msgstr "Valitud objektide sildid"
+msgid "<different>"
+msgstr "<erinev>"
+
msgid "Member Of"
msgstr "On liikmeks järgnevas"
msgid "Position"
msgstr ""
-msgid "<different>"
-msgstr "<erinev>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -12146,6 +12162,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12312,6 +12331,9 @@ msgstr "Laadin alla punkte alates {0} kuni {1}..."
msgid "Contacting OSM Server..."
msgstr "Ühendun OSM serveriga..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -14194,6 +14216,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14800,6 +14826,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14827,7 +14856,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15403,6 +15435,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15548,6 +15583,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15588,6 +15628,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "Lihtne töövahend majanumbrite märkimiseks"
@@ -16028,9 +16073,21 @@ msgstr "muda"
msgid "Lanes"
msgstr "Rajad"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Suurim kiirus (km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Sild"
@@ -16098,6 +16155,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Kasutab elektrit"
@@ -16192,6 +16252,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr "Kõrgus (meetrites)"
@@ -16732,6 +16795,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "Kas veekogu on muutuv (sõltuvalt aastaajast)?"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16753,12 +16819,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr "gaas"
+
+msgid "heat"
+msgstr "soojus"
+
+msgid "oil"
+msgstr "õli"
+
+msgid "sewage"
+msgstr "kanalisatsioon"
+
+msgid "Support"
+msgstr "Kinnitus"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr "Tänavad"
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16860,6 +17002,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17399,12 +17544,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
-msgstr "Linnapiiri märk"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Kiiruskaamera"
@@ -17522,6 +17670,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17926,6 +18080,15 @@ msgstr ""
msgid "Pier"
msgstr "Kai"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18564,12 +18727,6 @@ msgstr "Lennujaam"
msgid "Airport Ground"
msgstr "Lennujaam"
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18753,6 +18910,9 @@ msgstr "Pisipruulikoda"
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Kiirtoit"
@@ -19415,25 +19575,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr "Kinnitus"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr "Nähtavus/loetavus"
@@ -20013,6 +20154,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -20211,32 +20360,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "Torustik"
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr "gaas"
-
-msgid "heat"
-msgstr "soojus"
-
-msgid "oil"
-msgstr "õli"
-
-msgid "sewage"
-msgstr "kanalisatsioon"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "veealune"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "maapealne"
-
msgid "Crane"
msgstr "Kraana"
@@ -20321,6 +20444,23 @@ msgstr "Stoll"
msgid "Length in meters"
msgstr "Pikkus meetrites"
+msgid "Pipeline"
+msgstr "Torustik"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "veealune"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "maapealne"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Veetorn"
@@ -20561,6 +20701,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21726,6 +21894,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Geograafia"
@@ -22065,6 +22324,29 @@ msgstr "Taluõu"
msgid "Farmland"
msgstr "Talumaa"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Niit/Karjamaa"
@@ -23048,6 +23330,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -23103,6 +23388,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -25088,7 +25379,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -25131,9 +25425,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27731,6 +28025,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27740,6 +28037,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr "Faili laadimine ebaõnnestus: {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27779,6 +28079,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27892,7 +28195,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -28129,9 +28432,6 @@ msgstr "Riik"
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/eu.po b/i18n/po/eu.po
index 4a2952d..69fb3fa 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-03-09 16:55+0000\n"
"Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
"Language-Team: Basque <eu at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:34+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:34+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: eu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -171,6 +171,12 @@ msgstr "Pluginak"
msgid "About JOSM..."
msgstr "JOSM-i buruz"
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "''{0}'' baliabidea ezin izan da kargatu, errorea hauxe: {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2217,14 +2223,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr "Elementuak mugitu"
-
-msgid "Move them"
-msgstr "Mugitu horiek guztiak"
-
-msgid "Undo move"
-msgstr "Mugimendua desegin"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2237,6 +2239,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr "Elementuak mugitu"
+
+msgid "Move them"
+msgstr "Mugitu horiek guztiak"
+
+msgid "Undo move"
+msgstr "Mugimendua desegin"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Askatu saguaren botoia errektanguluko objektuak hautatzeko."
@@ -2434,6 +2445,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr "Bilaketa baliogabea"
+
msgid "Filter"
msgstr "Iragazkia"
@@ -2455,9 +2469,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Bilaketa baliogabea"
-
msgid "basic examples"
msgstr ""
@@ -3286,12 +3297,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "''{0}'' baliabidea ezin izan da kargatu, errorea hauxe: {1}."
-
msgid "UNKNOWN"
msgstr "EZEZAGUNA"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4920,6 +4931,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "Menua: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -5096,7 +5114,7 @@ msgstr "koadrora"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5919,26 +5937,15 @@ msgstr "Gatazkak konpondu"
msgid "Resolve conflicts for ''{0}''"
msgstr "Gatazkak konpondu \"{0}\"(r)entzat"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Mesedez, konfirmatu <strong>objektu 1</strong> ezabatzeko "
-"<strong>erlazio 1etik</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Mesedez, konfirmatu <strong>objektu 1</strong> ezabatzeko <strong>{0} "
-"erlaziotatik</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Mesedez, konfirmatu <strong>{0} objektu</strong> ezabatzeko "
-"<strong>{1} erlaziotatik</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7173,14 +7180,17 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr "<ezberdina>"
+
msgid "Member Of"
msgstr "Partaidea"
msgid "Position"
msgstr "Kokapena"
-msgid "<different>"
-msgstr "<ezberdina>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -12138,6 +12148,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12300,6 +12313,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr "OSM zerbitzariarekin konektatzen..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -14142,6 +14158,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14748,6 +14768,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14775,7 +14798,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15351,6 +15377,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15501,6 +15530,11 @@ msgstr ""
"Denbora-markak era anonimoan egiteko eta GPX arrasto handiak ezabatzeko "
"aukera ematen du."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15540,6 +15574,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr "Bideratze-informazioa bideratze-grafo moduan erakusten du."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -16011,9 +16050,21 @@ msgstr "lokatza"
msgid "Lanes"
msgstr "Erreiak"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Gehienezko abiadura (km/o)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Zubia"
@@ -16081,6 +16132,9 @@ msgstr "hildako-bidea"
msgid "spur"
msgstr "Adarra"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Elektrifikatua"
@@ -16175,6 +16229,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr "Altuera (metrotan)"
@@ -16715,6 +16772,9 @@ msgstr "Ordainsaria"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16736,12 +16796,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr "gasa"
+
+msgid "heat"
+msgstr "termikoa"
+
+msgid "oil"
+msgstr "olioa"
+
+msgid "sewage"
+msgstr "hondakin-ura"
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Kaleak"
msgid "Motorway"
msgstr "Autobide"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Autobide-lotura"
@@ -16843,6 +16979,9 @@ msgstr "aparkalekuetako-bidea"
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Aparkalekuetako-bidea"
@@ -17382,12 +17521,15 @@ msgstr "Biraketa-zirkulua"
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
-msgstr "Hiriaren muga"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Bigarren izena"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Abiadura radarra"
@@ -17505,6 +17647,12 @@ msgstr ""
msgid "Wall"
msgstr "Horma"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Harresia"
@@ -17909,6 +18057,15 @@ msgstr "CNG (Konprimitutako Gas Naturala)"
msgid "Pier"
msgstr "Ontziralekua"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Esklusa"
@@ -18547,12 +18704,6 @@ msgstr "Aireportua"
msgid "Airport Ground"
msgstr "Aireportu-eremua"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Pista"
@@ -18736,6 +18887,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Otordu lasterreko jatetxea"
@@ -19398,25 +19552,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19996,6 +20131,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -20194,32 +20337,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "Hodiak"
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr "gasa"
-
-msgid "heat"
-msgstr "termikoa"
-
-msgid "oil"
-msgstr "olioa"
-
-msgid "sewage"
-msgstr "hondakin-ura"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr "Garabia"
@@ -20304,6 +20421,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr "Hodiak"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Ur-dorrea"
@@ -20544,6 +20678,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21709,6 +21871,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Geografia"
@@ -22048,6 +22301,29 @@ msgstr "Etxaldea"
msgid "Farmland"
msgstr "Nekazaritza-lurra"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Belardia"
@@ -23031,6 +23307,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -23086,6 +23365,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -25060,7 +25345,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -25103,9 +25391,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27695,6 +27983,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27704,6 +27995,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27743,6 +28037,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27856,7 +28153,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -28093,9 +28390,6 @@ msgstr "Estatua"
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/fa.po b/i18n/po/fa.po
index 63ba337..a35a8b1 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2014-03-18 07:32+0000\n"
"Last-Translator: Saeed Ghazi Joolaee <Unknown>\n"
"Language-Team: Persian <fa at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:53+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:53+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: fa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr "افزونهها"
msgid "About JOSM..."
msgstr "درباره JOSM ..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2200,13 +2206,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2220,6 +2222,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2414,6 +2425,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2432,9 +2446,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3229,10 +3240,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4825,6 +4836,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4997,7 +5015,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5799,20 +5817,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7044,13 +7057,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -12012,6 +12028,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12174,6 +12193,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -14010,6 +14032,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14616,6 +14642,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14643,7 +14672,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15219,6 +15251,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15364,6 +15399,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15402,6 +15442,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15835,9 +15880,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15905,6 +15962,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15999,6 +16059,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16539,6 +16602,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16560,12 +16626,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16667,6 +16809,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17206,12 +17351,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17329,6 +17477,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17733,6 +17887,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18371,12 +18534,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18560,6 +18717,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19222,25 +19382,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19820,6 +19961,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -20018,32 +20167,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20128,6 +20251,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20368,6 +20508,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21533,6 +21701,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21872,6 +22131,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22855,6 +23137,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22910,6 +23195,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24884,7 +25175,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24927,9 +25221,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27514,6 +27808,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27523,6 +27820,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27562,6 +27862,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27675,7 +27978,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27912,9 +28215,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/fi.po b/i18n/po/fi.po
index 6470474..992312c 100644
--- a/i18n/po/fi.po
+++ b/i18n/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-10-16 12:02+0000\n"
"Last-Translator: Lauri Kytömaa <Unknown>\n"
"Language-Team: Finnish <fi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:40+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:39+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: fi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -173,6 +173,12 @@ msgstr "Liitännäiset"
msgid "About JOSM..."
msgstr "Tietoja JOSM:sta..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Resurssin \"{0}\" lataus epäonnistui. Virhe on {1}"
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2299,14 +2305,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Valitse, siirrä, skaalaa ja pyöritä objekteja"
-msgid "Move elements"
-msgstr "Siirrä objekteja"
-
-msgid "Move them"
-msgstr "Toteuta siirto"
-
-msgid "Undo move"
-msgstr "Kumoa siirto"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2325,6 +2327,15 @@ msgstr[1] ""
"kerralla on\n"
"yleensä vahinko. Haluatko varmasti siirtää niitä?"
+msgid "Move elements"
+msgstr "Siirrä objekteja"
+
+msgid "Move them"
+msgstr "Toteuta siirto"
+
+msgid "Undo move"
+msgstr "Kumoa siirto"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
"Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet."
@@ -2531,6 +2542,9 @@ msgstr "MapCSS-valitsin"
msgid "add toolbar button"
msgstr "lisää painike työkaluriville"
+msgid "Invalid search expression"
+msgstr "Virhe hakulausekkeessa"
+
msgid "Filter"
msgstr "Suodin"
@@ -2552,9 +2566,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Virhe hakulausekkeessa"
-
msgid "basic examples"
msgstr "perusesimerkit"
@@ -3400,12 +3411,12 @@ msgstr "Imperiaalinen"
msgid "Nautical Mile"
msgstr "Merimaili"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Resurssin \"{0}\" lataus epäonnistui. Virhe on {1}"
-
msgid "UNKNOWN"
msgstr "TUNTEMATON"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
"Revisiotiedostosta luettu JOSM:n versionumero poikkeaa odotetusta, luettiin "
@@ -5068,6 +5079,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "Valikko: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "Näytä työkalupalkki"
@@ -5244,13 +5262,10 @@ msgstr "ruutuun"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Voit myös syöttää <strong>laattaosoitteen</strong> yhteen "
-"karttalaattaan muodossa <i>zoom-taso/x/y</i>, esim. <i>15/256/223</i>. Myös "
-"muodot <i>zoom,x,y</i> ja <i>zoom;x;y</i> hyväksytään.</html>"
msgid "Tile address:"
msgstr "Ruutuosoite:"
@@ -6093,26 +6108,15 @@ msgstr "Selvitä ristiriidat"
msgid "Resolve conflicts for ''{0}''"
msgstr "Ratkaise ristiriidat kohteelle \"{0}\""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Vahvista <strong>1 objektin</strong> poistaminen <strong>1 "
-"relaatiosta</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Vahvista <strong>1 objektin</strong> poistaminen <strong>{0} "
-"relaatiosta</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Vahvista <strong>{0} objektin</strong> poistaminen <strong>{1} "
-"relaatiosta</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7411,14 +7415,17 @@ msgstr "Tagit/Relaatiojäsenyydet"
msgid "Tags for selected objects."
msgstr "Näytä valittujen kohteiden tagit."
+msgid "<different>"
+msgstr "<eri>"
+
msgid "Member Of"
msgstr "Jäsenyydet"
msgid "Position"
msgstr "Sijainti"
-msgid "<different>"
-msgstr "<eri>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -12705,6 +12712,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12880,6 +12890,9 @@ msgstr "Ladataan pisteet {0}-{1}..."
msgid "Contacting OSM Server..."
msgstr "Yhdistetään OSM-palvelimeen..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -14838,6 +14851,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -15444,6 +15461,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -15471,7 +15491,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -16047,6 +16070,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -16200,6 +16226,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr "Näyttää GPX-tiedoston korkeusprofiilin ja joitain tilastotietoja."
@@ -16241,6 +16272,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -16702,9 +16738,21 @@ msgstr "muta"
msgid "Lanes"
msgstr "Kaistat"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Maksiminopeus (km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Silta"
@@ -16772,6 +16820,9 @@ msgstr "sivuraide"
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -16866,6 +16917,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr "Korkeus (metriä)"
@@ -17406,6 +17460,9 @@ msgstr "Tietulli"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -17427,12 +17484,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "vesi"
+
+msgid "gas"
+msgstr "kaasu"
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr "Asennuspaikka"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "pylväs"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Tiet"
msgid "Motorway"
msgstr "Moottoritie"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Moottoritien ramppi"
@@ -17534,6 +17667,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Pysäköintialueen ajoväylä"
@@ -18075,12 +18211,15 @@ msgstr "Kääntöympyrä"
msgid "Turning Loop"
msgstr "Kääntösilmukka"
-msgid "City Limit"
-msgstr "Taajama -liikennemerkki"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Nopeuskamera"
@@ -18198,6 +18337,12 @@ msgstr "Reunakaide"
msgid "Wall"
msgstr "Muuri"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Kaupunginmuuri"
@@ -18602,6 +18747,15 @@ msgstr ""
msgid "Pier"
msgstr "Laituri"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Sulkuportti"
@@ -19240,12 +19394,6 @@ msgstr "Lentokenttä"
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Kiitorata"
@@ -19429,6 +19577,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Pikaruoka"
@@ -20091,25 +20242,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr "Asennuspaikka"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "pylväs"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr "Näkyvyysalue"
@@ -20689,6 +20821,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -20887,32 +21027,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "Putki"
-
-msgid "water"
-msgstr "vesi"
-
-msgid "gas"
-msgstr "kaasu"
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr "Nosturi"
@@ -20997,6 +21111,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr "Putki"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Vesitorni"
@@ -21237,6 +21368,34 @@ msgstr ""
msgid "Bridge outline"
msgstr "Sillan ääriviivat"
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "Voimalaitos"
@@ -22402,6 +22561,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Maantiede"
@@ -22741,6 +22991,29 @@ msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)"
msgid "Farmland"
msgstr "Peltoalueet"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Niitty"
@@ -23739,6 +24012,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -23794,6 +24070,12 @@ msgstr "Näytä katujen nimet (lähelle tarkennettaessa)"
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV -tiedostot"
@@ -25798,7 +26080,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -25841,9 +26126,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -28470,6 +28755,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Haluatko tallentaa kuvatason {0} nykyisen kalibroinnin?"
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "Avaa kuvan kalibrointi"
@@ -28479,6 +28767,9 @@ msgstr "Lataa kuvan kalibrointitiedot tiedostosta"
msgid "Loading file failed: {0}"
msgstr "Tiedoston lataaminen epäonnistui: {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -28518,6 +28809,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "PicLayer: siirrä kuvaa"
@@ -28635,8 +28929,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
-msgstr "Ladataanko kalibrointitiedosto?"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr ""
@@ -28873,9 +29167,6 @@ msgstr "Osavaltio"
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/fil.po b/i18n/po/fil.po
index 7e64951..7c22d37 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2011-06-19 14:15+0000\n"
"Last-Translator: Anthony Balico <Unknown>\n"
"Language-Team: Filipino <fil at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 05:06+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 05:06+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: fil\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,10 +3171,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/fo.po b/i18n/po/fo.po
index 3bb14bb..e62fd3d 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-02-28 16:15+0000\n"
"Last-Translator: LiFo <Unknown>\n"
"Language-Team: Faroese <fo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:39+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:39+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}: valmøguleiki ''{1}'' er tvítýddur"
@@ -168,6 +168,12 @@ msgstr "Ískoytisforrit"
msgid "About JOSM..."
msgstr ""
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2130,13 +2136,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2150,6 +2152,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2344,6 +2355,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2362,9 +2376,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3159,10 +3170,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4756,6 +4767,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4928,7 +4946,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5730,20 +5748,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6975,13 +6988,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11938,6 +11954,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12100,6 +12119,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13936,6 +13958,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14542,6 +14568,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14569,7 +14598,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15145,6 +15177,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15290,6 +15325,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15328,6 +15368,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15761,9 +15806,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15831,6 +15888,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15925,6 +15985,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16465,6 +16528,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16486,12 +16552,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16593,6 +16735,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17132,12 +17277,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17255,6 +17403,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17659,6 +17813,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18297,12 +18460,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18486,6 +18643,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19148,25 +19308,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19746,6 +19887,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19944,32 +20093,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20054,6 +20177,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20294,6 +20434,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21459,6 +21627,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21798,6 +22057,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22781,6 +23063,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22836,6 +23121,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24810,7 +25101,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24853,9 +25147,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27440,6 +27734,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27449,6 +27746,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27488,6 +27788,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27601,7 +27904,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27838,9 +28141,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/fr.po b/i18n/po/fr.po
index 365d5d7..c8d860d 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-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-29 07:28+0000\n"
-"Last-Translator: the_knife <pierre.yves.berrard at gmail.com>\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-22 14:03+0000\n"
+"Last-Translator: Jean-Marc <Unknown>\n"
"Language-Team: Fr <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:40+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:40+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: fr\n"
"X-Poedit-Bookmarks: 1767,-1,-1,2669,-1,-1,-1,-1,-1,-1\n"
@@ -175,6 +175,12 @@ msgstr "Greffons"
msgid "About JOSM..."
msgstr "À propos de JOSM"
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "La ressource ''{0}'' n’a pas pu être chargée. Erreur : {1}"
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2326,14 +2332,12 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Sélectionner, déplacer, étendre et faire pivoter des objets"
-msgid "Move elements"
-msgstr "Déplacer les éléments"
-
-msgid "Move them"
-msgstr "Déplacer"
-
-msgid "Undo move"
-msgstr "Annuler le déplacement"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
+"Êtes-vous sûr de vouloir supprimer les éléments faisant partie de chemins "
+"qui sont cachés par les filtres ?"
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2352,6 +2356,15 @@ msgstr[1] ""
"est souvent une erreur.\n"
"Voulez-vous réellement les déplacer ?"
+msgid "Move elements"
+msgstr "Déplacer les éléments"
+
+msgid "Move them"
+msgstr "Déplacer"
+
+msgid "Undo move"
+msgstr "Annuler le déplacement"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
"Relâcher le bouton de la souris pour sélectionner les objets dans le "
@@ -2557,6 +2570,9 @@ msgstr "Sélecteur MapCSS"
msgid "add toolbar button"
msgstr "Bouton de la barre d’outils"
+msgid "Invalid search expression"
+msgstr "L’expression de recherche n’est pas valide"
+
msgid "Filter"
msgstr "Filtrer"
@@ -2578,9 +2594,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "L’expression de recherche n’est pas valide"
-
msgid "basic examples"
msgstr "Exemples de base"
@@ -3469,12 +3482,12 @@ msgstr "Impérial"
msgid "Nautical Mile"
msgstr "Mile nautique"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "La ressource ''{0}'' n’a pas pu être chargée. Erreur : {1}"
-
msgid "UNKNOWN"
msgstr "inconnue"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
"Numéro de version de JOSM inattendu dans le fichier de révision, la valeur "
@@ -5173,7 +5186,7 @@ msgid "Presets"
msgstr "Préréglages"
msgid "More..."
-msgstr "Plus…"
+msgstr "Plus..."
msgctxt "menu"
msgid "GPS"
@@ -5190,6 +5203,13 @@ msgstr "Aide"
msgid "Menu: {0}"
msgstr "Menu : {0}"
+msgid "Main toolbar"
+msgstr "Barre d''outils principale"
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "Barre d’outils d’édition"
@@ -5368,13 +5388,10 @@ msgstr "À la tuile"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Vous pouvez entrer <strong>l’adresse d’une tuile</strong> au format "
-"<i>zoom/x/y</i>, par exemple <i>15/256/223</i>. Les adresses au format "
-"<i>zoom,x,y</i> ou <i>zoom;x;y</i> sont aussi valides.</html>"
msgid "Tile address:"
msgstr "Adresse de la dalle :"
@@ -6266,27 +6283,15 @@ msgstr "Résoudre les conflits"
msgid "Resolve conflicts for ''{0}''"
msgstr "Résoudre les conflits pour ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Veuillez confirmer la suppression d’<strong>un objet</strong> depuis "
-"<strong>une relation</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"Copy text \t\r\n"
-"<html>Veuillez confirmer le retrait de <strong>1 objet</strong> de "
-"<strong>{0} relations</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Veuillez confirmer la suppression de<strong>{0} objets</strong> depuis "
-"<strong>{1} relation</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7616,14 +7621,17 @@ msgstr "Attributs/Appartenance"
msgid "Tags for selected objects."
msgstr "Attributs pour les objets sélectionnés."
+msgid "<different>"
+msgstr "<différent>"
+
msgid "Member Of"
msgstr "Membre de"
msgid "Position"
msgstr "Position"
-msgid "<different>"
-msgstr "<différent>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Objets: {2} / Attributs: {0} / Membres: {1}"
@@ -12602,10 +12610,10 @@ msgid "Enable HTTPS support"
msgstr "Activer le support du HTTPS"
msgid "Install..."
-msgstr "Installe…"
+msgstr "Installer..."
msgid "Uninstall..."
-msgstr "Désinstalle…"
+msgstr "Désinstaller..."
msgid "Install JOSM localhost certificate to system/browser root keystores"
msgstr ""
@@ -13192,6 +13200,9 @@ msgstr ""
"Le modèle d’attributs ''{0}-{1}'' n’est pas valide - ''display_values'' doit "
"avoir le même nombre d’éléments que ''values''"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13381,6 +13392,9 @@ msgstr "Téléchargement des points {0} à {1}…"
msgid "Contacting OSM Server..."
msgstr "Connexion au serveur OSM…"
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "L’ouverture du flux d’entrée pour la ressource ''{0}'' a échoué"
@@ -14837,10 +14851,10 @@ msgid "Plugin list download error"
msgstr "Erreur de téléchargemnt de la liste des plugins"
msgid "JOSM failed to download plugin list:"
-msgstr "JOSM n’à pas réussi à télécharger la liste des plugins"
+msgstr "JOSM n’à pas réussi à télécharger la liste des greffons"
msgid "Details:"
-msgstr "Détails:"
+msgstr "Détails :"
msgid ""
"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
@@ -14850,10 +14864,10 @@ msgstr ""
"cache la liste de greffon à partir du site de greffon ''{1}''."
msgid "Writing plugin list to local cache ''{0}''"
-msgstr "Écriture de la liste des greffons dans le cache ''{0}''"
+msgstr "Écriture de la liste des greffons dans le cache « {0} »"
msgid "Parsing plugin list from site ''{0}''"
-msgstr "Analyse de la liste des greffons du site ''{0}''"
+msgstr "Analyse de la liste des greffons du site « {0} »"
msgid ""
"Failed to parse plugin list document from site ''{0}''. Skipping site. "
@@ -15627,6 +15641,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "broussailles"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "associatedStreet"
@@ -16241,6 +16259,9 @@ msgstr "Imagerie drone (Haïti)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Imagerie drone 2014 (Haïti)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Irlande Bureau de la guerre britannique 1:25k GSGS 3906"
@@ -16268,7 +16289,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -16847,6 +16871,9 @@ msgstr "Plans de ville Ordnance Survey, Nairn 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "Plans de ville Ordnance Survey, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "Plans de ville Ordnance Survey, Peebles 1856 (NLS)"
@@ -17017,6 +17044,11 @@ msgstr ""
"Permet à un utilisateur de rendre anonyme l’horodatage et de supprimer les "
"parties d’une trace GPX très rapidement."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr "Affiche le profil d’élévation et les statistiques d’une trace GPX."
@@ -17064,6 +17096,11 @@ msgstr "Permet de filtrer les traces GPS inutiles"
msgid "Visualizes routing information as a routing graph."
msgstr "Visualise les informations comme un calque de calcul d’itinéraire."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "Outil basique d’’édition des numéros de rue."
@@ -17595,9 +17632,21 @@ msgstr "terrain boueux"
msgid "Lanes"
msgstr "Nombre de voies"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Vitesse maximale (km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Pont"
@@ -17665,6 +17714,9 @@ msgstr "de garage"
msgid "spur"
msgstr "d’embranchement"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Électrifié"
@@ -17759,6 +17811,9 @@ msgstr "séparé"
msgid "isolated"
msgstr "isolé"
+msgid "outside"
+msgstr "en dehors"
+
msgid "Height (meters)"
msgstr "Hauteur (mètres)"
@@ -18306,6 +18361,9 @@ msgstr ""
"Est-ce que la masse d''eau est intermittente (disparaît-elle "
"saisonnièrement) ?"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr "buse"
@@ -18327,12 +18385,88 @@ msgstr "Bateau à moteur"
msgid "Canoe"
msgstr "Canoé"
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "eau"
+
+msgid "gas"
+msgstr "turbine à gaz"
+
+msgid "heat"
+msgstr "chaleur"
+
+msgid "oil"
+msgstr "pétrole"
+
+msgid "sewage"
+msgstr "égouts"
+
+msgid "Support"
+msgstr "Support"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "poteau"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "mural"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "panneau dʼaffichage"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "au sol"
+
+msgid "IATA"
+msgstr "Code AITA"
+
+msgid "ICAO"
+msgstr "Code OACI"
+
msgid "Streets"
msgstr "Routes"
msgid "Motorway"
msgstr "Autoroute"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Bretelle d’accès à une autoroute"
@@ -18434,6 +18568,9 @@ msgstr "voie de parking"
msgid "drive-through"
msgstr "drive-through"
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Voie de parking"
@@ -18990,12 +19127,15 @@ msgstr "Rondpoint interne"
msgid "Turning Loop"
msgstr "Boucle de retournement"
-msgid "City Limit"
-msgstr "Limite communale"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Nom secondaire"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Radar fixe"
@@ -19115,6 +19255,12 @@ msgstr "Glissière de sécurité"
msgid "Wall"
msgstr "Mur"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Rempart"
@@ -19529,6 +19675,15 @@ msgstr "GNV (Gaz Naturel pour Véhicules)"
msgid "Pier"
msgstr "Jetée, ponton"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Écluse"
@@ -20170,12 +20325,6 @@ msgstr "Aéroport"
msgid "Airport Ground"
msgstr "Aéroport"
-msgid "IATA"
-msgstr "Code AITA"
-
-msgid "ICAO"
-msgstr "Code OACI"
-
msgid "Runway"
msgstr "Piste"
@@ -20359,6 +20508,9 @@ msgstr "Microbrasserie"
msgid "Outdoor seating"
msgstr "terrasse"
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast-food"
@@ -21026,25 +21178,6 @@ msgstr "cadran solaire"
msgid "unorthodox"
msgstr "originale"
-msgid "Support"
-msgstr "Support"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "poteau"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "mural"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "panneau dʼaffichage"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "au sol"
-
msgid "Visibility/readability"
msgstr "Visibilité"
@@ -21624,6 +21757,14 @@ msgid "barn"
msgstr "hangar agricole"
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "Dépendance de ferme"
@@ -21822,32 +21963,6 @@ msgstr "vin"
msgid "Bunker Silo"
msgstr "Silo en béton"
-msgid "Pipeline"
-msgstr "Canalisation"
-
-msgid "water"
-msgstr "eau"
-
-msgid "gas"
-msgstr "turbine à gaz"
-
-msgid "heat"
-msgstr "chaleur"
-
-msgid "oil"
-msgstr "pétrole"
-
-msgid "sewage"
-msgstr "égouts"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "sous-marin"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "au dessus du sol"
-
msgid "Crane"
msgstr "Grue"
@@ -21932,6 +22047,23 @@ msgstr "Entrée de mine"
msgid "Length in meters"
msgstr "Longueur (mètres)"
+msgid "Pipeline"
+msgstr "Canalisation"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "sous-marin"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "au dessus du sol"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Château d’eau"
@@ -22172,6 +22304,34 @@ msgstr ""
msgid "Bridge outline"
msgstr "Limite du pont"
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "Centrale électrique"
@@ -23344,6 +23504,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Géographie"
@@ -23699,6 +23950,29 @@ msgstr "Ferme"
msgid "Farmland"
msgstr "Terre arable"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Prairie"
@@ -24713,6 +24987,9 @@ msgstr "{0} doit être une valeur numérique"
msgid "{0} must be a positive integer number"
msgstr "{0} doit être un nombre entier positif"
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr "relation sans type"
@@ -24771,6 +25048,12 @@ msgid "Use alternative turn restriction icon set"
msgstr ""
"Utiliser un jeu d’icônes alternatif pour les interdictions de tourner"
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Fichiers CSV de Columbus V-900"
@@ -26965,22 +27248,22 @@ msgid "Invalid reference or subject"
msgstr "Référence ou sujet invalide"
msgid "Download OSM data continuously"
-msgstr ""
+msgstr "Télécharger les données OSM en continu"
msgid "Download map data continuously when paning and zooming."
-msgstr ""
+msgstr "Télécharger les données de carte en continu en se déplaçant"
msgid "Toggle the continuous download on/off"
msgstr ""
msgid "Download Settings"
-msgstr ""
+msgstr "Paramètres de téléchargement"
msgid "Settings for the continuous download."
-msgstr ""
+msgstr "Paramètres pour le téléchargement en continu"
msgid "Activate continuous downloads at startup."
-msgstr ""
+msgstr "Activer le téléchargement en continu au démarrage"
msgid "Supress the default modal progress monitor when downloading."
msgstr ""
@@ -26992,7 +27275,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -27010,7 +27296,7 @@ msgid ""
msgstr ""
msgid "Wait time (milliseconds)"
-msgstr ""
+msgstr "Temps d''attente (millisecondes)"
msgid ""
"How much extra area around the viewport is it going to download. Setting "
@@ -27032,12 +27318,12 @@ msgid "The strategy for finding what areas to request from the server."
msgstr ""
msgid "Download strategy"
-msgstr ""
+msgstr "Stratégie de téléchargement"
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -28577,7 +28863,7 @@ msgid "Days"
msgstr "Jours"
msgid "Imported images"
-msgstr ""
+msgstr "Images importées"
msgid "Mapillary filter"
msgstr "filtre Mapillary"
@@ -29806,6 +30092,9 @@ msgstr "Images non balisées"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Voulez-vous enregistrer le calibrage du calque {0} ?"
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "Charger l’étalonnage de l’image…"
@@ -29815,6 +30104,9 @@ msgstr "Charge les données de calibration d’un fichier"
msgid "Loading file failed: {0}"
msgstr "Le chargement du fichier a échoué : {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr "Chargement du fichier de calibrage mondial..."
@@ -29857,6 +30149,9 @@ msgstr ""
"calibrés !\n"
"Veuillez utiliser {0} pour télécharger vos KML mal calibrés."
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "déplacement PicLayer"
@@ -29974,8 +30269,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "Voulez-vous l’appliquer ?"
-msgid "Load calibration file ?"
-msgstr "Charger le fichier de calibration ?"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr "Il sera appliqué automatiquement."
@@ -30216,9 +30511,6 @@ msgstr "Département"
msgid "pending"
msgstr "en attente"
-msgid "outside"
-msgstr "en dehors"
-
msgid "[incomplete]"
msgstr "[incomplet]"
diff --git a/i18n/po/ga.po b/i18n/po/ga.po
index baf0622..eef9365 100644
--- a/i18n/po/ga.po
+++ b/i18n/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-05-17 11:43+0000\n"
"Last-Translator: Thorsten <Unknown>\n"
"Language-Team: Irish <ga at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:42+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:41+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -168,6 +168,12 @@ msgstr "Breiseáin"
msgid "About JOSM..."
msgstr ""
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2130,13 +2136,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2150,6 +2152,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2344,6 +2355,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2362,9 +2376,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3159,10 +3170,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4756,6 +4767,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4928,7 +4946,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5730,20 +5748,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6975,13 +6988,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11938,6 +11954,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12100,6 +12119,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13936,6 +13958,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14542,6 +14568,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14569,7 +14598,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15145,6 +15177,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15290,6 +15325,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15328,6 +15368,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15761,9 +15806,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15831,6 +15888,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15925,6 +15985,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16465,6 +16528,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16486,12 +16552,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16593,6 +16735,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17132,12 +17277,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17255,6 +17403,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17659,6 +17813,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18297,12 +18460,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18486,6 +18643,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19148,25 +19308,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19746,6 +19887,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19944,32 +20093,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20054,6 +20177,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20294,6 +20434,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21459,6 +21627,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21798,6 +22057,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22781,6 +23063,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22836,6 +23121,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24810,7 +25101,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24853,9 +25147,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27440,6 +27734,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27449,6 +27746,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27488,6 +27788,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27601,7 +27904,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27838,9 +28141,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/gl.po b/i18n/po/gl.po
index 9f871ba..298cebb 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\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-10-30 04:42+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:42+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: gl\n"
"X-Poedit-Language: Galician\n"
@@ -177,6 +177,12 @@ msgstr "Complementos"
msgid "About JOSM..."
msgstr "Sobre JOSM…"
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Produciuse un fallou ao cargar o recurso «{0}» o erro é {1}"
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2289,14 +2295,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr "Mover elementos"
-
-msgid "Move them"
-msgstr "Movelos"
-
-msgid "Undo move"
-msgstr "Desfacer mover"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2309,6 +2311,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr "Mover elementos"
+
+msgid "Move them"
+msgstr "Movelos"
+
+msgid "Undo move"
+msgstr "Desfacer mover"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Soltar o botón do rato para escoller os obxectos do rectángulo."
@@ -2505,6 +2516,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr "Expresión de procura inválida"
+
msgid "Filter"
msgstr "Filtrar"
@@ -2526,9 +2540,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Expresión de procura inválida"
-
msgid "basic examples"
msgstr ""
@@ -3354,12 +3365,12 @@ msgstr "Imperial"
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Produciuse un fallou ao cargar o recurso «{0}» o erro é {1}"
-
msgid "UNKNOWN"
msgstr "DESCOÑECIDO"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4982,6 +4993,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "Menú: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -5158,7 +5176,7 @@ msgstr "ata a tesela"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -6019,26 +6037,15 @@ msgstr "Resolver conflitos"
msgid "Resolve conflicts for ''{0}''"
msgstr "Resolver os conflitos de ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Confirme a retirada de <strong>1 obxecto</strong> de <strong>1 "
-"relación</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Confirme a retirada de <strong>1 obxecto</strong> de <strong>{0} "
-"relacións</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Confirme a retirada<strong>{0} obxectos</strong> de <strong>{1} "
-"relacións</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7308,14 +7315,17 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr "<diferente>"
+
msgid "Member Of"
msgstr "Membro de"
msgid "Position"
msgstr "Posición"
-msgid "<different>"
-msgstr "<diferente>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -12394,6 +12404,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12573,6 +12586,9 @@ msgstr "Descargando os puntos {0} a {1}…"
msgid "Contacting OSM Server..."
msgstr "Contactando co Servidor OSM…"
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -14475,6 +14491,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -15081,6 +15101,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -15108,7 +15131,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15684,6 +15710,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15831,6 +15860,11 @@ msgstr ""
"Permítelle ao usuario anonimizar marcas de tempo e eliminar partes de "
"camiños GPX enormes moi rápido."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15870,6 +15904,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -16335,9 +16374,21 @@ msgstr "lodazal"
msgid "Lanes"
msgstr "Carriles"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Velocidade Máx.(km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Ponte"
@@ -16405,6 +16456,9 @@ msgstr "vía moerta"
msgid "spur"
msgstr "ramal"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Electrificado"
@@ -16499,6 +16553,9 @@ msgstr "separado"
msgid "isolated"
msgstr "aislado"
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr "Altura (en metros)"
@@ -17039,6 +17096,9 @@ msgstr "Peaxe"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -17060,12 +17120,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "auga"
+
+msgid "gas"
+msgstr "gas"
+
+msgid "heat"
+msgstr "térmico"
+
+msgid "oil"
+msgstr "aceite"
+
+msgid "sewage"
+msgstr "augas residuais"
+
+msgid "Support"
+msgstr "Asistencia técnica"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Rúas"
msgid "Motorway"
msgstr "Autoestrada"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Enlace de autopista"
@@ -17167,6 +17303,9 @@ msgstr "corredor de aparcamento"
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Corredor de aparcamento"
@@ -17706,12 +17845,15 @@ msgstr "Círculo de giro"
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
-msgstr "Límite de Cidade"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Nombre alternativo"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Rádar de tráfico"
@@ -17829,6 +17971,12 @@ msgstr ""
msgid "Wall"
msgstr "Parede"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Muralla da cidade"
@@ -18234,6 +18382,15 @@ msgstr "GCN(Gas Natural Comprimido)"
msgid "Pier"
msgstr "Embarcadoiro"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Esclusa"
@@ -18872,12 +19029,6 @@ msgstr "Aeroporto"
msgid "Airport Ground"
msgstr "Campo de aviación"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Pista"
@@ -19061,6 +19212,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Comida rápida"
@@ -19723,25 +19877,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr "Asistencia técnica"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -20321,6 +20456,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -20519,32 +20662,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "Tubería"
-
-msgid "water"
-msgstr "auga"
-
-msgid "gas"
-msgstr "gas"
-
-msgid "heat"
-msgstr "térmico"
-
-msgid "oil"
-msgstr "aceite"
-
-msgid "sewage"
-msgstr "augas residuais"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "baixo auga"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "sobre a terra"
-
msgid "Crane"
msgstr "Grúa"
@@ -20629,6 +20746,23 @@ msgstr ""
msgid "Length in meters"
msgstr "Lonxitude en metros"
+msgid "Pipeline"
+msgstr "Tubería"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "baixo auga"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "sobre a terra"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Torre de auga"
@@ -20869,6 +21003,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -22034,6 +22196,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Xeografía"
@@ -22373,6 +22626,29 @@ msgstr "Edificio agrario"
msgid "Farmland"
msgstr "Terra de labor"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Prado"
@@ -23356,6 +23632,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -23411,6 +23690,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Ficheiros CSV de Columbus V-900"
@@ -25400,7 +25685,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -25443,9 +25731,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -28042,6 +28330,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -28051,6 +28342,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr "Produciuse un fallo ao cargar o ficheiro: {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -28090,6 +28384,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -28203,7 +28500,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -28440,9 +28737,6 @@ msgstr "Estado"
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/he.po b/i18n/po/he.po
index 0bb9f78..75e8afe 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2013-03-30 13:38+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Hebrew <he at li.org>\n"
@@ -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-10-30 04:43+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:43+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: he\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr "תוספים"
msgid "About JOSM..."
msgstr "אודות JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2139,13 +2145,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2159,6 +2161,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "שחרר את לחצן העכבר לבחירת פריטים במרובע."
@@ -2353,6 +2364,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2371,9 +2385,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3173,12 +3184,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "לא ידוע"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4774,6 +4785,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "תפריט: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4946,7 +4964,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5756,20 +5774,15 @@ msgstr "פתור התנגשויות"
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7002,14 +7015,17 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr "<שונה>"
+
msgid "Member Of"
msgstr "חבר ב"
msgid "Position"
msgstr ""
-msgid "<different>"
-msgstr "<שונה>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -11976,6 +11992,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12138,6 +12157,9 @@ msgstr "מוריד נקודות {0} עד {1}..."
msgid "Contacting OSM Server..."
msgstr "מתחבר לשרת OSM..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13978,6 +14000,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14584,6 +14610,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14611,7 +14640,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15187,6 +15219,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15332,6 +15367,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15370,6 +15410,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15803,9 +15848,21 @@ msgstr "בוץ"
msgid "Lanes"
msgstr "מסלולים"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "מהירות מירבית (קמ\"ש)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "גשר"
@@ -15873,6 +15930,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15967,6 +16027,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16507,6 +16570,9 @@ msgstr "אגרה"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16528,12 +16594,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "מים"
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr "רחובות"
msgid "Motorway"
msgstr "כבישים"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16635,6 +16777,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "מפרץ חנייה"
@@ -17174,12 +17319,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
-msgstr "תחום עיר"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "שם שני"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "מצלמת מהירות"
@@ -17297,6 +17445,12 @@ msgstr ""
msgid "Wall"
msgstr "חומה"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "חומת עיר"
@@ -17701,6 +17855,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18339,12 +18502,6 @@ msgstr "שדה תעופה"
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18528,6 +18685,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "מזון מהיר"
@@ -19190,25 +19350,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19788,6 +19929,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19986,32 +20135,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "צינור"
-
-msgid "water"
-msgstr "מים"
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20096,6 +20219,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr "צינור"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "מגדל מים"
@@ -20336,6 +20476,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21501,6 +21669,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21840,6 +22099,29 @@ msgstr "חצר משק"
msgid "Farmland"
msgstr "אדמה חקלאית"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22823,6 +23105,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22878,6 +23163,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24852,7 +25143,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24895,9 +25189,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27486,6 +27780,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27495,6 +27792,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27534,6 +27834,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27647,7 +27950,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27884,9 +28187,6 @@ msgstr "מדינה"
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/hi.po b/i18n/po/hi.po
index 3d9d6c2..f2f2511 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2009-11-14 16:28+0000\n"
"Last-Translator: nipunreddevil <nipunreddevil at gmail.com>\n"
"Language-Team: Hindi <hi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:44+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:44+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: hi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr "प्लगइन्स"
msgid "About JOSM..."
msgstr ""
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,12 +3171,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "अज्ञात"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/hr.po b/i18n/po/hr.po
index 84b5619..4da5b50 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\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-10-30 04:56+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:56+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: hr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -171,6 +171,12 @@ msgstr "Dodaci"
msgid "About JOSM..."
msgstr "O JOSM-u..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2222,13 +2228,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Odaberi, pomiči, skaliraj i rotiraj objekte"
-msgid "Move elements"
-msgstr "Pomakni elemente"
-
-msgid "Move them"
-msgstr "Pomakni ih"
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2242,6 +2244,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr "Pomakni elemente"
+
+msgid "Move them"
+msgstr "Pomakni ih"
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Otpustite tipku miša za označavanje objekta u pravokutniku."
@@ -2437,6 +2448,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr "Filter"
@@ -2455,9 +2469,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr "osnovni primjeri"
@@ -3270,12 +3281,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "NEPOZNATO"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4871,6 +4882,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "Uredi alatnu traku"
@@ -5043,7 +5061,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5848,20 +5866,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7095,13 +7108,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr "Pozicija"
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -12089,6 +12105,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12251,6 +12270,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -14087,6 +14109,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14693,6 +14719,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14720,7 +14749,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15296,6 +15328,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15441,6 +15476,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15479,6 +15519,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15912,9 +15957,21 @@ msgstr ""
msgid "Lanes"
msgstr "Broj traka"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Max. brzina (km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Most"
@@ -15982,6 +16039,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -16076,6 +16136,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr "izvan"
+
msgid "Height (meters)"
msgstr ""
@@ -16616,6 +16679,9 @@ msgstr "Cestarina (Toll)"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16637,12 +16703,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr "Autocesta"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Spojna cesta autocesti"
@@ -16744,6 +16886,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17283,12 +17428,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr "Drugo ime"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Kamera za mjerenje brzine"
@@ -17406,6 +17554,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17810,6 +17964,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18448,12 +18611,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18637,6 +18794,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19299,25 +19459,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19897,6 +20038,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -20095,32 +20244,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20205,6 +20328,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20445,6 +20585,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21610,6 +21778,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21949,6 +22208,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22932,6 +23214,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22987,6 +23272,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24961,7 +25252,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -25004,9 +25298,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27595,6 +27889,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27604,6 +27901,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27643,6 +27943,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "PicLayer pomakni"
@@ -27756,7 +28059,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27993,9 +28296,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr "izvan"
-
msgid "[incomplete]"
msgstr "[nepotpun]"
diff --git a/i18n/po/ht.po b/i18n/po/ht.po
index a297e7f..06adbb4 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2010-03-11 21:17+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Haitian; Haitian Creole <ht at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:43+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:43+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,10 +3171,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/hu.po b/i18n/po/hu.po
index 88d500f..88c138f 100644
--- a/i18n/po/hu.po
+++ b/i18n/po/hu.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-15 22:25+0000\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-18 10:01+0000\n"
"Last-Translator: Báthory Péter <bathory86p at gmail.com>\n"
"Language-Team: Hungarian <kde-l10n-hu at kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:44+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:44+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: hu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -176,6 +176,12 @@ msgstr "Bővítmények"
msgid "About JOSM..."
msgstr "A JOSM névjegye..."
+msgid "Failed to locate resource ''{0}''."
+msgstr "Erőforrás nem található: ''{0}''."
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Nem sikerült betölteni ''{0}'' erőforrást, a hiba: {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -743,7 +749,7 @@ msgid "Join Areas Function"
msgstr "Területek egyesítése funkció"
msgid "Join Node to Way"
-msgstr "Csomópont egyesítése az úttal"
+msgstr "Pont egyesítése a vonallal"
msgid "Include a node into the nearest way segments"
msgstr "Beilleszti a pontot a legközelebbi vonalszakaszba"
@@ -1487,13 +1493,13 @@ msgstr[1] ""
"is."
msgid "Which way segment should reuse the history of {0}?"
-msgstr ""
+msgstr "Melyik vonalszakasz őrizze meg {0} vonal előzményeit?"
msgid " [id: {0}]"
msgstr " [id: {0}]"
msgid "Segment {0}: {1}"
-msgstr ""
+msgstr "szakasz {0}: {1}"
msgid "You must select two or more nodes to split a circular way."
msgstr "Körvonalat csak kettő vagy több pont kijelölésével lehet felosztani."
@@ -2320,14 +2326,12 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Objektumokat kiválaszt, mozgat, átméretez és forgat"
-msgid "Move elements"
-msgstr "Elemek mozgatása"
-
-msgid "Move them"
-msgstr "Mozgatás"
-
-msgid "Undo move"
-msgstr "Mozgatás visszavonása"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
+"Biztosan mozgatni akarsz olyan elemeket, amik egy szűrő által elrejtett "
+"vonalhoz csatlakoznak?"
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2344,6 +2348,15 @@ msgstr[1] ""
"Több, mint {0} elemet mozgattál. Ilyen sok elem mozgatása általában hiba.\n"
"Biztosan mozgatni szeretnéd őket?"
+msgid "Move elements"
+msgstr "Elemek mozgatása"
+
+msgid "Move them"
+msgstr "Mozgatás"
+
+msgid "Undo move"
+msgstr "Mozgatás visszavonása"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
"Engedd fel az egérgombot a téglalapban lévő objektumok kijelöléséhez."
@@ -2550,6 +2563,9 @@ msgstr "MapCSS szelektor"
msgid "add toolbar button"
msgstr "eszköztár gomb készítése"
+msgid "Invalid search expression"
+msgstr "Érvénytelen keresőkifejezés"
+
msgid "Filter"
msgstr "Szűrő"
@@ -2571,9 +2587,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Érvénytelen keresőkifejezés"
-
msgid "basic examples"
msgstr "egyszerű példák"
@@ -2656,7 +2669,7 @@ msgid "metadata"
msgstr "metaadat"
msgid "objects changed by user"
-msgstr "felhasználó által változtatott objektumok"
+msgstr ""
msgid "objects with given ID"
msgstr "adott azonosítójú objektumok"
@@ -2686,7 +2699,7 @@ msgid "objects having 5 to 10 tags"
msgstr "5 - 10 címkével rendelkező objektumok"
msgid "objects with given role in a relation"
-msgstr "a kapcsolatban az adott szerepben lévő objektumok"
+msgstr "objektumok, amik a megadott szereppel tartoznak kapcsolathoz"
msgid "closed ways with an area of 100 m²"
msgstr "100 m² területű zárt vonal"
@@ -2719,10 +2732,10 @@ msgid "all parents of objects matching the expression"
msgstr "a kifejezéssel egyező objektumok összes szülője"
msgid "relation containing a member of role <i>stop</i>"
-msgstr ""
+msgstr "kapcsolat, ami tartalmaz <i>stop</i> szerepű tagot"
msgid "objects being part of a relation as role <i>stop</i>"
-msgstr ""
+msgstr "objektum, ami tagja kapcsolatnak <i>stop</i> szereppel"
msgid "n-th member of relation and/or n-th node of way"
msgstr "kapcsolat n-edik tagja, és/vagy vonal n-edik pontja"
@@ -2754,8 +2767,8 @@ msgstr "Keresés"
msgid "Searching in {0} object"
msgid_plural "Searching in {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Keresés {0} objektumban"
+msgstr[1] "Keresés {0} objektumokban"
msgid "No match found for ''{0}''"
msgstr "Nincs találat a(z) \"{0}\" kifejezésre"
@@ -3444,12 +3457,12 @@ msgstr "Angolszász"
msgid "Nautical Mile"
msgstr "Tengeri mérföld"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Nem sikerült betölteni ''{0}'' erőforrást, a hiba: {1}."
-
msgid "UNKNOWN"
msgstr "ISMERETLEN"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr "Váratlan JOSM verziószám a verziófájlban: \"{0}\""
@@ -5132,6 +5145,13 @@ msgstr "Súgó"
msgid "Menu: {0}"
msgstr "Menü: {0}"
+msgid "Main toolbar"
+msgstr "Fő eszköztár"
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr "A fő (vízszintes) eszköztár láthatóságát kapcsolja"
+
msgid "Edit toolbar"
msgstr "Szerkesztő eszköztár"
@@ -5310,14 +5330,13 @@ msgstr "szeletig"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Alternatíva: írd be egy <strong>szelet címét</strong> ebben a "
-"formában: <i>nagyítás/x/y</i>, pl. <i>15/256/223</i>. A következő "
-"címformátumok is megfelelnek: <i>nagyítás,x,y</i> vagy "
-"<i>nagyítás;x;y</i>.</html>"
+"<html>Alternatíva: írd be egy <strong>csempe címet</strong> ebben a "
+"formában: <i>zoomszint/x/y</i>, pl. <i>15/256/223</i>. A következő "
+"címformátumok is megfelelnek:<i>zoom,x,y</i>, vagy <i>zoom;x;y</i>.</html>"
msgid "Tile address:"
msgstr "Szelet címe:"
@@ -5450,7 +5469,7 @@ msgid "Tags"
msgstr "Címkék"
msgid "Nodes"
-msgstr "Csomópontok"
+msgstr "Pontok"
msgid "Members"
msgstr "Tagok"
@@ -6193,26 +6212,15 @@ msgstr "Ütközések megoldása"
msgid "Resolve conflicts for ''{0}''"
msgstr "''{0}'' ütközésének megoldása"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Kérlek erősítsd meg <strong>1 objektum eltávolítását</strong> "
-"<strong>1 kapcsolatból</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] "Kérlek erősítsd meg <strong>{0} objektum</strong> törlését."
+msgstr[1] "Kérlek erősítsd meg <strong>{0} objektum</strong> törlését."
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Kérlek erősítsd meg <strong>1 objektum eltávolítását</strong> "
-"<strong>{0} kapcsolatból</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Kérlek erősítsd meg <strong>{0}objektum eltávolítását</strong> "
-"<strong>{1} kapcsolatból</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] "{0} kapcsolat érintett."
+msgstr[1] "{0} kapcsolat érintett."
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7541,17 +7549,20 @@ msgstr "Címkék/Tagságok"
msgid "Tags for selected objects."
msgstr "A kijelölt objektumok címkéi."
+msgid "<different>"
+msgstr "<különböző>"
+
msgid "Member Of"
msgstr "Tagja"
msgid "Position"
msgstr "Pozíció"
-msgid "<different>"
-msgstr "<különböző>"
+msgid "Tag filter"
+msgstr "Címkeszűrő"
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
-msgstr "Objektumok: {2} / Tagek: {0} / Tagságok {1}"
+msgstr "Objektumok: {2} / Címkék: {0} / Tagságok {1}"
msgid "Tags: {0} / Memberships: {1}"
msgstr "Címke: {0} / Tagság: {1}"
@@ -8550,7 +8561,7 @@ msgstr ""
"<strong>{1}</strong></html>"
msgid "Changeset"
-msgstr "Változáskészlet"
+msgstr "Módosításcsomag"
msgid "Changeset info"
msgstr "Módosításcsomag információi"
@@ -12966,10 +12977,12 @@ msgstr "Új kapcsolat"
msgid ""
"The preset <i>{0}</i> cannot be applied since nothing has been selected!"
msgstr ""
+"<i>{0}</i> címkekészlet nem alkalmazható, mert nincs semmi kiválasztva!"
msgid ""
"The preset <i>{0}</i> cannot be applied since the selection is unsuitable!"
msgstr ""
+"<i>{0}</i> címkekészlet nem alkalmazható, mert a kiválasztás nem hozzá illő!"
msgid "Change {0} object"
msgid_plural "Change {0} objects"
@@ -13068,6 +13081,9 @@ msgstr ""
"Sérült cimkézési beállítás \"{0}-{1}\" - az elemek számának egyeznie kell a "
"''display_values''-ban és a ''values''-ban"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13260,6 +13276,9 @@ msgstr "{0} és {1} közötti pontok letöltése folyamatban..."
msgid "Contacting OSM Server..."
msgstr "Kapcsolódás az OSM szerverhez..."
+msgid "Downloading notes"
+msgstr "Jegyzetek letöltése"
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "A(z) ''{0}'' erőforrás bejövő adatfolyamánk megnyitása elbukott"
@@ -14424,17 +14443,19 @@ msgstr[1] ""
"igényelt bővítmények:"
msgid "Download and restart"
-msgstr ""
+msgstr "Letöltés és újraindítás"
msgid "Click to download missing plugin and restart JOSM"
msgid_plural "Click to download missing plugins and restart JOSM"
msgstr[0] ""
+"Kattints a hiányzó bővítmény letöltéséhez és a JOSM újraindításához"
msgstr[1] ""
+"Kattints a hiányzó bővítmények letöltéséhez és a JOSM újraindításához"
msgid "Click to continue without this plugin"
msgid_plural "Click to continue without these plugins"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Kattints a bővítmény nélküli folytatáshoz"
+msgstr[1] "Kattints a bővítmények nélküli folytatáshoz"
msgid ""
"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
@@ -15439,6 +15460,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "bozót"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "kapcsolódó utca"
@@ -15690,7 +15715,7 @@ msgid "OpenStreetMap GPS Traces"
msgstr "OpenStreetMap GPS Nyomvonalak"
msgid "OpenStreetMap (Standard layer)"
-msgstr ""
+msgstr "OpenStreetMap (Alapértelmezett réteg)"
msgid "skobbler"
msgstr "skobbler"
@@ -16049,6 +16074,9 @@ msgstr "Drón ábrázolás (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drón ábrázolás 2014 (Haiti)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16076,7 +16104,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -16652,6 +16683,9 @@ msgstr "Angol (OS) városrendezési tervek, Nairn 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "Angol (OS) városrendezési tervek, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "Angol (OS) városrendezési tervek, Peebles 1856 (NLS)"
@@ -16826,6 +16860,11 @@ msgstr ""
"Lehetővé teszi a felhasználónak, hogy anonimizálja az időbéllyegeket és "
"nagyon gyorsan törölhesse nagy GPX nyomvonalak részleteit."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
"Egy GPX nyomvonal tengerszint feletti magasság profilját és néhány "
@@ -16877,6 +16916,11 @@ msgstr "Lehetővé teszi a szükségtelen GPS nyomvonalak kiszűrését"
msgid "Visualizes routing information as a routing graph."
msgstr "Útvonal grafikonként jelenít meg útvonal információkat."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "Egyszerűsítő eszköz a házszámok címkézéséhez."
@@ -17393,9 +17437,21 @@ msgstr "mocsár"
msgid "Lanes"
msgstr "Sávok"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Max. sebesség (km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Híd"
@@ -17463,6 +17519,9 @@ msgstr "mellékvágány"
msgid "spur"
msgstr "iparvágány"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Villamosítás"
@@ -17557,6 +17616,9 @@ msgstr "elkülönített"
msgid "isolated"
msgstr "elszigetelt"
+msgid "outside"
+msgstr "külső"
+
msgid "Height (meters)"
msgstr "Magasság (méter)"
@@ -18097,6 +18159,9 @@ msgstr "Fizetős"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "A víztömeg jelenléte időszakos (szezonálisan eltűnik)?"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr "áteresz"
@@ -18118,12 +18183,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "víz"
+
+msgid "gas"
+msgstr "gáz"
+
+msgid "heat"
+msgstr "hő"
+
+msgid "oil"
+msgstr "olaj"
+
+msgid "sewage"
+msgstr "szennyvíz"
+
+msgid "Support"
+msgstr "Tartója"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "oszlopos"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "Falra szerelt"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "Hirdetőtáblás"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "Álló"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Autóutak"
msgid "Motorway"
msgstr "Autópálya"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Autópályafelhajtó"
@@ -18225,6 +18366,9 @@ msgstr "parkolóút"
msgid "drive-through"
msgstr "Áthajtó"
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "parkolóút"
@@ -18777,12 +18921,15 @@ msgstr "Fordulóhely"
msgid "Turning Loop"
msgstr "Forduló hurok"
-msgid "City Limit"
-msgstr "Településhatár"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Alternatív név"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Traffipax"
@@ -18902,6 +19049,12 @@ msgstr "Szallagkorlát"
msgid "Wall"
msgstr "Fal"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Városfal"
@@ -19312,6 +19465,15 @@ msgstr "CNG (sűrített földgáz)"
msgid "Pier"
msgstr "Móló"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Zsilipkapu"
@@ -19950,12 +20112,6 @@ msgstr "Repülőtér"
msgid "Airport Ground"
msgstr "Repülőtér"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Kifutópálya"
@@ -20140,6 +20296,9 @@ msgstr "Házi sörfőzde"
msgid "Outdoor seating"
msgstr "Szabadtéri asztalok"
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Gyorsétterem"
@@ -20807,25 +20966,6 @@ msgstr "napóra"
msgid "unorthodox"
msgstr "liberális szellemű"
-msgid "Support"
-msgstr "Tartója"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "oszlopos"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "Falra szerelt"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "Hirdetőtáblás"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "Álló"
-
msgid "Visibility/readability"
msgstr "Láthatóság/olvashatóság"
@@ -21406,6 +21546,14 @@ msgid "barn"
msgstr "csűr"
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -21604,32 +21752,6 @@ msgstr "bor"
msgid "Bunker Silo"
msgstr "Falközi siló"
-msgid "Pipeline"
-msgstr "Csővezeték"
-
-msgid "water"
-msgstr "víz"
-
-msgid "gas"
-msgstr "gáz"
-
-msgid "heat"
-msgstr "hő"
-
-msgid "oil"
-msgstr "olaj"
-
-msgid "sewage"
-msgstr "szennyvíz"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "vízalatti"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "felszíni"
-
msgid "Crane"
msgstr "Daru"
@@ -21714,6 +21836,23 @@ msgstr "Tárna"
msgid "Length in meters"
msgstr "Hossz méterben"
+msgid "Pipeline"
+msgstr "Csővezeték"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "vízalatti"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "felszíni"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Víztorony"
@@ -21954,6 +22093,34 @@ msgstr "forgóoszlop"
msgid "Bridge outline"
msgstr "Híd körvonal"
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "Feszültségelosztó telep"
@@ -23124,6 +23291,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Földrajz"
@@ -23476,6 +23734,29 @@ msgstr "Farmudvar"
msgid "Farmland"
msgstr "Mezőgazdasági terület"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Mező"
@@ -23831,7 +24112,7 @@ msgstr ""
msgctxt "note=*, fixme=*, description=*"
msgid "Similar but different tags:"
-msgstr "Hasonló, de eltérő tagek:"
+msgstr "Hasonló, de eltérő címkék:"
msgctxt "the tag note=*"
msgid "Note"
@@ -24479,6 +24760,9 @@ msgstr "a(z) {0}-nak szám értéket kell adni"
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr "kapcsolat típus nélkül"
@@ -24536,6 +24820,12 @@ msgstr "Utca feliratok megjelenítése (magas nagyításnál)"
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV Files"
@@ -24825,7 +25115,7 @@ msgid "Enter key mode"
msgstr ""
msgid "Auto add tags"
-msgstr "Tagek automatikus hozzáadása"
+msgstr "Címkék automatikus hozzáadása"
msgid "Autosimplify"
msgstr "Automatikus egyszerűsítés"
@@ -26549,7 +26839,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -26592,9 +26885,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -29212,6 +29505,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "Kép kalibráció betöltése..."
@@ -29221,6 +29517,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -29260,6 +29559,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -29375,8 +29677,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "Alkalmazmi akarod ezt?"
-msgid "Load calibration file ?"
-msgstr "Kalibrációs fájl betöltése?"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr ""
@@ -29614,9 +29916,6 @@ msgstr "Állam"
msgid "pending"
msgstr "függőben"
-msgid "outside"
-msgstr "külső"
-
msgid "[incomplete]"
msgstr "[befejezetlen]"
diff --git a/i18n/po/hy.po b/i18n/po/hy.po
index ec3b0b7..5b629be 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2011-04-13 21:51+0000\n"
"Last-Translator: Gev777 <Unknown>\n"
"Language-Team: Armenian <hy at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:32+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:32+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: hy\n"
msgid "Cancel"
@@ -172,6 +172,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,10 +3171,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/ia.po b/i18n/po/ia.po
index b48aa4b..40d5555 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2011-08-29 01:02+0000\n"
"Last-Translator: Emilio Sepulveda <Unknown>\n"
"Language-Team: Interlingua <ia at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:45+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:45+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: ia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr "Circa JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,10 +3171,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/id.po b/i18n/po/id.po
index e41a579..2300ea5 100644
--- a/i18n/po/id.po
+++ b/i18n/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\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"
@@ -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-10-30 04:46+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:45+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: id\n"
"X-Language: id_ID\n"
@@ -173,6 +173,12 @@ msgstr "Plugins"
msgid "About JOSM..."
msgstr "Tentang JOSM"
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Gagal untuk mengupload sumber \"{0}\", kesalahan adalah {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2279,14 +2285,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Pilih, pindahkan, atur perbesaran dan putar objek"
-msgid "Move elements"
-msgstr "Pindahkan elemen"
-
-msgid "Move them"
-msgstr "Pindahkan mereka"
-
-msgid "Undo move"
-msgstr "Ulangi perpindahan"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2299,6 +2301,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr "Pindahkan elemen"
+
+msgid "Move them"
+msgstr "Pindahkan mereka"
+
+msgid "Undo move"
+msgstr "Ulangi perpindahan"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Lepas tombol mouse untuk memilih objek pada persegi."
@@ -2501,6 +2512,9 @@ msgstr ""
msgid "add toolbar button"
msgstr "Tambah tombol toolbar"
+msgid "Invalid search expression"
+msgstr "Ekspresi pencarian tidak berlaku"
+
msgid "Filter"
msgstr "Saring"
@@ -2522,9 +2536,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Ekspresi pencarian tidak berlaku"
-
msgid "basic examples"
msgstr "contoh-contoh dasar"
@@ -3363,12 +3374,12 @@ msgstr "Imperial"
msgid "Nautical Mile"
msgstr "Jarak lautan"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Gagal untuk mengupload sumber \"{0}\", kesalahan adalah {1}."
-
msgid "UNKNOWN"
msgstr "TIDAK DIKENAL"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -5020,6 +5031,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "Menu: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "Edit toolbar"
@@ -5196,14 +5214,10 @@ msgstr "naik ke indeks"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Alternatifnya anda dapat masukkan <strong>alamat indeks</strong> untuk "
-"indeks tunggal pada format <i>tingkat perbesaran/x/y</i>, contohnya. "
-"<i>15/256/223</i>. Alamat indeks pada format <i>zoom,x,y</i> or "
-"<i>zoom;x;y</i> adalah sah..</html>"
msgid "Tile address:"
msgstr "Alamat indeks:"
@@ -6041,26 +6055,15 @@ msgstr "Menyelesaikan konflik"
msgid "Resolve conflicts for ''{0}''"
msgstr "Menyelesaikan konflik untuk ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Tolong konfirmasi untuk menghapus <strong>1 objek</strong> dari "
-"<strong>1 relasi</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Tolong konfirmasi untuk menghapus <strong>1 objek</strong> dar "
-"<strong>{0} relasi</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Tolong konfirmasi untuk menghapus <strong>{0} objek</strong> dari "
-"<strong>{1} relasi</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7355,14 +7358,17 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr "<perbedaan>"
+
msgid "Member Of"
msgstr "Anggota Dari"
msgid "Position"
msgstr "Posisi"
-msgid "<different>"
-msgstr "<perbedaan>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -12746,6 +12752,9 @@ msgstr ""
"Penandaan preset rusak \"{0}-{1}\" - jumlah item dalam \"nilai display'' "
"harus sama dengan \"nilai''"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12932,6 +12941,9 @@ msgstr "Mengunduh titik {0} ke {1}..."
msgid "Contacting OSM Server..."
msgstr "Menghubungkan server OSM..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Gagal untuk membuka aliran input sumber daya ''{0}''"
@@ -14971,6 +14983,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "Semak"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "Jalan yang terasosiasi"
@@ -15577,6 +15593,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -15604,7 +15623,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -16180,6 +16202,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -16341,6 +16366,11 @@ msgstr ""
"Memungkinkan pengguna untuk anonim jejak waktu dan hapus bagian dari jalur "
"GPX besar sangat cepat."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr "Tunjukkan profil ketinggian dan beberapa data dari track GPS"
@@ -16387,6 +16417,11 @@ msgstr "Memungkinkan untuk menyaring jalur GPS yang diperlukan"
msgid "Visualizes routing information as a routing graph."
msgstr "Visualisasi peta informasi sebagai peta grafis."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "Alat sederhana untuk tag nomor rumah"
@@ -16883,9 +16918,21 @@ msgstr "lumpur"
msgid "Lanes"
msgstr "Laju"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Kecepatan Maksimal (km/jam)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Jembatan"
@@ -16953,6 +17000,9 @@ msgstr "papan"
msgid "spur"
msgstr "sepur"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Menimbulkan listrik"
@@ -17047,6 +17097,9 @@ msgstr "terpisah"
msgid "isolated"
msgstr "terisolasi"
+msgid "outside"
+msgstr "Luar"
+
msgid "Height (meters)"
msgstr "tinggi (meter)"
@@ -17587,6 +17640,9 @@ msgstr "Tol"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -17608,12 +17664,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "air"
+
+msgid "gas"
+msgstr "gas"
+
+msgid "heat"
+msgstr "panas"
+
+msgid "oil"
+msgstr "minyak"
+
+msgid "sewage"
+msgstr "saluran pembuangan"
+
+msgid "Support"
+msgstr "Dukungan"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Jalan"
msgid "Motorway"
msgstr "Jalan Tol"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Penghubung Jalan Tol"
@@ -17715,6 +17847,9 @@ msgstr "tempat_parkir"
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Tempat Parkir"
@@ -18263,12 +18398,15 @@ msgstr "Menghidupkan Lingkaran"
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
-msgstr "Batas Kota"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Nama Kedua"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Kecepatan Kamera"
@@ -18386,6 +18524,12 @@ msgstr "Pembatas Jalan"
msgid "Wall"
msgstr "Tembok"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Tembok Kota"
@@ -18790,6 +18934,15 @@ msgstr "CNG (Compressed Natural Gas)"
msgid "Pier"
msgstr "Tembok Laut"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Gerbang Kunci"
@@ -19428,12 +19581,6 @@ msgstr "Bandara"
msgid "Airport Ground"
msgstr "Lahan Bandara"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Landasan Pacu"
@@ -19617,6 +19764,9 @@ msgstr "Microbrewery"
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Makanan Cepat Saji"
@@ -20279,25 +20429,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr "Dukungan"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr "visibilitas/perhatian"
@@ -20877,6 +21008,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -21075,32 +21214,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "Jalur Pipa"
-
-msgid "water"
-msgstr "air"
-
-msgid "gas"
-msgstr "gas"
-
-msgid "heat"
-msgstr "panas"
-
-msgid "oil"
-msgstr "minyak"
-
-msgid "sewage"
-msgstr "saluran pembuangan"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "di bawah air"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "di atas tanah"
-
msgid "Crane"
msgstr "Derek"
@@ -21185,6 +21298,23 @@ msgstr "Adit"
msgid "Length in meters"
msgstr "Panjang dalam Meter"
+msgid "Pipeline"
+msgstr "Jalur Pipa"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "di bawah air"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "di atas tanah"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Menara Air"
@@ -21425,6 +21555,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -22590,6 +22748,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Geografi"
@@ -22929,6 +23178,29 @@ msgstr "pekarangan rumah petani"
msgid "Farmland"
msgstr "Pertanian"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "padang rumput"
@@ -23914,6 +24186,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr "relasi tanpa tipe"
@@ -23971,6 +24246,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV Files"
@@ -26105,7 +26386,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -26148,9 +26432,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -28889,6 +29173,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Apakah anda ingin menyimpan kalibrasi saat ini dari layer {0}?"
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "Mengunggah kalibrasi gambar..."
@@ -28898,6 +29185,9 @@ msgstr "Memuat data kalibrasi dari berkas"
msgid "Loading file failed: {0}"
msgstr "Gagal memuat berkas: {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr "Memuat Kalibrasi Berkas Dunia"
@@ -28937,6 +29227,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "PicLayer gerakan"
@@ -29051,8 +29344,8 @@ msgstr "Atur \"{0}\" untuk iya/tidak/tanya di pengaturan"
msgid "Do you want to apply it ?"
msgstr "Apakah anda ingin menerapkan?"
-msgid "Load calibration file ?"
-msgstr "Memuat berkas kalibrasi?"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr "Ini akan diaplikasikan secara otomatis"
@@ -29292,9 +29585,6 @@ msgstr "Negara Bagian / Provinsi"
msgid "pending"
msgstr "Tunda"
-msgid "outside"
-msgstr "Luar"
-
msgid "[incomplete]"
msgstr "[Tidak Lengkap]"
diff --git a/i18n/po/is.po b/i18n/po/is.po
index 7b89018..2603850 100644
--- a/i18n/po/is.po
+++ b/i18n/po/is.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-08 05:22+0000\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-06 00:32+0000\n"
"Last-Translator: Stefán Örvar Sigmundsson <stefan.orvar.sigmundsson at emi.is>\n"
"Language-Team: Icelandic <is at li.org>\n"
"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-10-30 04:45+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:45+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: is\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -143,7 +143,7 @@ msgid "Java Version {0}"
msgstr "Java útgáfa {0}"
msgid "Homepage"
-msgstr "Vefsíða."
+msgstr "Heimasíða"
msgid "Bug Reports"
msgstr "Villutilkynningar"
@@ -169,6 +169,12 @@ msgstr "Viðbætur"
msgid "About JOSM..."
msgstr "Um JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2145,15 +2151,11 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
-msgid "Move them"
-msgstr "Færa þá"
-
-msgid "Undo move"
-msgstr "Ekki færa þá"
-
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
"an error.\n"
@@ -2165,6 +2167,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr "Færa þá"
+
+msgid "Undo move"
+msgstr "Ekki færa þá"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2359,6 +2370,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2377,9 +2391,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3179,12 +3190,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "ÓÞEKKT"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4778,6 +4789,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4950,7 +4968,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5752,20 +5770,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7001,14 +7014,17 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr "<mismunandi>"
+
msgid "Member Of"
msgstr "Stak í"
msgid "Position"
msgstr ""
-msgid "<different>"
-msgstr "<mismunandi>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -11984,6 +12000,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12148,6 +12167,9 @@ msgstr "Sæki punkta {0} to {1}..."
msgid "Contacting OSM Server..."
msgstr "Hef samband við OpenStreetMap miðlara..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13988,6 +14010,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14594,6 +14620,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14621,7 +14650,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15197,6 +15229,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15342,6 +15377,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15381,6 +15421,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15814,9 +15859,21 @@ msgstr "leðja"
msgid "Lanes"
msgstr "Akreinar"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Hámarkshraði (km/klst)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Brú"
@@ -15884,6 +15941,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15978,6 +16038,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16518,6 +16581,9 @@ msgstr "Tollur"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16539,12 +16605,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "vatn"
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr "Stræti"
msgid "Motorway"
msgstr "Hraðbraut"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Tengibraut á hraðbraut"
@@ -16646,6 +16788,9 @@ msgstr "bílastæðavegur"
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Bílastæðavegur"
@@ -17185,12 +17330,15 @@ msgstr "Beygjuhringur"
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
-msgstr "Borgarmörk"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Hraðamyndavél"
@@ -17308,6 +17456,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Borgarveggur"
@@ -17712,6 +17866,15 @@ msgstr ""
msgid "Pier"
msgstr "Bryggja"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18350,12 +18513,6 @@ msgstr "Flugvöllur"
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18539,6 +18696,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Skyndibiti"
@@ -19201,25 +19361,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19799,6 +19940,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19997,32 +20146,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "Leiðsla"
-
-msgid "water"
-msgstr "vatn"
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr "Krani"
@@ -20107,6 +20230,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr "Leiðsla"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Vatnsturn"
@@ -20347,6 +20487,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21512,6 +21680,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Landafræði"
@@ -21851,6 +22110,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22834,6 +23116,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22889,6 +23174,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24863,7 +25154,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24906,9 +25200,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27493,6 +27787,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27502,6 +27799,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27541,6 +27841,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27654,7 +27957,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27891,9 +28194,6 @@ msgstr "Fylki"
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/it.po b/i18n/po/it.po
index 4ca3535..c55015a 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-09-21 07:50+0000\n"
"Last-Translator: Don-vip <Unknown>\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-10-30 04:46+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:46+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: it\n"
"X-Language: it_IT\n"
"X-Source-Language: en\n"
@@ -174,6 +174,12 @@ msgstr "Estensioni"
msgid "About JOSM..."
msgstr "Informazioni su JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Fallito il caricamento della risorsa ''''{0}'''', l''errore è {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2360,14 +2366,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Seleziona, sposta, scala e ruota oggetti"
-msgid "Move elements"
-msgstr "Muovi elementi"
-
-msgid "Move them"
-msgstr "Muoverli"
-
-msgid "Undo move"
-msgstr "Annullare lo spostamento"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2386,6 +2388,15 @@ msgstr[1] ""
"di elementi è spesso un errore.\n"
"Si desidera veramente spostarli?"
+msgid "Move elements"
+msgstr "Muovi elementi"
+
+msgid "Move them"
+msgstr "Muoverli"
+
+msgid "Undo move"
+msgstr "Annullare lo spostamento"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
"Rilascia il bottone del mouse per selezionare gli oggetti contenuti nel "
@@ -2598,6 +2609,9 @@ msgstr ""
msgid "add toolbar button"
msgstr "aggiungi pulsante"
+msgid "Invalid search expression"
+msgstr "Espressione di ricerca non valida"
+
msgid "Filter"
msgstr "Filtro"
@@ -2619,9 +2633,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Espressione di ricerca non valida"
-
msgid "basic examples"
msgstr "esempi di base"
@@ -3513,12 +3524,12 @@ msgstr "Anglosassone"
msgid "Nautical Mile"
msgstr "Miglio Nautico"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Fallito il caricamento della risorsa ''''{0}'''', l''errore è {1}."
-
msgid "UNKNOWN"
msgstr "SCONOSCIUTO"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
"Numero di versione JOSM inatteso nel file di revisione, il valore è ''{0}''"
@@ -5255,6 +5266,13 @@ msgstr "Aiuto"
msgid "Menu: {0}"
msgstr "Menu: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "Barra degli strumenti di modifica"
@@ -5434,14 +5452,10 @@ msgstr "fino al tassello"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>In alternativa è possibile inserire un <strong>indirizzo di un singolo "
-"tassello</strong> nel formato <i>livelloingrandimento/x/y</i>, es. "
-"<i>15/256/223</i>. Sono anche validi gli indirizzi dei tasselli nel formato "
-"<i>ingrandimento,x,y</i> oppure <i>ingrandimento;x;y</i>.</html>"
msgid "Tile address:"
msgstr "Indirizzo del tassello:"
@@ -6359,26 +6373,15 @@ msgstr "Risolvi conflitti"
msgid "Resolve conflicts for ''{0}''"
msgstr "Risolvi i conflitti per ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Confermare per eliminare <strong>1 oggetto</strong> da <strong>1 "
-"relazione</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Confermare per eliminare <strong>1 oggetto</strong> da <strong>{0} "
-"relazioni</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Confermare per eliminare <strong>{0} oggetti</strong> da <strong>{1} "
-"relazioni</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7737,14 +7740,17 @@ msgstr "Etichette/Appartenenze"
msgid "Tags for selected objects."
msgstr "Etichette per gli oggetti selezionati."
+msgid "<different>"
+msgstr "<diverso>"
+
msgid "Member Of"
msgstr "Membro di"
msgid "Position"
msgstr "Posizione"
-msgid "<different>"
-msgstr "<diverso>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Oggetti: {2} / Etichette: {0} / Appartenenze: {1}"
@@ -13429,6 +13435,9 @@ msgstr ""
"Etichette preimpostate \"{0}-{1}\" non coerenti - il numero di elementi in "
"''display_values'' deve essere lo stesso di ''values''"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13621,6 +13630,9 @@ msgstr "Scaricamento dei punti da {0} a {1} in corso..."
msgid "Contacting OSM Server..."
msgstr "Collegamento al server OSM in corso..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
"Fallita l''apertura del flusso di ingresso per la risorsa ''''{0}''''"
@@ -15874,6 +15886,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "incolta"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "strada associata (associatedStreet)"
@@ -16484,6 +16500,9 @@ msgstr "Drone Imagery (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Imagery 2014 (Haiti)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16511,8 +16530,11 @@ msgstr "OSMIE Civil Parishes"
msgid "OSMIE Baronies"
msgstr "OSMIE Baronies"
-msgid "OSMIE Political"
-msgstr "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
+msgstr ""
msgid "Lodi - Italy"
msgstr "Lodi - Italia"
@@ -17087,6 +17109,9 @@ msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "OS Town Plans, Peebles 1856 (NLS)"
@@ -17262,6 +17287,11 @@ msgstr ""
"Permette all’utente di rendere anonime le marche temporali ed eliminare "
"velocemente parti di tracciati GPX di grandi dimensioni."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
"Visualizza il profilo altimetrico ed alcuni dati statistici di un tracciato "
@@ -17312,6 +17342,11 @@ msgid "Visualizes routing information as a routing graph."
msgstr ""
"Visualizza le informazioni di navigazione come un grafo di navigazione."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "Semplice strumento per etichettare i numeri civici."
@@ -17842,9 +17877,21 @@ msgstr "zona fangosa (sabbie mobili)"
msgid "Lanes"
msgstr "Corsie"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Velocità massima (km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Ponte"
@@ -17912,6 +17959,9 @@ msgstr "tratto parallelo ad una ferrovia principale"
msgid "spur"
msgstr "tratto per una società o ente"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Elettrificazione"
@@ -18006,6 +18056,9 @@ msgstr "separata"
msgid "isolated"
msgstr "isolata"
+msgid "outside"
+msgstr "esterno"
+
msgid "Height (meters)"
msgstr "Altezza (metri)"
@@ -18550,6 +18603,9 @@ msgstr "Pedaggio"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "E'' il corpo d''acqua intermittente (scompare stagionalmente)?"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr "canale sotterraneo"
@@ -18571,12 +18627,88 @@ msgstr "Barca a motore"
msgid "Canoe"
msgstr "Canoa"
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "acqua"
+
+msgid "gas"
+msgstr "gas"
+
+msgid "heat"
+msgstr "calore"
+
+msgid "oil"
+msgstr "petrolio"
+
+msgid "sewage"
+msgstr "liquami"
+
+msgid "Support"
+msgstr "Supporto"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "palo"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "murale"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "cartellone"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "a terra"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Strade"
msgid "Motorway"
msgstr "Autostrada"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Svincolo autostradale"
@@ -18678,6 +18810,9 @@ msgstr "corsia interna a parcheggio"
msgid "drive-through"
msgstr "attraversamento in auto (drive-through)"
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Corsia interna a parcheggio"
@@ -19237,12 +19372,15 @@ msgstr "Slargo per inversione di marcia (senza isola centrale)"
msgid "Turning Loop"
msgstr "Slargo per inversione di marcia (con isola centrale)"
-msgid "City Limit"
-msgstr "Cartello di inizio/fine di centro abitato"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Secondo nome"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Autovelox"
@@ -19362,6 +19500,12 @@ msgstr "Barriera di contenimento (guard rail)"
msgid "Wall"
msgstr "Muro"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Cinta muraria"
@@ -19775,6 +19919,15 @@ msgstr "GNC (gas naturale compresso)"
msgid "Pier"
msgstr "Passerella"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Chiusa (non blocca la navigazione)"
@@ -20415,12 +20568,6 @@ msgstr "Aeroporto"
msgid "Airport Ground"
msgstr "Terreno aeroportuale"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Pista di decollo/atterraggio"
@@ -20604,6 +20751,9 @@ msgstr "Microbirrificio"
msgid "Outdoor seating"
msgstr "Outdoor seating"
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast food"
@@ -21267,25 +21417,6 @@ msgstr "meridiana"
msgid "unorthodox"
msgstr "anticonvenzionale"
-msgid "Support"
-msgstr "Supporto"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "palo"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "murale"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "cartellone"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "a terra"
-
msgid "Visibility/readability"
msgstr "Visibilità/leggibilità"
@@ -21865,6 +21996,14 @@ msgid "barn"
msgstr "bambini"
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "farm_auxiliary"
@@ -22063,32 +22202,6 @@ msgstr "vino"
msgid "Bunker Silo"
msgstr "Silos a bunker"
-msgid "Pipeline"
-msgstr "Conduttura"
-
-msgid "water"
-msgstr "acqua"
-
-msgid "gas"
-msgstr "gas"
-
-msgid "heat"
-msgstr "calore"
-
-msgid "oil"
-msgstr "petrolio"
-
-msgid "sewage"
-msgstr "liquami"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "subacqueo"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "sopra il suolo"
-
msgid "Crane"
msgstr "Gru permanente"
@@ -22173,6 +22286,23 @@ msgstr "Ingresso di una galleria mineraria"
msgid "Length in meters"
msgstr "Lunghezza in metri"
+msgid "Pipeline"
+msgstr "Conduttura"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "subacqueo"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "sopra il suolo"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Torre idrica"
@@ -22413,6 +22543,34 @@ msgstr "banchina ruotabile"
msgid "Bridge outline"
msgstr "Sagoma del ponte"
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "Centrale elettrica"
@@ -23581,6 +23739,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Geografia"
@@ -23935,6 +24184,29 @@ msgstr "Aia"
msgid "Farmland"
msgstr "Area agricola"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Prato"
@@ -24942,6 +25214,9 @@ msgstr "{0} deve essere un valore numerico"
msgid "{0} must be a positive integer number"
msgstr "{0} deve essere un numero intero positivo"
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr "relazione senza tipo"
@@ -24999,6 +25274,12 @@ msgstr "Mostra etichette delle strade (ad alta livello di zoom)"
msgid "Use alternative turn restriction icon set"
msgstr "Usa insieme di icone alternative per restrizioni di svolta"
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "File CSV Columbus V-900"
@@ -27233,7 +27514,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -27276,9 +27560,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -30061,6 +30345,9 @@ msgstr "Immagini non etichettate"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Si desidera salvare la calibrazione corrente del livello {0}?"
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "Carica calibrazione immagine..."
@@ -30070,6 +30357,9 @@ msgstr "Carica i dati di calibrazione da un file"
msgid "Loading file failed: {0}"
msgstr "Caricamento file fallito: {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr "Carica file di calibrazione world..."
@@ -30113,6 +30403,9 @@ msgstr ""
"Si prega di utilizzare {0} per caricare i propri KML che non sono stati "
"calibrati correttamente."
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "Spostamento PicLayer"
@@ -30231,8 +30524,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "Si desidera applicarlo ?"
-msgid "Load calibration file ?"
-msgstr "Caricare il file di calibrazione ?"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr "Sarà applicato automaticamente."
@@ -30473,9 +30766,6 @@ msgstr "Regione"
msgid "pending"
msgstr "in sospeso"
-msgid "outside"
-msgstr "esterno"
-
msgid "[incomplete]"
msgstr "[incompleto]"
diff --git a/i18n/po/ja.po b/i18n/po/ja.po
index a6b60ba..6093600 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-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-26 06:42+0000\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-13 04:35+0000\n"
"Last-Translator: fujimoto <fujimoto at internet.ne.jp>\n"
"Language-Team: Japanese <tr at openstreetmap.jp>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:47+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:46+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"X-Poedit-Country: JAPAN\n"
"Language: ja\n"
"X-Poedit-Language: Japanese\n"
@@ -177,6 +177,12 @@ msgstr "プラグイン"
msgid "About JOSM..."
msgstr "JOSMについて..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "リソース''{0}'' のロードに失敗、エラーコード: {1}。"
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2154,14 +2160,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "オブジェクトの選択、移動、拡大縮小と回転"
-msgid "Move elements"
-msgstr "要素を移動"
-
-msgid "Move them"
-msgstr "これらを移動する。"
-
-msgid "Undo move"
-msgstr "移動を取り消す"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr "フィルターで非表示になっているウェイに付随する要素を移動しますか？"
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2175,6 +2177,15 @@ msgstr[0] ""
"{0}件以上の要素を移動しようとしています。大量の要素を移動することは、多くの場合は間違いです。\n"
"本当に移動しますか？"
+msgid "Move elements"
+msgstr "要素を移動"
+
+msgid "Move them"
+msgstr "これらを移動する。"
+
+msgid "Undo move"
+msgstr "移動を取り消す"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。"
@@ -2369,6 +2380,9 @@ msgstr "MapCSS セレクタ"
msgid "add toolbar button"
msgstr "ツールバーボタンを追加"
+msgid "Invalid search expression"
+msgstr "検索条件が無効です"
+
msgid "Filter"
msgstr "フィルター"
@@ -2390,9 +2404,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "検索条件が無効です"
-
msgid "basic examples"
msgstr "基本例"
@@ -3192,12 +3203,12 @@ msgstr "ヤード・ポンド法"
msgid "Nautical Mile"
msgstr "海里"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "リソース''{0}'' のロードに失敗、エラーコード: {1}。"
-
msgid "UNKNOWN"
msgstr "不明"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr "リビジョンファイルに想定外のJOSMバージョン番号(''{0}'')があります"
@@ -4796,6 +4807,13 @@ msgstr "ヘルプ"
msgid "Menu: {0}"
msgstr "メニュー: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "編集ツールバー"
@@ -4968,13 +4986,10 @@ msgstr "max(最大値)"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>代替として、1つのタイルのために、 <strong>tile address</strong>を "
-"<i>zoomlevel/x/y</i>という形式で入力してもかまいません。すなわち <i>15/256/223</i>のようにです。形式中の tile "
-"addressesは、 <i>zoom,x,y</i> か <i>zoom;x;y</i> が有効です。</html>"
msgid "Tile address:"
msgstr "タイルのアドレス:"
@@ -5779,26 +5794,13 @@ msgstr "競合を解決"
msgid "Resolve conflicts for ''{0}''"
msgstr "''{0}'' の競合を解決する"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html><strong>1件のオブジェクト</strong>を<strong>1件のリレーション</strong> "
-"から削除して良いか確認してください。</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] "削除する <strong>{0} 件のオブジェクト</strong>を確認してください。"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html><strong>1件のオブジェクト</strong>を<strong>{0}件のリレーション</strong> "
-"から削除して良いか確認してください。</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html><strong>{0}件のオブジェクト</strong>を<strong>{1}件のリレーション</strong> "
-"から削除して良いか確認してください。</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] "リレーション {0} 件に影響します。"
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7048,14 +7050,17 @@ msgstr "タグ／所属"
msgid "Tags for selected objects."
msgstr "選択されたオブジェクトのタグです。"
+msgid "<different>"
+msgstr "<差異あり>"
+
msgid "Member Of"
msgstr "メンバー"
msgid "Position"
msgstr "位置"
-msgid "<different>"
-msgstr "<差異あり>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "オブジェクト: {2}件/タグ: {0}件/メンバーシップ: {1}件"
@@ -12164,6 +12169,9 @@ msgstr ""
"\"{0}-{1}\" プリセットのタグ付けが壊れています - ''display_values'' で指定された項目数は ''values'' "
"と同じである必要があります"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12328,6 +12336,9 @@ msgstr "ポイント {0} から {1} をダウンロード中..."
msgid "Contacting OSM Server..."
msgstr "OSMサーバーに接続中..."
+msgid "Downloading notes"
+msgstr "メモをダウンロードしています"
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "リソース ''{0}'' 用の入力ストリームのオープンに失敗しました"
@@ -14234,6 +14245,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "やぶ"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "通り名住居表示"
@@ -14845,6 +14860,9 @@ msgstr "Drone Imagery (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Imagery 2014 (Haiti)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -14872,8 +14890,11 @@ msgstr "OSMIE Civil Parishes"
msgid "OSMIE Baronies"
msgstr "OSMIE Baronies"
-msgid "OSMIE Political"
-msgstr "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr "OSMIE Local Election Areas"
+
+msgid "OSMIE Dail Election Areas"
+msgstr "OSMIE Dail Election Areas"
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
@@ -15251,7 +15272,7 @@ msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-82"
msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
+msgstr "NLS - OS 6-inch County Series 1888-1913"
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -15260,7 +15281,7 @@ msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
-msgstr ""
+msgstr "NLS - OS 25-inch (Scotland) 1892-1905"
msgid "OS 1:25k historic (OSM-Best)"
msgstr "OS 1:25k historic (OSM-Best)"
@@ -15448,6 +15469,9 @@ msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr "OS Town Plans, Paisley 1858 (NLS)"
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "OS Town Plans, Peebles 1856 (NLS)"
@@ -15519,11 +15543,14 @@ msgid ""
"Provides Apache Commons library components. Not meant to be installed "
"directly by users, but rather as a dependency for other plugins."
msgstr ""
+"Apache Commons "
+"ライブラリコンポーネントを提供します。ユーザーがインストールするものではなく、他のプラグインからの依存関係でインストールされます。"
msgid ""
"Provides Apache HTTP library. Not meant to be installed directly by users, "
"but rather as a dependency for other plugins."
msgstr ""
+"Apache HTTP ライブラリを提供します。ユーザーがインストールするものではなく、他のプラグインからの依存関係でインストールされます。"
msgid ""
"Allows selection of areas in an layer and automatic creation of a way as "
@@ -15569,7 +15596,7 @@ msgid "(Warning: Experimental!) Tool for conflating (merging) data."
msgstr "(警告: 試験中!)データの合成（マージ）用のツールです。"
msgid "Downloads new data when you pan/zoom"
-msgstr ""
+msgstr "場所を移動したりズームしたりすると、新しいデータをダウンロードします"
msgid "Create a grid of ways."
msgstr "ウェイのグリッドを作成。"
@@ -15601,6 +15628,11 @@ msgid ""
"very fast."
msgstr "ユーザーはタイムスタンプを匿名化したり長大なGPX トラックの一部を高速に削除したりすることができます。"
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr "高度プロファイルやGPXトラックの統計データをいくつかを表示します。"
@@ -15640,6 +15672,11 @@ msgstr "不要なGPXトラックの除去を許可"
msgid "Visualizes routing information as a routing graph."
msgstr "ルーティング情報をルーティンググラフとして可視化する。"
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "住居番号をタグ付けするシンプルなツールです。"
@@ -15719,7 +15756,7 @@ msgstr ""
"り、再オープンしたり、コメントしたりすることができます。"
msgid "Allows the user to work with pictures hosted at mapillary.com"
-msgstr ""
+msgstr "ユーザーが mapillary.com にある画像で作業できるようになります"
msgid ""
"Provide a measurement dialog and a layer to measure length and angle of "
@@ -16097,9 +16134,21 @@ msgstr "泥"
msgid "Lanes"
msgstr "車線数"
+msgid "Lanes in way direction"
+msgstr "ウェイの順方向の車線数"
+
+msgid "Lanes opposed to way direction"
+msgstr "ウェイの逆方向の車線数"
+
msgid "Max. speed (km/h)"
msgstr "最高速度(km/h)"
+msgid "Max. speed in way direction"
+msgstr "ウェイの順方向の最高速度"
+
+msgid "Max. speed opposed to way direction"
+msgstr "ウェイの逆方向の最高速度"
+
msgid "Bridge"
msgstr "橋"
@@ -16167,6 +16216,9 @@ msgstr "側線"
msgid "spur"
msgstr "引き込み線"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "電化状態"
@@ -16261,6 +16313,9 @@ msgstr "分煙"
msgid "isolated"
msgstr "禁煙"
+msgid "outside"
+msgstr "外部"
+
msgid "Height (meters)"
msgstr "高さ(m)"
@@ -16801,6 +16856,9 @@ msgstr "料金"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "永続的な水域ではない（季節によってなくなる）？"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr "カルバート"
@@ -16822,12 +16880,88 @@ msgstr "モーターボート"
msgid "Canoe"
msgstr "カヌー"
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "水域(湖沼)"
+
+msgid "gas"
+msgstr "ガス"
+
+msgid "heat"
+msgstr "熱"
+
+msgid "oil"
+msgstr "石油"
+
+msgid "sewage"
+msgstr "下水"
+
+msgid "Support"
+msgstr "設置方法"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "支柱"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "壁掛け"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "音楽時計"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "地面上"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "ストリート"
msgid "Motorway"
msgstr "自動車専用道路"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "自動車専用道路の連絡路"
@@ -16929,6 +17063,9 @@ msgstr "駐車場内通路"
msgid "drive-through"
msgstr "ドライブスルー"
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "駐車場内通路"
@@ -17468,12 +17605,15 @@ msgstr "転回場(島なし)"
msgid "Turning Loop"
msgstr "転回ループ(島あり)"
-msgid "City Limit"
-msgstr "市町村境界標識"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "二つ目の名前"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "スピードカメラ(オービス)"
@@ -17593,6 +17733,12 @@ msgstr "ガードレール"
msgid "Wall"
msgstr "壁"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "市壁"
@@ -17997,6 +18143,15 @@ msgstr "天然ガス"
msgid "Pier"
msgstr "桟橋"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "ロックゲート"
@@ -18111,7 +18266,7 @@ msgid "Railway Switch"
msgstr "分岐器"
msgid "Railway milestone"
-msgstr ""
+msgstr "鉄道の距離標"
msgid "Aerialway"
msgstr "索道"
@@ -18635,12 +18790,6 @@ msgstr "飛行場"
msgid "Airport Ground"
msgstr "飛行場の敷地"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "滑走路"
@@ -18824,6 +18973,9 @@ msgstr "地酒醸造所"
msgid "Outdoor seating"
msgstr "屋外席"
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "ファストフード"
@@ -19375,15 +19527,15 @@ msgstr "トイレ"
msgctxt "restroom"
msgid "Female"
-msgstr ""
+msgstr "女性"
msgctxt "restroom"
msgid "Male"
-msgstr ""
+msgstr "男性"
msgctxt "restroom"
msgid "Unisex"
-msgstr ""
+msgstr "両性別"
msgid "flush"
msgstr "水洗"
@@ -19420,19 +19572,19 @@ msgstr "収集時刻"
msgctxt "post_box"
msgid "pillar"
-msgstr ""
+msgstr "丸型"
msgctxt "post_box"
msgid "lamp"
-msgstr ""
+msgstr "角型"
msgctxt "post_box"
msgid "wall"
-msgstr ""
+msgstr "壁面"
msgctxt "post_box"
msgid "meter"
-msgstr ""
+msgstr "メートル便専用"
msgid "Drive through"
msgstr "ドライブスルー"
@@ -19486,25 +19638,6 @@ msgstr "日時計"
msgid "unorthodox"
msgstr "特殊"
-msgid "Support"
-msgstr "設置方法"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "支柱"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "壁掛け"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "音楽時計"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "地面上"
-
msgid "Visibility/readability"
msgstr "可視性/視認性"
@@ -19712,10 +19845,10 @@ msgid "Count"
msgstr "本数"
msgid "Compressed Air"
-msgstr ""
+msgstr "空気ポンプ"
msgid "Valves"
-msgstr ""
+msgstr "バルブ"
msgid "Dunlop (Woods)"
msgstr ""
@@ -20084,6 +20217,14 @@ msgid "barn"
msgstr "納屋"
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -20273,7 +20414,7 @@ msgstr ""
msgctxt "content"
msgid "water"
-msgstr ""
+msgstr "水"
msgctxt "content"
msgid "wine"
@@ -20282,32 +20423,6 @@ msgstr "ワイン"
msgid "Bunker Silo"
msgstr "バンカーサイロ"
-msgid "Pipeline"
-msgstr "パイプライン"
-
-msgid "water"
-msgstr "水域(湖沼)"
-
-msgid "gas"
-msgstr "ガス"
-
-msgid "heat"
-msgstr "熱"
-
-msgid "oil"
-msgstr "石油"
-
-msgid "sewage"
-msgstr "下水"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "水面下"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "地上"
-
msgid "Crane"
msgstr "クレーン"
@@ -20392,6 +20507,23 @@ msgstr "横坑"
msgid "Length in meters"
msgstr "メートル単位での長さ"
+msgid "Pipeline"
+msgstr "パイプライン"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "水面下"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "地上"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "給水塔"
@@ -20632,6 +20764,34 @@ msgstr "支点の橋脚"
msgid "Bridge outline"
msgstr "橋の輪郭"
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "発電所"
@@ -21630,7 +21790,7 @@ msgid "Pet"
msgstr "ペット店"
msgid "Photo"
-msgstr ""
+msgstr "写真"
msgid "Funeral Directors"
msgstr "葬儀社"
@@ -21672,7 +21832,7 @@ msgid "photos"
msgstr "写真"
msgid "public_transport_plans"
-msgstr "公共輸送計画"
+msgstr "時刻表"
msgid "public_transport_tickets"
msgstr "乗車券"
@@ -21705,7 +21865,7 @@ msgid "Debit cards"
msgstr "デビットカード"
msgid "BankAxess"
-msgstr ""
+msgstr "BankAxess"
msgid "Bancomat"
msgstr "Bancomat"
@@ -21768,7 +21928,7 @@ msgid "Minicash (lu)"
msgstr "Minicash (lu)"
msgid "Minipay (it)"
-msgstr ""
+msgstr "Minipay (it)"
msgid "Mondero (ar)"
msgstr "Mondero (ar)"
@@ -21797,6 +21957,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "地理"
@@ -22137,6 +22388,29 @@ msgstr "農業施設用地"
msgid "Farmland"
msgstr "農地"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "牧草地"
@@ -23120,6 +23394,9 @@ msgstr "{0}は数値でなければなりません"
msgid "{0} must be a positive integer number"
msgstr "{0}は正の整数でなければなりません"
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr "種別がないリレーション"
@@ -23175,6 +23452,12 @@ msgstr "通りのラベルを表示(大きいズームの時)"
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSVファイル"
@@ -25277,7 +25560,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -25320,9 +25606,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27953,6 +28239,9 @@ msgstr "タグ付けされていない画像"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "レイヤー {0} の現在の位置調整を保存しますか？"
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "画像較正をロード..."
@@ -27962,6 +28251,9 @@ msgstr "ファイルから位置調整データを読み込みます"
msgid "Loading file failed: {0}"
msgstr "ファイルのロードに失敗: {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr "ワールドファイルの位置調整を読み込む..."
@@ -28003,6 +28295,9 @@ msgstr ""
"KMLの位置合わせはベータ版であり、レイヤーを正しく位置調整できないことがあります。\n"
"正しく位置調整できないKMLファイルは {0} にアップロードしてください。"
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "写真レイヤーを移動"
@@ -28118,8 +28413,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "これを適用しますか？"
-msgid "Load calibration file ?"
-msgstr "位置合わせファイルを読み込みますか？"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr "自動的に適用されます。"
@@ -28355,9 +28650,6 @@ msgstr "州(state)"
msgid "pending"
msgstr "保留"
-msgid "outside"
-msgstr "外部"
-
msgid "[incomplete]"
msgstr "[不完全]"
diff --git a/i18n/po/ka.po b/i18n/po/ka.po
index 93dc0ec..40b51e2 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2011-12-16 00:14+0000\n"
"Last-Translator: datogogishvili <Unknown>\n"
"Language-Team: Georgian <ka at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:41+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:40+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: ka\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr "JOSM-ის შესახებ"
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2136,13 +2142,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2156,6 +2158,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2350,6 +2361,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2368,9 +2382,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3165,12 +3176,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "უცნიბი"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4762,6 +4773,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4934,7 +4952,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5736,20 +5754,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6981,13 +6994,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11944,6 +11960,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12106,6 +12125,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13942,6 +13964,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14548,6 +14574,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14575,7 +14604,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15151,6 +15183,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15296,6 +15331,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15334,6 +15374,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15767,9 +15812,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15837,6 +15894,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15931,6 +15991,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16471,6 +16534,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16492,12 +16558,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16599,6 +16741,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17138,12 +17283,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17261,6 +17409,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17665,6 +17819,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18303,12 +18466,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18492,6 +18649,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19154,25 +19314,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19752,6 +19893,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19950,32 +20099,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20060,6 +20183,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20300,6 +20440,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21465,6 +21633,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21804,6 +22063,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22787,6 +23069,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22842,6 +23127,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24816,7 +25107,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24859,9 +25153,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27446,6 +27740,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27455,6 +27752,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27494,6 +27794,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27607,7 +27910,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27844,9 +28147,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/km.po b/i18n/po/km.po
index 701b914..c2f10d7 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-01-27 10:25+0000\n"
"Last-Translator: Sophea Sok <sksophea at gmail.com>\n"
"Language-Team: Khmer <km at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:47+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:47+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -172,6 +172,12 @@ msgstr "កម្មវិធីជំនួយខាងក្នុង
msgid "About JOSM..."
msgstr "អំពី JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "បានបរាជ័យក្នុងការផ្ទុកធនធាន ''{0}'', កំហុសគឺ {1} ។"
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2268,14 +2274,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "ជ្រើស ផ្លាស់ទី ធ្វើមាត្រដ្ឋាន និងបង្វិលវត្ថុ"
-msgid "Move elements"
-msgstr "ផ្លាស់ទីធាតុ"
-
-msgid "Move them"
-msgstr "ផ្លាស់ទីវា"
-
-msgid "Undo move"
-msgstr "មិនធ្វើវិញការផ្លាស់ទី"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2290,6 +2292,15 @@ msgstr[0] ""
"ការផ្លាស់ទីធាតុច្រើនគឺតែងតែមានបញ្ហា។\n"
"ផ្លាស់ទីពួកវាមែនឬ?"
+msgid "Move elements"
+msgstr "ផ្លាស់ទីធាតុ"
+
+msgid "Move them"
+msgstr "ផ្លាស់ទីវា"
+
+msgid "Undo move"
+msgstr "មិនធ្វើវិញការផ្លាស់ទី"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "ប្រលែងប៊ូតុងកណ្ដុរដើម្បីជ្រើសវត្ថុនៅក្នុងចតុកោណ។"
@@ -2493,6 +2504,9 @@ msgstr ""
msgid "add toolbar button"
msgstr "បន្ថែមប៊ូតុងរបារឧបករណ៍"
+msgid "Invalid search expression"
+msgstr "កន្សោមស្វែងរកមិនត្រឹមត្រូវ"
+
msgid "Filter"
msgstr "តម្រង"
@@ -2514,9 +2528,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "កន្សោមស្វែងរកមិនត្រឹមត្រូវ"
-
msgid "basic examples"
msgstr "ឧទាហរណ៍មូលដ្ឋាន"
@@ -3360,12 +3371,12 @@ msgstr "Imperial"
msgid "Nautical Mile"
msgstr "Nautical Mile"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "បានបរាជ័យក្នុងការផ្ទុកធនធាន ''{0}'', កំហុសគឺ {1} ។"
-
msgid "UNKNOWN"
msgstr "មិនស្គាល់"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
"លេខកំណែ JOSM ដែលមិនរំពឹងទុកនៅក្នុងឯកសារពិនិត្យឡើងវិញ តម្លៃគឺ "
@@ -5048,6 +5059,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "ម៉ឺនុយ៖ {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "របារឧបករណ៍កែសម្រួល"
@@ -5224,14 +5242,10 @@ msgstr "ដល់ក្រឡា"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>ជាទូទៅអ្នកអាចបញ្ចូល <strong>អាសយដ្ឋានក្រឡា</strong> "
-"សម្រាប់ក្រឡាទោលនៅក្នុងទ្រង់ទ្រាយ <i>zoomlevel/x/y</i>, i.e. "
-"<i>15/256/223</i> ។ អាសយដ្ឋានក្រឡានៅក្នុងទ្រង់ទ្រាយ <i>zoom,x,y</i> ឬ "
-"<i>zoom;x;y</i> ក៏ត្រឹមត្រូវផងដែរ។</html>"
msgid "Tile address:"
msgstr "អាសយដ្ឋានក្រឡា៖"
@@ -6120,26 +6134,15 @@ msgstr "ដោះស្រាយការប៉ះទង្គិច"
msgid "Resolve conflicts for ''{0}''"
msgstr "ដោះស្រាយការប៉ះទង្គិចសម្រាប់ ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>សូមបញ្ជាក់ដើម្បីលុប <strong>វត្ថុ 1</strong> ចេញពី "
-"<strong>ទំនាក់ទំនង 1</strong> ។</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>សូមបញ្ជាក់ដើម្បីលុប <strong>វត្ថុ 1</strong> ចេញពី "
-"<strong>ទំនាក់ទំនង {0}</strong> ។</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>សូមបញ្ជាក់ដើម្បីលុប <strong>វត្ថុ {0}</strong> ចេញពី "
-"<strong>ទំនាក់ទំនង {1}</strong> ។</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7459,14 +7462,17 @@ msgstr "ស្លាក/សមាជិកភាព"
msgid "Tags for selected objects."
msgstr "ស្លាកសម្រាប់វត្ថុដែលបានជ្រើស។"
+msgid "<different>"
+msgstr "<ខុសគ្នា>"
+
msgid "Member Of"
msgstr "សមាជិករបស់"
msgid "Position"
msgstr "ទីតាំង"
-msgid "<different>"
-msgstr "<ខុសគ្នា>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -12973,6 +12979,9 @@ msgstr ""
"ការដាក់ស្លាកការកំណត់ស្រេច \"{0}-{1}\" បានខូច - ចំនួនធាតុនៅក្នុង "
"''display_values'' ត្រូវតែដូចទៅនឹង ''values''"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13163,6 +13172,9 @@ msgstr "កំពុងទាញយកចំណុច {0} ទៅ {1}...
msgid "Contacting OSM Server..."
msgstr "កំពុងទាក់ទងម៉ាស៊ីនមេ OSM..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "បានបរាជ័យក្នុងការបើកស្ទ្រីមបញ្ចូលសម្រាប់ធនធាន ''{0}''"
@@ -15322,6 +15334,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "ព្រៃគុម្ពោត"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "ផ្លូវពាក់ព័ន្ធ"
@@ -15928,6 +15944,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -15955,7 +15974,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -16531,6 +16553,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -16706,6 +16731,11 @@ msgstr ""
"អនុញ្ញាតអ្នកប្រើឲ្យកំណត់ត្រាពេលវេលាអនាមិក និងលុបផ្នែកដាន GPX "
"ធំយ៉ាងរហ័ស។"
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
"បង្ហាញប្រវត្តិរូបការវាយតម្លៃ និងទិន្នន័យស្ថិតិមួយចំនួនរបស់ដាន GPX ។"
@@ -16753,6 +16783,11 @@ msgstr "អនុញ្ញាតឲ្យត្រងដានជី
msgid "Visualizes routing information as a routing graph."
msgstr "បង្ហាញព័ត៌មានការនាំផ្លូវជាក្រាហ្វិកការនាំផ្លូវ។"
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "ឧបករណ៍ធម្មតាសម្រាប់ដាក់ស្លាកលេខផ្ទះ។"
@@ -17235,9 +17270,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -17305,6 +17352,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -17399,6 +17449,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -17939,6 +17992,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -17960,12 +18016,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -18067,6 +18199,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -18606,12 +18741,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -18729,6 +18867,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -19133,6 +19277,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -19771,12 +19924,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -19960,6 +20107,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20622,25 +20772,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -21220,6 +21351,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -21418,32 +21557,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -21528,6 +21641,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -21768,6 +21898,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -22933,6 +23091,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -23272,6 +23521,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -24255,6 +24527,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -24310,6 +24585,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -26284,7 +26565,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -26327,9 +26611,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -28914,6 +29198,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -28923,6 +29210,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -28962,6 +29252,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -29075,7 +29368,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -29312,9 +29605,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/ko.po b/i18n/po/ko.po
index aeafa38..f79b8f1 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-10-04 14:18+0000\n"
"Last-Translator: Myeongjin <aranet100 at gmail.com>\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-10-30 04:48+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:48+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: ko\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -171,6 +171,12 @@ msgstr "플러그인"
msgid "About JOSM..."
msgstr "JOSM 정보..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2122,15 +2128,11 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
-msgid "Undo move"
-msgstr "이동 취소"
-
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
"an error.\n"
@@ -2142,6 +2144,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr "이동 취소"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "사각형 안의 개체를 선택하려면 마우스 버튼을 떼십시오"
@@ -2336,6 +2347,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr "필터"
@@ -2354,9 +2368,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3146,12 +3157,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "알 수 없음"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4740,6 +4751,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4912,7 +4930,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5714,20 +5732,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6959,14 +6972,17 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr "<차이점>"
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
-msgstr "<차이점>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -11927,6 +11943,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12089,6 +12108,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13925,6 +13947,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14531,6 +14557,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14558,7 +14587,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15134,6 +15166,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15279,6 +15314,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15317,6 +15357,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15750,9 +15795,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15820,6 +15877,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15914,6 +15974,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16454,6 +16517,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16475,12 +16541,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16582,6 +16724,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17121,12 +17266,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17244,6 +17392,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17648,6 +17802,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18286,12 +18449,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18475,6 +18632,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19137,25 +19297,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19735,6 +19876,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19933,32 +20082,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20043,6 +20166,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20283,6 +20423,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21448,6 +21616,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21787,6 +22046,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22770,6 +23052,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22825,6 +23110,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24799,7 +25090,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24842,9 +25136,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27429,6 +27723,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27438,6 +27735,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27477,6 +27777,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27590,7 +27893,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27827,9 +28130,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/ky.po b/i18n/po/ky.po
index 8a924e5..e531751 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2012-12-18 02:36+0000\n"
"Last-Translator: SimpleLeon <Unknown>\n"
"Language-Team: Kirghiz <ky at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:48+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:47+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -168,6 +168,12 @@ msgstr "Модулдар"
msgid "About JOSM..."
msgstr "JOSM жөнүндө..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2130,13 +2136,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2150,6 +2152,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2344,6 +2355,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2362,9 +2376,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3159,10 +3170,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4756,6 +4767,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4928,7 +4946,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5730,20 +5748,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6975,13 +6988,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11938,6 +11954,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12100,6 +12119,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13936,6 +13958,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14542,6 +14568,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14569,7 +14598,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15145,6 +15177,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15290,6 +15325,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15328,6 +15368,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15761,9 +15806,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15831,6 +15888,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15925,6 +15985,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16465,6 +16528,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16486,12 +16552,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16593,6 +16735,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17132,12 +17277,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17255,6 +17403,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17659,6 +17813,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18297,12 +18460,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18486,6 +18643,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19148,25 +19308,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19746,6 +19887,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19944,32 +20093,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20054,6 +20177,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20294,6 +20434,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21459,6 +21627,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21798,6 +22057,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22781,6 +23063,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22836,6 +23121,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24810,7 +25101,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24853,9 +25147,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27440,6 +27734,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27449,6 +27746,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27488,6 +27788,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27601,7 +27904,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27838,9 +28141,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/lo.po b/i18n/po/lo.po
index e731bed..52d76ed 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2009-09-15 10:06+0000\n"
"Last-Translator: Anousone <Unknown>\n"
"Language-Team: Lao <lo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:48+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:48+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr "ຕົວເສີມ"
msgid "About JOSM..."
msgstr "ກ່ຽວກັບ JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,12 +3171,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "ທີ່ບໍ່ມີການບັນທຶກ"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/lt.po b/i18n/po/lt.po
index 05debb4..1923ee2 100644
--- a/i18n/po/lt.po
+++ b/i18n/po/lt.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-18 11:39+0000\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-22 14:51+0000\n"
"Last-Translator: Aurimas Fišeras <Unknown>\n"
"Language-Team: Lithuanian <lt at li.org>\n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:49+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:49+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: lt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -173,6 +173,12 @@ msgstr "Papildiniai"
msgid "About JOSM..."
msgstr "Apie JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Nepavyko įkelti resurso „{0}, klaida yra {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -317,7 +323,7 @@ msgid "layer"
msgstr "sluoksnis"
msgid "selection"
-msgstr "parinkimas"
+msgstr "pažymėjimas"
msgid "conflict"
msgstr "prieštaravimas"
@@ -496,7 +502,7 @@ msgstr ""
"norite<br>tęsti?</html>"
msgid "Download data"
-msgstr "Parsiųsti duomenis"
+msgstr "Atsiųsti duomenis"
msgid "Download notes in current view"
msgstr "Atsiųsti pastabas dabartiniame rodinyje"
@@ -951,7 +957,7 @@ msgid "Create a new map layer."
msgstr "Sukurti naują žemėlapio sluoksnį"
msgid "URL Files"
-msgstr "URL Failai"
+msgstr "URL failai"
msgid "Open..."
msgstr "Atverti..."
@@ -1001,7 +1007,7 @@ msgstr[1] "Atveriami {0} failai..."
msgstr[2] "Atveriama {0} failų..."
msgid "Opening file ''{0}'' ..."
-msgstr "Atveriamas failas ''{0}'' ..."
+msgstr "Atveriamas failas „{0}“..."
msgid "Open Location..."
msgstr "Atverti vietą..."
@@ -1028,7 +1034,7 @@ msgid "Download URL"
msgstr "Parsiuntimo URL"
msgid "Start downloading data"
-msgstr "Pradėti duomenų parsiuntimą"
+msgstr "Pradėti duomenų atsiuntimą"
msgid "Close dialog and cancel downloading"
msgstr "Uždaryti dialogą ir nutraukti atsiuntimą"
@@ -1114,28 +1120,28 @@ msgid "Please select ways with angles of approximately 90 or 180 degrees."
msgstr "Prašome pažymėti kelius, kurių kampai daugmaž 90 ar 180 laipsnių."
msgid "Download from Overpass API ..."
-msgstr ""
+msgstr "Atsiųsti iš Overpass API..."
msgid "Download map data from Overpass API server."
-msgstr ""
+msgstr "Atsiųsti žemėlapio duomenis iš Overpass API serverio."
msgid "Builds an Overpass query using the Overpass Turbo query wizard"
-msgstr ""
+msgstr "Sukuria Overpass užklausą naudojant Overpass Turbo užklausų vediklį"
msgid "Build query"
msgstr ""
msgid "<html>The Overpass wizard could not parse the following query:"
-msgstr ""
+msgstr "<html>Overpass vediklius negalėjo išnagrinėti šios užklausos:"
msgid "Parse error"
msgstr ""
msgid "Overpass query: "
-msgstr ""
+msgstr "Overpass užklausa: "
msgid "Overpass server: "
-msgstr ""
+msgstr "Overpass serveris: "
msgid "Paste"
msgstr "Įdėti"
@@ -1279,7 +1285,7 @@ msgid "Save"
msgstr "Išsaugoti"
msgid "Save the current data."
-msgstr "Išsaugoti dabartinius duomenis"
+msgstr "Išsaugoti dabartinius duomenis."
msgid "File {0} exists. Overwrite?"
msgstr "Failas {0} jau yra. Perrašyti?"
@@ -1288,7 +1294,7 @@ msgid "No Exporter found! Nothing saved."
msgstr "Nerastas eksportuotojas! Niekas neįrašyta."
msgid "File exists. Overwrite?"
-msgstr "Failas egzistuoja. Pakeisti?"
+msgstr "Failas egzistuoja. Perrašyti?"
msgid "Save As..."
msgstr "Išsaugoti kaip..."
@@ -1688,7 +1694,7 @@ msgid "There are no selected objects to update."
msgstr "Nėra pažymėtų objektų atnaujinimui"
msgid "Selection empty"
-msgstr "Pažymėjimas yra tuščias"
+msgstr "Pažymėjimas tuščias"
msgid "Upload data"
msgstr "Išsiųsti duomenis"
@@ -2318,14 +2324,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Pažymėti, perkelti, pasukti objektus ir keisti jų dydį"
-msgid "Move elements"
-msgstr "Perkelti elementus"
-
-msgid "Move them"
-msgstr "Perkelti juos"
-
-msgid "Undo move"
-msgstr "Atšaukti perkėlimą"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2348,6 +2350,15 @@ msgstr[2] ""
"dažniausiai yra klaida.\n"
"Tikrai juos perkelti?"
+msgid "Move elements"
+msgstr "Perkelti elementus"
+
+msgid "Move them"
+msgstr "Perkelti juos"
+
+msgid "Undo move"
+msgstr "Atšaukti perkėlimą"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
"Atleiskite pelės mygtuką, kad pažymėtumėte objektus, esančius stačiakampyje."
@@ -2527,16 +2538,16 @@ msgid "Enter the search expression"
msgstr "Įveskite paieškos išraišką"
msgid "replace selection"
-msgstr "keisti parinkimą"
+msgstr "keisti pažymėjimą"
msgid "add to selection"
-msgstr "pridėti prie parinktų"
+msgstr "pridėti prie pažymėtų"
msgid "remove from selection"
-msgstr "pašalinti iš parinktų"
+msgstr "pašalinti iš pažymėtų"
msgid "find in selection"
-msgstr "Rasti pažymėjime"
+msgstr "ieškoti pažymėjime"
msgid "case sensitive"
msgstr "skirti raidžių dydį"
@@ -2548,17 +2559,20 @@ msgid "Also include incomplete and deleted objects in search."
msgstr "Taipogi įtraukti į paiešką nepilnus ir ištrintus objektus."
msgid "standard"
-msgstr ""
+msgstr "standartinė"
msgid "regular expression"
msgstr "reguliarusis reiškinys"
msgid "MapCSS selector"
-msgstr ""
+msgstr "MapCSS parinkiklis"
msgid "add toolbar button"
msgstr "pridėti įrankių juostos mygtuką"
+msgid "Invalid search expression"
+msgstr "Netinkama paieškos išraiška"
+
msgid "Filter"
msgstr "Filtras"
@@ -2580,9 +2594,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Netinkama paieškos išraiška"
-
msgid "basic examples"
msgstr "paprasti pavyzdžiai"
@@ -2849,7 +2860,7 @@ msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Netikėta leksema. Tikėtasi {0}, rasta {1}"
msgid "Failed to parse MapCSS selector"
-msgstr ""
+msgstr "Nepavyko išnagrinėti MapCSS parinkiklio"
msgid "Unexpected token: {0}"
msgstr "Netikėta leksema: {0}"
@@ -3473,12 +3484,12 @@ msgstr "Britiška"
msgid "Nautical Mile"
msgstr "Jūrmylės"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Nepavyko įkelti resurso „{0}, klaida yra {1}."
-
msgid "UNKNOWN"
msgstr "NEŽINOMAS"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr "Netikėta JOSM versija peržiūros faile, reikšmė yra „{0}“"
@@ -4486,7 +4497,7 @@ msgid "Value ''{0}'' for key ''{1}'' not in presets."
msgstr "Rakto „{1}“ reikšmės „{0}“ nėra ruošiniuose."
msgid "Presets do not contain property value"
-msgstr "Išankstiniuose rinkiniuose nėra savybės reikšmės"
+msgstr "Ruošiniuose nėra savybės reikšmės"
msgid "FIXMES"
msgstr "PATAISYKMANE"
@@ -4803,7 +4814,7 @@ msgid "IO Exception"
msgstr "Įvesties/išvesties klaida"
msgid "Illegal Data"
-msgstr "Nelegalūs Duomenys"
+msgstr "Neleistini duomenys"
msgid "Offline mode"
msgstr "Režimas neprisijungus"
@@ -4870,7 +4881,7 @@ msgstr "Vaizdų poslinkis"
msgctxt "menu"
msgid "Imagery"
-msgstr ""
+msgstr "Vaizdai"
msgctxt "layer"
msgid "Offset"
@@ -5075,9 +5086,9 @@ msgstr "Atmesti"
msgid "JOSM found {0} unsaved osm data layer. "
msgid_plural "JOSM found {0} unsaved osm data layers. "
-msgstr[0] "JOSM rado {0} neįrašytą 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ų. "
+msgstr[0] "JOSM rado {0} neišsaugotą osm duomenų sluoksnį. "
+msgstr[1] "JOSM rado {0} neišsaugotus osm duomenų sluoksnius. "
+msgstr[2] "JOSM rado {0} neišsaugotų osm duomenų sluoksnių. "
msgid ""
"It looks like JOSM crashed last time. Would you like to restore the data?"
@@ -5114,35 +5125,35 @@ msgstr ""
msgctxt "menu"
msgid "File"
-msgstr ""
+msgstr "Failas"
msgctxt "menu"
msgid "Edit"
-msgstr ""
+msgstr "Taisa"
msgctxt "menu"
msgid "View"
-msgstr ""
+msgstr "Rodymas"
msgctxt "menu"
msgid "Tools"
-msgstr ""
+msgstr "Įrankiai"
msgctxt "menu"
msgid "More tools"
-msgstr ""
+msgstr "Daugiau įrankių"
msgctxt "menu"
msgid "Data"
-msgstr ""
+msgstr "Duomenys"
msgctxt "menu"
msgid "Selection"
-msgstr ""
+msgstr "Pažymėjimas"
msgctxt "menu"
msgid "Presets"
-msgstr ""
+msgstr "Ruošiniai"
msgid "More..."
msgstr "Daugiau..."
@@ -5153,15 +5164,22 @@ msgstr ""
msgctxt "menu"
msgid "Windows"
-msgstr ""
+msgstr "Langai"
msgctxt "menu"
msgid "Help"
-msgstr ""
+msgstr "Žinynas"
msgid "Menu: {0}"
msgstr "Meniu: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "Keitimo įrankių juosta"
@@ -5185,7 +5203,7 @@ msgstr "Ieškoti meniu elementų"
msgctxt "menu"
msgid "Audio"
-msgstr ""
+msgstr "Garsas"
msgid "Do not hide toolbar"
msgstr "Neslėpti įrankių juostos"
@@ -5339,13 +5357,10 @@ msgstr "iki kaladėlės"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"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 "Kaladėlių adresas:"
@@ -6233,26 +6248,15 @@ msgstr "Išspręsti konfliktus"
msgid "Resolve conflicts for ''{0}''"
msgstr "Išspręsti „{0}“ konfliktus"
-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 "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-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 "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7566,14 +7570,17 @@ msgstr "Žymos/narystės"
msgid "Tags for selected objects."
msgstr "Žymos, pažymėtiems objektams"
+msgid "<different>"
+msgstr "<įvairūs>"
+
msgid "Member Of"
msgstr "Šio ryšio narys"
msgid "Position"
msgstr "Padėtis"
-msgid "<different>"
-msgstr "<įvairūs>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Objektai: {2} / Žymos: {0} / Narystės: {1}"
@@ -8545,13 +8552,13 @@ msgid "Changeset source"
msgstr "Pakeitimo šaltinis"
msgid "Imagery used"
-msgstr "Naudota ortofoto"
+msgstr "Naudoti vaizdai"
msgid "<b>Source</b>:"
msgstr "<b>Šaltinis</b>:"
msgid "<b>Imagery</b>:"
-msgstr "<b>Ortofoto</b>:"
+msgstr "<b>Vaizdai</b>:"
msgid ""
"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
@@ -8791,10 +8798,10 @@ msgid "Enter credentials for OSM API"
msgstr "Įveskite prisijungimo prie OSM API duomenis"
msgid "Enter credentials for host"
-msgstr "Įveskite prisijungimo prie stoties duomenis"
+msgstr "Įveskite prisijungimo prie serverio duomenis"
msgid "Enter credentials for HTTP proxy"
-msgstr "Įveskite HTTP šliuzo prisijungimo duomenis"
+msgstr "Įveskite HTTP tarpinio serverio prisijungimo duomenis"
msgid "Password"
msgstr "Slaptažodis"
@@ -11960,7 +11967,7 @@ msgid "Simultaneous connections:"
msgstr "Vienalaikės jungtys:"
msgid "Tile size:"
-msgstr "Kaladėlės dydis"
+msgstr "Kaladėlės dydis:"
msgid "Auto save enabled"
msgstr "Automatinis įrašymas įjungtas"
@@ -12623,12 +12630,15 @@ msgstr "OSM slaptažodis"
msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
+"Nepavyko gauti OSM prisijungimo duomenų iš prisijungimo duomenų tvarkytuvės."
msgid "Current credential manager is of type ''{0}''"
-msgstr "Dabartinis kvalifikuotas valdytojas yra tipo ''{0}''"
+msgstr "Dabartinė prisijungimo duomenų tvarkytuvė yra „{0}“ tipo"
msgid "Failed to save OSM credentials to credential manager."
-msgstr "Nepavyko išsaugoti OSM kvalifikacijų kvalifikuotam valdytojui."
+msgstr ""
+"Nepavyko išsaugoti OSM prisijungimo duomenų į prisijungimo duomenų "
+"tvarkytuvę."
msgid "Periodically check for new messages"
msgstr "Periodiškai tikrinti, ar nėra naujų pranešimų"
@@ -12980,11 +12990,12 @@ msgstr "Naujas ryšys"
msgid ""
"The preset <i>{0}</i> cannot be applied since nothing has been selected!"
-msgstr ""
+msgstr "Ruošinys <i>{0}</i> negali būti pritaikytas nes niekas nepažymėta!"
msgid ""
"The preset <i>{0}</i> cannot be applied since the selection is unsuitable!"
msgstr ""
+"Ruošinys <i>{0}</i> negali būti pritaikytas nes pažymėjimas netinkamas!"
msgid "Change {0} object"
msgid_plural "Change {0} objects"
@@ -13083,6 +13094,9 @@ msgstr ""
"Klaidingas žymėjimo ruošinys „{0}-{1}“ – „display_values“ elementų skaičius "
"privalo būti toks pat kaip „values“"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13264,6 +13278,9 @@ msgstr "Atsiunčiami taškai {0} į {1}..."
msgid "Contacting OSM Server..."
msgstr "Susisiekiama su OSM serveriu..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -15036,6 +15053,9 @@ msgid ""
"going to be prompted by Windows to remove this insecure certificate.<br>For "
"your own safety, <b>please click Yes</b> in next dialog."
msgstr ""
+"Panašu, kad tai gali būti reikšminga <b>saugumo rizika</b>.<br><br>Windows "
+"jūsų paprašys pašalinti šį nesaugų liudijimą.<br>Jūsų saugumui, <b>spauskite "
+"Taip</b> kitame dialogo lange."
msgid "Removing insecure certificate from {0} keystore: {1}"
msgstr ""
@@ -15054,6 +15074,12 @@ msgid ""
"next dialog.<br><br>If unsure, you can also click No then disable HTTPS "
"support in Remote Control preferences."
msgstr ""
+"Nuotolinis valdymas sukonfigūruotas teikti HTTPS palaikymą.<br>Tam reikia "
+"pridėti JOSM sugeneruotą savą liudijimą į Windows vyriausiųjų liudijimų "
+"įstaigų (CA) saugyklą.<br><br>Windows jūsų paprašys patvirtinti šią "
+"operaciją.<br>Tinkamam HTTPS palaikymui įjungti, <b>spauskite Taip</b> "
+"kitame dialogo lange.<br><br>Jei nesate tikri, galite spausti Ne ir išjungti "
+"HTTPS palaikymą nuotolinio valdymo nustatymuose."
msgid "HTTPS support in Remote Control"
msgstr ""
@@ -15234,6 +15260,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "krūmai"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "asocijuotaGatvė"
@@ -15485,7 +15515,7 @@ msgid "OpenStreetMap GPS Traces"
msgstr "OpenStreetMap GPS trasos"
msgid "OpenStreetMap (Standard layer)"
-msgstr ""
+msgstr "OpenStreetMap (Standartinis sluoksnis)"
msgid "skobbler"
msgstr ""
@@ -15846,6 +15876,9 @@ msgstr "Dronų nuotraukos (Haitis)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Dronų nuotraukos 2014 (Haitis)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -15873,8 +15906,11 @@ msgstr "OSMIE parapijos"
msgid "OSMIE Baronies"
msgstr "OSMIE baronijos"
-msgid "OSMIE Political"
-msgstr "OSMIE politinis"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
+msgstr ""
msgid "Lodi - Italy"
msgstr "Lodis - Italija"
@@ -16449,6 +16485,9 @@ msgstr "OS miesto planai, Nairnas 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "OS miesto planai, Obanas 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "OS miesto planai, Peebles 1856 (NLS)"
@@ -16594,6 +16633,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
"Rodo aukščio profilį ir šiek tiek statistinių duomenų iš GPX pėdsako."
@@ -16636,6 +16680,11 @@ msgid "Visualizes routing information as a routing graph."
msgstr ""
"Vizualizuoja maršruto parinkimo informaciją kaip maršruto parinkimo grafą."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "Paprastas įrankis pažymėti namų numerius."
@@ -17080,9 +17129,21 @@ msgstr ""
msgid "Lanes"
msgstr "Juostos"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Greičio riba (km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Tiltas"
@@ -17150,6 +17211,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Elektrifikavimas"
@@ -17244,6 +17308,9 @@ msgstr ""
msgid "isolated"
msgstr "izoliuotas"
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr "Aukštis (metrais)"
@@ -17784,6 +17851,9 @@ msgstr "Mokestis"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -17805,12 +17875,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "vanduo"
+
+msgid "gas"
+msgstr "dujos"
+
+msgid "heat"
+msgstr "karštis"
+
+msgid "oil"
+msgstr "nafta"
+
+msgid "sewage"
+msgstr "nuotėkos"
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Gatvės"
msgid "Motorway"
msgstr "Automagistralė/Greitkelis"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Automagistralės/Greitkelio jungtis"
@@ -17912,6 +18058,9 @@ msgstr "privažiavimas_prie_stovėjimo_vietų"
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Privažiavimas prie stovėjimo vietų aikštelėje"
@@ -18451,12 +18600,15 @@ msgstr "Apsisukimo ratas"
msgid "Turning Loop"
msgstr "Apsisukimo kilpa"
-msgid "City Limit"
-msgstr "Miesto riba"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Greičio matuoklis"
@@ -18574,6 +18726,12 @@ msgstr "Atitvarai"
msgid "Wall"
msgstr "Siena"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Miesto siena"
@@ -18978,6 +19136,15 @@ msgstr "CNG (suspaustos gamtinės dujos)"
msgid "Pier"
msgstr "Molas"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -19404,13 +19571,13 @@ msgid "aerialway"
msgstr ""
msgid "From (initial stop)"
-msgstr ""
+msgstr "Iš (pradinė stotelė)"
msgid "To (terminal stop)"
msgstr "Į (galutinė stotelė)"
msgid "Via (intermediate stops)"
-msgstr "Per (tarpiniai sustojimai)"
+msgstr "Per (tarpinės stotelės)"
msgid "Network"
msgstr "Tinklas"
@@ -19451,13 +19618,13 @@ msgid "#CD853F"
msgstr "#CD853F"
msgid "stop position"
-msgstr ""
+msgstr "sustojimo vieta"
msgid "stop position (exit only)"
-msgstr ""
+msgstr "sustojimo vieta (tik išėjimas)"
msgid "stop position (entry only)"
-msgstr ""
+msgstr "sustojimo vieta (tik įėjimas)"
msgid "platform"
msgstr "platforma"
@@ -19584,7 +19751,7 @@ msgid "Railway Halt"
msgstr ""
msgid "Tram Stop"
-msgstr ""
+msgstr "Tramvajaus stotelė"
msgid "Railway Platform"
msgstr "Geležinkelio platforma"
@@ -19616,12 +19783,6 @@ msgstr "Aerouostas"
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Kilimo/leidimosi takas"
@@ -19805,6 +19966,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Greitas Maistas"
@@ -20453,7 +20617,7 @@ msgid "Clock"
msgstr "Laikrodis"
msgid "Display"
-msgstr ""
+msgstr "Ekranas"
msgid "analog"
msgstr ""
@@ -20467,25 +20631,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -21065,6 +21210,14 @@ msgid "barn"
msgstr "daržinė"
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -21263,32 +21416,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "Vamzdynas"
-
-msgid "water"
-msgstr "vanduo"
-
-msgid "gas"
-msgstr "dujos"
-
-msgid "heat"
-msgstr "karštis"
-
-msgid "oil"
-msgstr "nafta"
-
-msgid "sewage"
-msgstr "nuotėkos"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "po vandeniu"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "po žeme"
-
msgid "Crane"
msgstr "Kranas"
@@ -21373,6 +21500,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr "Vamzdynas"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "po vandeniu"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "po žeme"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -21613,6 +21757,34 @@ msgstr ""
msgid "Bridge outline"
msgstr "Tilto kontūras"
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "Elektrinė"
@@ -22778,6 +22950,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Geografija"
@@ -23124,6 +23387,29 @@ msgstr "Ūkio kiemas (ferma)"
msgid "Farmland"
msgstr "Dirbamoji žemė"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Pieva"
@@ -23631,7 +23917,7 @@ msgid "where enforcement ends"
msgstr ""
msgid "traffic light or barrier that stops you"
-msgstr ""
+msgstr "šviesoforas ar sustabdantis barjeras"
msgid "Routes"
msgstr ""
@@ -24111,6 +24397,9 @@ msgstr "{0} privalo būti skaitinė reikšmė"
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -24166,6 +24455,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24790,7 +25085,7 @@ msgid "edit new tag"
msgstr ""
msgid "Display clock in 12h mode."
-msgstr ""
+msgstr "Rodyti 12-os valandų laikrodį."
msgid "Choose key"
msgstr ""
@@ -25250,7 +25545,7 @@ msgid "Select an area (e.g. building) from an underlying image."
msgstr ""
msgid "Area Selector"
-msgstr ""
+msgstr "Ploto parinkiklis"
msgid "Created area"
msgstr ""
@@ -25273,7 +25568,7 @@ msgid ""
msgstr ""
msgid "Area Selector - Preferences"
-msgstr ""
+msgstr "Ploto parinkiklis – nustatymai"
msgid "Settings for the area detection algorithm."
msgstr "Ploto aptikimo algoritmo nustatymai."
@@ -26166,7 +26461,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -26209,9 +26507,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -26317,7 +26615,7 @@ msgid "CmdLine:"
msgstr ""
msgid "External tools"
-msgstr ""
+msgstr "Išoriniai įrankiai"
msgid "Delete tool \"{0}\"?"
msgstr ""
@@ -27550,10 +27848,10 @@ msgid "Select pictures"
msgstr "Pažymėkite nuotraukas"
msgid "Import pictures into sequence"
-msgstr ""
+msgstr "Importuoti nuotraukas į seką"
msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
+msgstr "Importuoti nuotraukas į Mapillary sluoksnį kaip seką"
msgid "Join mode"
msgstr ""
@@ -27565,19 +27863,19 @@ msgid "Join Mapillary pictures"
msgstr ""
msgid "Upload pictures"
-msgstr ""
+msgstr "Išsiųsti nuotraukas"
msgid "Upload Mapillary pictures"
msgstr ""
msgid "Upload pictures."
-msgstr ""
+msgstr "Išsiųsti nuotraukas."
msgid "Walk mode"
-msgstr ""
+msgstr "Ėjimo veiksena"
msgid "Start walk mode"
-msgstr ""
+msgstr "Pradėti ėjimo veikseną"
msgid "Zoom to selected image"
msgstr ""
@@ -27592,7 +27890,7 @@ msgid "Approve upload on the website"
msgstr ""
msgid "View in website"
-msgstr ""
+msgstr "Peržiūrėti svetainėje"
msgid "Copy key"
msgstr ""
@@ -27727,19 +28025,19 @@ msgid "Jumps to the picture at the other side of the blue line"
msgstr "Peršoka į nuotrauką kitoje mėlynos linijos pusėje"
msgid "Stops the walk."
-msgstr ""
+msgstr "Sustabdo ėjimą."
msgid "Play"
-msgstr ""
+msgstr "Leisti"
msgid "Continues with the paused walk."
-msgstr ""
+msgstr "Pratęsia pristabdytą ėjimą."
msgid "Pause"
-msgstr ""
+msgstr "Pristabdyti"
msgid "Pauses the walk."
-msgstr ""
+msgstr "Pristabdo ėjimą."
msgid "Reverse buttons position when displaying images."
msgstr ""
@@ -28011,7 +28309,7 @@ msgid "Use {0}"
msgstr ""
msgid "Encrypt data with Windows logon credentials"
-msgstr ""
+msgstr "Šifruoti duomenis su Windows prisijungimo duomenimis"
msgid "The native password manager plugin detected {0} on your system."
msgstr ""
@@ -28146,7 +28444,7 @@ msgid "Tools"
msgstr "Įrankiai"
msgid "Open tools menu for this data."
-msgstr ""
+msgstr "Atverti įrankių meniu šiems duomenims."
msgid "Open the OpenData window."
msgstr ""
@@ -28175,7 +28473,7 @@ msgid "Overpass API server:"
msgstr "Overpass API serveris:"
msgid "Overpass API server used to download OSM data"
-msgstr ""
+msgstr "Overpass API serveris naudojamas OSM duomenims atsiųsti"
msgid "XAPI server:"
msgstr "XAPI serveris:"
@@ -28183,6 +28481,7 @@ msgstr "XAPI serveris:"
msgid ""
"XAPI server used to download OSM data when Overpass API is not available"
msgstr ""
+"XAPI serveris naudojamas OSM duomenims atsiųsti kai Overpass API neprieinama"
msgid "Download modules"
msgstr ""
@@ -28822,6 +29121,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "Įkelti paveikslėlių kalibraciją..."
@@ -28831,6 +29133,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -28870,6 +29175,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -28983,7 +29291,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -29093,7 +29401,7 @@ msgid "Printing has been cancelled."
msgstr ""
msgid "Printing stopped"
-msgstr ""
+msgstr "Spausdinimas sustabdytas"
msgid "Printing has failed."
msgstr ""
@@ -29220,9 +29528,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
@@ -29254,7 +29559,7 @@ msgid "Itinerary"
msgstr ""
msgid "Stops"
-msgstr ""
+msgstr "Stotelės"
msgid "Meta"
msgstr ""
@@ -29771,7 +30076,7 @@ msgid ""
msgstr ""
msgid "Enter credentials for Separate Data Store API"
-msgstr ""
+msgstr "Įveskite prisijungimo prie „Separate Data Store API“ duomenis"
msgid "Please enter the user name of your SDS account"
msgstr ""
@@ -29845,7 +30150,7 @@ msgid "SDS password"
msgstr "SDS slaptažodis"
msgid "Test credentials now"
-msgstr ""
+msgstr "Tikrinti prisijungimo duomenis dabar"
msgid "SDS tag prefix"
msgstr ""
@@ -31261,10 +31566,10 @@ msgid "The selected nodes can not be consecutive nodes in the object."
msgstr ""
msgid "Split adjacent ways"
-msgstr ""
+msgstr "Perskirti gretimus kelius"
msgid "Split adjacent ways on T-intersections"
-msgstr ""
+msgstr "Perskirti gretimus kelius T sankryžose"
msgid ""
"There are several ways containing one of the splitting nodes. Select ways "
@@ -31605,7 +31910,7 @@ msgid "Play/Pause"
msgstr "Groti/Pauzė"
msgid "starts/pauses video playback"
-msgstr ""
+msgstr "pradeda/pristabdo vaizdo grojimą"
msgid "Video: {0}"
msgstr "Video: {0}"
diff --git a/i18n/po/lv.po b/i18n/po/lv.po
index 1f87f48..e16b65a5 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2012-10-03 22:16+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Latvian <lv at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:49+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:49+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: lv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr "Spraudņi"
msgid "About JOSM..."
msgstr "Par JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2142,13 +2148,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2162,6 +2164,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2356,6 +2367,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2374,9 +2388,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3171,12 +3182,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "NEZINĀMS"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4767,6 +4778,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4939,7 +4957,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5741,20 +5759,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6986,13 +6999,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11949,6 +11965,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12111,6 +12130,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13951,6 +13973,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14557,6 +14583,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14584,7 +14613,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15160,6 +15192,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15305,6 +15340,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15343,6 +15383,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15776,9 +15821,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15846,6 +15903,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15940,6 +16000,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16480,6 +16543,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16501,12 +16567,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16608,6 +16750,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17147,12 +17292,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17270,6 +17418,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17674,6 +17828,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18312,12 +18475,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18501,6 +18658,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19163,25 +19323,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19761,6 +19902,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19959,32 +20108,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20069,6 +20192,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20309,6 +20449,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21474,6 +21642,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21813,6 +22072,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22796,6 +23078,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22851,6 +23136,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24825,7 +25116,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24868,9 +25162,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27455,6 +27749,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27464,6 +27761,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27503,6 +27803,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27616,7 +27919,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27853,9 +28156,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/mk.po b/i18n/po/mk.po
index b9120f8..51ff8e6 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2013-05-11 04:37+0000\n"
"Last-Translator: Bojan Jankuloski <bojan.jankuloski at gmail.com>\n"
"Language-Team: Macedonian <mk at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:50+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:50+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: mk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -170,6 +170,12 @@ msgstr "Приклучоци"
msgid "About JOSM..."
msgstr "За JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2134,13 +2140,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2154,6 +2156,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2348,6 +2359,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2366,9 +2380,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3163,12 +3174,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "НЕПОЗНАТО"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4760,6 +4771,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4932,7 +4950,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5734,20 +5752,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6979,13 +6992,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11943,6 +11959,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12105,6 +12124,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13941,6 +13963,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14547,6 +14573,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14574,7 +14603,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15150,6 +15182,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15295,6 +15330,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15333,6 +15373,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15766,9 +15811,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15836,6 +15893,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15930,6 +15990,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16470,6 +16533,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16491,12 +16557,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16598,6 +16740,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17137,12 +17282,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17260,6 +17408,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17664,6 +17818,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18302,12 +18465,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18491,6 +18648,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19153,25 +19313,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19751,6 +19892,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19949,32 +20098,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20059,6 +20182,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20299,6 +20439,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21464,6 +21632,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21803,6 +22062,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22786,6 +23068,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22841,6 +23126,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24815,7 +25106,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24858,9 +25152,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27445,6 +27739,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27454,6 +27751,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27493,6 +27793,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27606,7 +27909,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27843,9 +28146,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/mr.po b/i18n/po/mr.po
index 2886f2b..26f8c46 100644
--- a/i18n/po/mr.po
+++ b/i18n/po/mr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-05-24 23:45+0000\n"
"Last-Translator: Singleton <singleton47+ubuntuone at live.com>\n"
"Language-Team: Marathi <mr at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:50+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:50+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: mr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -172,6 +172,12 @@ msgstr ""
msgid "About JOSM..."
msgstr "JOSM बद्दल..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2161,13 +2167,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr "ते हलवा"
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2181,6 +2183,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr "ते हलवा"
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2375,6 +2386,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr "गाळा"
@@ -2393,9 +2407,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3191,12 +3202,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr "सागरी मैल"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "अज्ञात"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4788,6 +4799,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4960,7 +4978,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5762,20 +5780,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7007,13 +7020,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr "स्थान"
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11981,6 +11997,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12143,6 +12162,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13979,6 +14001,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14585,6 +14611,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14612,7 +14641,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15188,6 +15220,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15333,6 +15368,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15371,6 +15411,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15804,9 +15849,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15874,6 +15931,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15968,6 +16028,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16508,6 +16571,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16529,12 +16595,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16636,6 +16778,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17175,12 +17320,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17298,6 +17446,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17702,6 +17856,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18340,12 +18503,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18529,6 +18686,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19191,25 +19351,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19789,6 +19930,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19987,32 +20136,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20097,6 +20220,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20337,6 +20477,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21502,6 +21670,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21841,6 +22100,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22824,6 +23106,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22879,6 +23164,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24853,7 +25144,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24896,9 +25190,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27483,6 +27777,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27492,6 +27789,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27531,6 +27831,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27644,7 +27947,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27881,9 +28184,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/ms.po b/i18n/po/ms.po
index 9dc7b86..782c04f 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2011-12-11 22:14+0000\n"
"Last-Translator: abuyop <Unknown>\n"
"Language-Team: Malay <ms at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:51+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:51+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: ms\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr "Tentang JOSM"
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,12 +3171,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "TIDAK DIKETAHUI"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/nb.po b/i18n/po/nb.po
index 13a771b..d1b1928 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-07-22 20:56+0000\n"
"Last-Translator: Andreas Bertheussen <andreas at elektronisk.org>\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-10-30 04:52+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:52+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: nb\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -172,6 +172,12 @@ msgstr "Programtillegg"
msgid "About JOSM..."
msgstr "Om JOSM"
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2170,14 +2176,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr "Flytt elementer"
-
-msgid "Move them"
-msgstr "Flytt dem"
-
-msgid "Undo move"
-msgstr "Angre flytting"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2190,6 +2192,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr "Flytt elementer"
+
+msgid "Move them"
+msgstr "Flytt dem"
+
+msgid "Undo move"
+msgstr "Angre flytting"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Slipp museknappen for å velge objektene i rektangelet."
@@ -2386,6 +2397,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr "Filter"
@@ -2404,9 +2418,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3211,12 +3222,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "Ukjent"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4817,6 +4828,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "Meny: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4989,7 +5007,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5819,20 +5837,15 @@ msgstr "Løs konflikter"
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7064,14 +7077,17 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr "<different>"
+
msgid "Member Of"
msgstr "Medlem av"
msgid "Position"
msgstr "Posisjon"
-msgid "<different>"
-msgstr "<different>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -12102,6 +12118,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12273,6 +12292,9 @@ msgstr "Laster ned punkt {0} til {1}..."
msgid "Contacting OSM Server..."
msgstr "Kontakter OSM-tjeneren …"
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -14126,6 +14148,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14732,6 +14758,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14759,7 +14788,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15335,6 +15367,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15483,6 +15518,11 @@ msgid ""
msgstr ""
"Lar deg anonymisere tidsstempler og raskt slette deler av store GPX-spor."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15521,6 +15561,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15969,9 +16014,21 @@ msgstr "søle"
msgid "Lanes"
msgstr "Kjørebaner"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Fartsgrense (km/t)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Bro"
@@ -16039,6 +16096,9 @@ msgstr "Sidespor"
msgid "spur"
msgstr "Privat sidespor"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -16133,6 +16193,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr "Høyde (meter)"
@@ -16673,6 +16736,9 @@ msgstr "Avgift"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16694,12 +16760,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "vann"
+
+msgid "gas"
+msgstr "gass"
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Veier"
msgid "Motorway"
msgstr "Motorvei"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Av-/påkjørsel for motorvei"
@@ -16801,6 +16943,9 @@ msgstr "parking_aisle"
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Parkeringsvei"
@@ -17340,12 +17485,15 @@ msgstr "Vendesirkel"
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
-msgstr "Bygrense"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Annet navn"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Fotoboks"
@@ -17463,6 +17611,12 @@ msgstr ""
msgid "Wall"
msgstr "Mur"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Bymur"
@@ -17867,6 +18021,15 @@ msgstr ""
msgid "Pier"
msgstr "Brygge"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Sluseport"
@@ -18505,12 +18668,6 @@ msgstr "Flyplass"
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Rullebane"
@@ -18694,6 +18851,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Gatekjøkken"
@@ -19356,25 +19516,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19954,6 +20095,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -20152,32 +20301,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "Rørledning"
-
-msgid "water"
-msgstr "vann"
-
-msgid "gas"
-msgstr "gass"
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr "Kran"
@@ -20262,6 +20385,23 @@ msgstr "Gruvestoll"
msgid "Length in meters"
msgstr "Lengde i meter"
+msgid "Pipeline"
+msgstr "Rørledning"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Vanntårn"
@@ -20502,6 +20642,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21667,6 +21835,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Geografi"
@@ -22006,6 +22265,29 @@ msgstr "Gårdstun"
msgid "Farmland"
msgstr "Åkerland"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Eng"
@@ -22995,6 +23277,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -23050,6 +23335,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -25047,7 +25338,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -25090,9 +25384,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27691,6 +27985,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27700,6 +27997,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27739,6 +28039,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27852,7 +28155,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -28089,9 +28392,6 @@ msgstr "Delstat/provins"
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/nds.po b/i18n/po/nds.po
index cf04a3b..55427cd 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2009-11-29 09:01+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: German, Low <nds at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:51+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:51+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3159,10 +3170,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4756,6 +4767,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4928,7 +4946,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5730,20 +5748,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6975,13 +6988,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11938,6 +11954,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12100,6 +12119,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13936,6 +13958,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14542,6 +14568,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14569,7 +14598,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15145,6 +15177,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15290,6 +15325,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15328,6 +15368,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15761,9 +15806,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15831,6 +15888,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15925,6 +15985,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16465,6 +16528,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16486,12 +16552,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16593,6 +16735,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17132,12 +17277,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17255,6 +17403,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17659,6 +17813,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18297,12 +18460,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18486,6 +18643,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19148,25 +19308,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19746,6 +19887,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19944,32 +20093,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20054,6 +20177,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20294,6 +20434,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21459,6 +21627,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21798,6 +22057,29 @@ msgstr "Hoffstelle"
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22781,6 +23063,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22836,6 +23121,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24810,7 +25101,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24853,9 +25147,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27440,6 +27734,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27449,6 +27746,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27488,6 +27788,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27601,7 +27904,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27838,9 +28141,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/nl.po b/i18n/po/nl.po
index b21e023..a179b66 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-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-14 08:41+0000\n"
-"Last-Translator: korst <Unknown>\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-15 13:52+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-10-30 04:38+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:38+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: nl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -175,6 +175,12 @@ msgstr "Invoegtoepassingen"
msgid "About JOSM..."
msgstr "Over JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Resource ''{0}'' kon niet worden geladen, fout is {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -1504,12 +1510,13 @@ msgstr[1] ""
msgid "Which way segment should reuse the history of {0}?"
msgstr ""
+"Welk wegsegment zou de geschiedenis van {0} opnieuw moeten gebruiken?"
msgid " [id: {0}]"
msgstr " [id: {0}]"
msgid "Segment {0}: {1}"
-msgstr ""
+msgstr "Segment {0}: {1}"
msgid "You must select two or more nodes to split a circular way."
msgstr ""
@@ -2356,14 +2363,12 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Objecten selecteren, verplaatsen, schalen en roteren"
-msgid "Move elements"
-msgstr "Elementen verplaatsen"
-
-msgid "Move them"
-msgstr "Verplaats ze"
-
-msgid "Undo move"
-msgstr "Verplaatsen ongedaan maken"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
+"Weet u zeker dat u elementen die aan wegen zijn verbonden en die zijn "
+"verborgen door filters wilt verplaatsen?"
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2382,6 +2387,15 @@ msgstr[1] ""
"elementen is vaak een vergissing.\n"
"Wilt u ze echt verplaatsen?"
+msgid "Move elements"
+msgstr "Elementen verplaatsen"
+
+msgid "Move them"
+msgstr "Verplaats ze"
+
+msgid "Undo move"
+msgstr "Verplaatsen ongedaan maken"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Laat de muisknop los om de objecten in de rechthoek te selecteren."
@@ -2590,6 +2604,9 @@ msgstr "selectie MapCSS"
msgid "add toolbar button"
msgstr "Voeg knop voor werkbalk toe"
+msgid "Invalid search expression"
+msgstr "Ongeldige zoekexpressie"
+
msgid "Filter"
msgstr "Filteren"
@@ -2611,9 +2628,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Ongeldige zoekexpressie"
-
msgid "basic examples"
msgstr "Basisvoorbeelden"
@@ -2762,10 +2776,10 @@ msgid "all parents of objects matching the expression"
msgstr "all ouders van objecten die overeenkomen met de uitdrukking"
msgid "relation containing a member of role <i>stop</i>"
-msgstr ""
+msgstr "relatie bevat een lid met de rol <i>stop</i>"
msgid "objects being part of a relation as role <i>stop</i>"
-msgstr ""
+msgstr "objecten zijn deel van een relatie als rol <i>stop</i>"
msgid "n-th member of relation and/or n-th node of way"
msgstr "n-de lid van relatie en/of n-de knoop van weg"
@@ -2797,8 +2811,8 @@ msgstr "Zoeken"
msgid "Searching in {0} object"
msgid_plural "Searching in {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Zoeken in {0} object"
+msgstr[1] "Searching in {0} objecten"
msgid "No match found for ''{0}''"
msgstr "Geen overeenkomst gevonden voor ''{0}''"
@@ -3499,12 +3513,12 @@ msgstr "Brits-Amerikaans"
msgid "Nautical Mile"
msgstr "Nautische mijl"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Resource ''{0}'' kon niet worden geladen, fout is {1}."
-
msgid "UNKNOWN"
msgstr "ONBEKEND"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
"Onverwacht versienummer voor JOSM in revisie-bestand, waarde is ''{0}''"
@@ -5213,6 +5227,14 @@ msgstr "Help"
msgid "Menu: {0}"
msgstr "Menu: {0}"
+msgid "Main toolbar"
+msgstr "Hoofdwerkbalk"
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+"Schakelt de zichtbaarheid van de hoofdwerkbalk (d.i. de horizontale werkbalk)"
+
msgid "Edit toolbar"
msgstr "werkbalk Bewerken"
@@ -5391,14 +5413,10 @@ msgstr "tot tegel"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Als alternatief kunt u een <strong>tegeladres</strong> invoeren voor "
-"één enkele tegel in de indeling <i>zoomlevel/x/y</i>, d.i. "
-"<i>15/256/223</i>. Tegeladressen in de indeling <i>zoom,x,y</i> of "
-"<i>zoom;x;y</i> zijn ook geldig.</html>"
msgid "Tile address:"
msgstr "Tegeladres:"
@@ -6307,26 +6325,15 @@ msgstr "Conflicten oplossen"
msgid "Resolve conflicts for ''{0}''"
msgstr "Conflicten oplossen voor ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Gelieve de verwijdering van <strong>1 object</strong> uit <strong>1 "
-"relatie</strong> te bevestigen.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] "Bevestig het verwijderen van <strong>{0} object</strong>."
+msgstr[1] "Bevestig het verwijderen van <strong>{0} objecten</strong>."
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Gelieve de verwijdering van <strong>1 object</strong> uit <strong>{0} "
-"relaties</strong> te bevestigen.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Gelieve de verwijdering van <strong>{0} objecten</strong> uit "
-"<strong>{1} relaties</strong> te bevestigen.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] "{0} relatie wordt beïnvloed."
+msgstr[1] "{0} relaties worden beïnvloed."
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6926,6 +6933,8 @@ msgstr ""
msgid "Ranges of object IDs are specified with a hyphen, for instance: {0}"
msgstr ""
+"Bereiken van object-IDs worden gespecificeerd met een afbreekstreepje, "
+"bijvoorbeeld: {0}"
msgid ""
"Invalid ID list specified\n"
@@ -7686,14 +7695,17 @@ msgstr "Tags/Leden"
msgid "Tags for selected objects."
msgstr "Tags voor geselecteerde objecten."
+msgid "<different>"
+msgstr "<verschillend>"
+
msgid "Member Of"
msgstr "Lid van"
msgid "Position"
msgstr "Positie"
-msgid "<different>"
-msgstr "<verschillend>"
+msgid "Tag filter"
+msgstr "Tagfilter"
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Objecten: {2} / Tags: {0} / Leden: {1}"
@@ -9732,7 +9744,7 @@ msgid "Best zoom: {0}"
msgstr "Beste zoomniveau: {0}"
msgid "Estimated cache size: {0}"
-msgstr ""
+msgstr "Geschatte grootte cache: {0}"
msgid "Cache stats: {0}"
msgstr "Statistieken voor cache: {0}"
@@ -9841,6 +9853,10 @@ msgid ""
"http://forum.openstreetmap.org/viewtopic.php?id=25677).\n"
"Currently you have {1,number,#}MB memory allocated for JOSM"
msgstr ""
+"Voor het toevoegen van een andere laag dient u tenminste {0,number,#}MB "
+"geheugen toe te wijzen aan JOSM met behulp van de optie -Xmx{0,number,#}M "
+"(zie http://forum.openstreetmap.org/viewtopic.php?id=25677).Momenteel heeft "
+"u {1,number,#}MB geheugen toegewezen aan JOSM"
msgid "All projections are supported"
msgstr "Alle projecties worden ondersteund"
@@ -13301,6 +13317,9 @@ msgstr ""
"Gebroken voorkeur voor taggen \"{0}-{1}\" - aantal items in "
"''display_values'' moet hetzelfde zijn als in ''values''"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13492,6 +13511,9 @@ msgstr "Downloaden van punten {0} tot en met {1}..."
msgid "Contacting OSM Server..."
msgstr "Verbinden met server van OSM..."
+msgid "Downloading notes"
+msgstr "Opmerkingen downloaden"
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Openenen van invoerstroom voor bron ''{0}'' mislukt"
@@ -15679,6 +15701,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "ruig land"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "associatedStreet"
@@ -16207,7 +16233,7 @@ msgid "Tours - Orthophotos 2013"
msgstr "Tours - luchtfoto''s 2013"
msgid "Tours - Orthophotos 2008-2010"
-msgstr ""
+msgstr "Tours - Orthophotos 2008-2010"
msgid ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
@@ -16290,6 +16316,9 @@ msgstr "Drone afbeeldingen (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone afbeeldingen 2014 (Haiti)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16317,8 +16346,11 @@ msgstr "OSMIE Civil Parishes"
msgid "OSMIE Baronies"
msgstr "OSMIE Baronies"
-msgid "OSMIE Political"
-msgstr "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr "OSMIE Local Election Areas"
+
+msgid "OSMIE Dail Election Areas"
+msgstr "OSMIE Dail Election Areas"
msgid "Lodi - Italy"
msgstr "Lodi - Italië"
@@ -16507,7 +16539,7 @@ msgid "trail.pl: Szlaki (paths)"
msgstr "trail.pl: Szlaki (paden)"
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
-msgstr ""
+msgstr "Wrocław: Ortofotomapa 2015 (luchtfoto)"
msgid "ScanEx IRS"
msgstr "ScanEx IRS"
@@ -16696,7 +16728,7 @@ msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-82"
msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
+msgstr "NLS - OS 6-inch County Series 1888-1913"
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -16705,7 +16737,7 @@ msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
-msgstr ""
+msgstr "NLS - OS 25-inch (Scotland) 1892-1905"
msgid "OS 1:25k historic (OSM-Best)"
msgstr "OS 1:25k historisch (OSM-Best)"
@@ -16893,6 +16925,9 @@ msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr "OS Town Plans, Paisley 1858 (NLS)"
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "OS Town Plans, Peebles 1856 (NLS)"
@@ -16954,7 +16989,7 @@ 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 ""
-"Groepeer de invoer van algemene Adres Interpolatie in één enkele "
+"Groepeer de invoer van algemene Adres-interpolatie in één enkel "
"dialoogvenster, naast een optie om automatisch individuele knopen voor "
"huisnummers van een weg te genereren."
@@ -16969,11 +17004,17 @@ msgid ""
"Provides Apache Commons library components. Not meant to be installed "
"directly by users, but rather as a dependency for other plugins."
msgstr ""
+"Verschaft componenten van bibliotheken van Apache Commons. Niet bedoeld om "
+"direct door gebruikers te worden geïnstalleerd, maar als afhankelijkheid "
+"voor andere plug-ins."
msgid ""
"Provides Apache HTTP library. Not meant to be installed directly by users, "
"but rather as a dependency for other plugins."
msgstr ""
+"Verschaft componenten van bibliotheek HTTP van Apache. Niet bedoeld om "
+"direct door gebruikers te worden geïnstalleerd, maar als afhankelijkheid "
+"voor andere plug-ins."
msgid ""
"Allows selection of areas in an layer and automatic creation of a way as "
@@ -17031,7 +17072,7 @@ msgstr ""
"van gegevens."
msgid "Downloads new data when you pan/zoom"
-msgstr ""
+msgstr "Nieuwe gegevens downloaden als u pant/zoomt"
msgid "Create a grid of ways."
msgstr "Maak een raster van wegen."
@@ -17069,6 +17110,11 @@ msgstr ""
"Maakt het de gebruiker mogelijk om tijdstempels te anonimiseren en grote "
"delen van enorme GPX-sporen heel snel te verwijderen."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
"Geeft het hoogteprofiel en enige statistische gegevens weer van een GPX-"
@@ -17118,6 +17164,11 @@ msgstr "Maakt het mogelijk niet noodzakelijke GPS-sporen uit te filteren"
msgid "Visualizes routing information as a routing graph."
msgstr "Visualiseert route-informatie als een route-afbeelding."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "Eenvoudig gereedschap om huisnummers te taggen."
@@ -17440,6 +17491,8 @@ msgid ""
"Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
"in OpenStreetMap"
msgstr ""
+"Integreren naar-fix http://osmlab.github.io/to-fix/ in JOSM om fouten in "
+"OpenStreetMap te repareren"
msgid ""
"Provides helper buttons to allow working with single button mouse (stylus). "
@@ -17656,9 +17709,21 @@ msgstr "slikgronden"
msgid "Lanes"
msgstr "Rijstroken"
+msgid "Lanes in way direction"
+msgstr "Rijstroken in richting van de weg"
+
+msgid "Lanes opposed to way direction"
+msgstr "Rijstroken tegengesteld aan richting weg"
+
msgid "Max. speed (km/h)"
msgstr "Max. snelheid (km/u)"
+msgid "Max. speed in way direction"
+msgstr "Max. snelheid in richting weg"
+
+msgid "Max. speed opposed to way direction"
+msgstr "Max. snelheid tegengesteld aan richting weg"
+
msgid "Bridge"
msgstr "Brug"
@@ -17726,6 +17791,9 @@ msgstr "zijspoor"
msgid "spur"
msgstr "wissels"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Elektrisch"
@@ -17820,6 +17888,9 @@ msgstr "gescheiden"
msgid "isolated"
msgstr "afgescheiden"
+msgid "outside"
+msgstr "buiten"
+
msgid "Height (meters)"
msgstr "Hoogte (meters)"
@@ -18366,6 +18437,9 @@ msgstr "Tol"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "Is het water getijdegevoelig (verdwijnt regelmatig)?"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr "duiker"
@@ -18387,12 +18461,88 @@ msgstr "Motorboot"
msgid "Canoe"
msgstr "Kano"
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "water"
+
+msgid "gas"
+msgstr "gas"
+
+msgid "heat"
+msgstr "warmte"
+
+msgid "oil"
+msgstr "olie"
+
+msgid "sewage"
+msgstr "afvalwater"
+
+msgid "Support"
+msgstr "Draagsteun"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "paal"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "aan muur bevestigd"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "reclamebord"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "grond"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Straten"
msgid "Motorway"
msgstr "Autosnelweg"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Af-/Oprit autosnelweg"
@@ -18494,6 +18644,9 @@ msgstr "Weg op parkeerplaats"
msgid "drive-through"
msgstr "doorgang"
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Weg op parkeerplaats"
@@ -19050,12 +19203,15 @@ msgstr "Draaicirkel"
msgid "Turning Loop"
msgstr "Keercirkel"
-msgid "City Limit"
-msgstr "Stadsgrens"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Tweede naam"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Snelheidscamera"
@@ -19175,6 +19331,12 @@ msgstr "Vangrail"
msgid "Wall"
msgstr "Muur"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Stadsmuur"
@@ -19585,6 +19747,15 @@ msgstr "CNG (Samengedrukt aardgas)"
msgid "Pier"
msgstr "Pier"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Sluisdeur"
@@ -20226,12 +20397,6 @@ msgstr "Luchthaven"
msgid "Airport Ground"
msgstr "Gebied luchthaven"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Startbaan"
@@ -20305,7 +20470,7 @@ msgid "Alpine Hut"
msgstr "Berghut"
msgid "Wilderness Hut"
-msgstr ""
+msgstr "Hut in wildernis"
msgid "Access rights"
msgstr "Toegangsrechten"
@@ -20320,13 +20485,13 @@ msgid "Reservation"
msgstr "Reservering"
msgid "required"
-msgstr ""
+msgstr "vereist"
msgid "recommended"
-msgstr ""
+msgstr "aanbevolen"
msgid "members_only"
-msgstr ""
+msgstr "alleen_leden"
msgid "Closer Description"
msgstr "Uitgebreide beschrijving"
@@ -20415,6 +20580,9 @@ msgstr "Microbrouwerij"
msgid "Outdoor seating"
msgstr "Terras buiten"
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fastfood"
@@ -20968,15 +21136,15 @@ msgstr "Toiletten/Wasruimten"
msgctxt "restroom"
msgid "Female"
-msgstr ""
+msgstr "Dames"
msgctxt "restroom"
msgid "Male"
-msgstr ""
+msgstr "Heren"
msgctxt "restroom"
msgid "Unisex"
-msgstr ""
+msgstr "Unisex"
msgid "flush"
msgstr "spoelen"
@@ -21079,25 +21247,6 @@ msgstr "zonnewijzer"
msgid "unorthodox"
msgstr "onorthodox"
-msgid "Support"
-msgstr "Draagsteun"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "paal"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "aan muur bevestigd"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "reclamebord"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "grond"
-
msgid "Visibility/readability"
msgstr "Zichtbaarheid/leesbaarheid"
@@ -21305,10 +21454,10 @@ msgid "Count"
msgstr "Aantal"
msgid "Compressed Air"
-msgstr ""
+msgstr "Luchtdruk"
msgid "Valves"
-msgstr ""
+msgstr "Kleppen"
msgid "Dunlop (Woods)"
msgstr "Blitzventiel"
@@ -21677,6 +21826,14 @@ msgid "barn"
msgstr "schuur"
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "gebouw_bij_boerderij"
@@ -21875,32 +22032,6 @@ msgstr "wijn"
msgid "Bunker Silo"
msgstr "Bunkersilo"
-msgid "Pipeline"
-msgstr "Pijpleiding"
-
-msgid "water"
-msgstr "water"
-
-msgid "gas"
-msgstr "gas"
-
-msgid "heat"
-msgstr "warmte"
-
-msgid "oil"
-msgstr "olie"
-
-msgid "sewage"
-msgstr "afvalwater"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "onder water"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "bovengronds"
-
msgid "Crane"
msgstr "Kraan"
@@ -21985,6 +22116,23 @@ msgstr "Horizontale toegangstunnel"
msgid "Length in meters"
msgstr "Lengte in meters"
+msgid "Pipeline"
+msgstr "Pijpleiding"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "onder water"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "bovengronds"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Watertoren"
@@ -22225,6 +22373,34 @@ msgstr ""
msgid "Bridge outline"
msgstr "Omtrek brug"
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "Electriciteitscentrale"
@@ -23147,7 +23323,7 @@ msgid "Ticket"
msgstr "Kaarten"
msgid "For the body"
-msgstr ""
+msgstr "Voor het lichaam"
msgid "Chemist"
msgstr "Drogisterij"
@@ -23225,7 +23401,7 @@ msgid "Pet"
msgstr "Dierenwinkel"
msgid "Photo"
-msgstr ""
+msgstr "Foto"
msgid "Funeral Directors"
msgstr "Uitvaartverzorgers"
@@ -23392,6 +23568,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Geografie"
@@ -23606,31 +23873,31 @@ msgstr "Boomgrens"
msgctxt "cutline"
msgid "border"
-msgstr ""
+msgstr "rand"
msgctxt "cutline"
msgid "firebreak"
-msgstr ""
+msgstr "brandgang"
msgctxt "cutline"
msgid "hunting"
-msgstr ""
+msgstr "jagen"
msgctxt "cutline"
msgid "loggingmachine"
-msgstr ""
+msgstr "houtbewerkingsmachine"
msgctxt "cutline"
msgid "pipeline"
-msgstr ""
+msgstr "pijplijn"
msgctxt "cutline"
msgid "piste"
-msgstr ""
+msgstr "piste"
msgctxt "cutline"
msgid "section"
-msgstr ""
+msgstr "gedeelte"
msgid "Grassland"
msgstr "Grasland"
@@ -23740,6 +24007,29 @@ msgstr "Boerenerf"
msgid "Farmland"
msgstr "Landbouwgrond"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Weide"
@@ -24753,6 +25043,9 @@ msgstr "{0} moet een numerieke waarde zijn"
msgid "{0} must be a positive integer number"
msgstr "{0} moet een positief geheel getal zijn"
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr "relatie zonder type"
@@ -24812,6 +25105,12 @@ msgid "Use alternative turn restriction icon set"
msgstr ""
"Alternatieve verzameling pictogrammen voor Turn restriction gebruiken"
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV-bestanden"
@@ -25217,7 +25516,7 @@ msgid "Address has no street"
msgstr "Adres heeft geen straat"
msgid "Address has no valid street"
-msgstr "Adres heeft gene geldige straat"
+msgstr "Adres heeft geen geldige straat"
msgid "Address has no post code"
msgstr "Adres heeft geen postcode"
@@ -25423,34 +25722,35 @@ msgid "Open NanoLog file..."
msgstr "Openen NanoLog-bestand..."
msgid "Could not read NanoLog file:"
-msgstr ""
+msgstr "Kon bestand voor Nanolog niet lezen:"
msgid "OSM Recommendation"
-msgstr ""
+msgstr "Aanbevolen door OSM"
msgid "Recommend categories to your newly created instances."
-msgstr ""
+msgstr "Categorieën aanbevelen voor uw nieuw gemaakte instances."
msgid "Training process configuration"
-msgstr ""
+msgstr "Configuratie van trainingsproces"
msgid "Model Settings"
-msgstr ""
+msgstr "Instellingen model"
msgid "Select objects or create new objects and get recommendation."
msgstr ""
+"Selecteer objecten of maak nieuwe objecten en verkrijg aanbevelingen."
msgid "Add Recommendation"
-msgstr ""
+msgstr "Aanbeveling toevoegen"
msgid "Add a recommended key/value pair to your object"
-msgstr ""
+msgstr "Voeg een aanbevolen paar sleutel/waarde toe aan uw object"
msgid "Train a Model"
-msgstr ""
+msgstr "Een model trainen"
msgid "Start the training engine!"
-msgstr ""
+msgstr "Start het trainingsmechanisme!"
msgid "Edit opening hours"
msgstr "Openingstijden bewerken"
@@ -25981,10 +26281,10 @@ msgid "Building address"
msgstr "Adres gebouw"
msgid "empty"
-msgstr ""
+msgstr "leeg"
msgid "skip"
-msgstr ""
+msgstr "overslaan"
msgid "House number:"
msgstr "Huisnummer:"
@@ -25999,130 +26299,147 @@ msgid "Building:"
msgstr "Gebouw:"
msgid "Tags:"
-msgstr ""
+msgstr "Tags:"
msgid "Name:"
msgstr "Naam:"
msgid "updated building info"
-msgstr ""
+msgstr "informatie voor gebouwen bijgewerkt"
msgid "Tag Element"
-msgstr ""
+msgstr "Tag voor element"
msgid "Select an item to tag."
-msgstr ""
+msgstr "Selecteer een item om te taggen."
msgid "Tag Building"
-msgstr ""
+msgstr "Tag Building"
msgid "Tools: {0}"
-msgstr ""
+msgstr "Gereedschappen: {0}"
msgid "Area Selection"
-msgstr ""
+msgstr "Gebiedsselectie"
msgid "Select an area (e.g. building) from an underlying image."
msgstr ""
+"Selecteer een gebied (bijv. gebouw) uit een onderliggende afbeelding."
msgid "Area Selector"
-msgstr ""
+msgstr "Gebiedsselectie"
msgid "Created area"
-msgstr ""
+msgstr "Gemaakt gebied"
msgid "Unable to detect a polygon where you clicked."
-msgstr ""
+msgstr "Niet in staat een polygoon te detecteren waar u heeft geklikt."
msgid "Error Report"
-msgstr ""
+msgstr "Foutenrapport"
msgid "Something went wrong!"
-msgstr ""
+msgstr "Er ging iets mis!"
msgid "Please file a bug report on the github project page under"
-msgstr ""
+msgstr "Vul een probleemrapport in op de projectpagina van Github onder"
msgid ""
"Let us know what you did and what happend add the following text to the bug "
"report, so we can find the source of the issue."
msgstr ""
+"Laat ons weten wat u deed en wat er gebeurde. Voeg de volgende tekst toe aan "
+"het probleemrapport, zodat we de bron van het probleem kunnen terugvinden."
msgid "Area Selector - Preferences"
-msgstr ""
+msgstr "gebiedsselectie - Voorkeuren"
msgid "Settings for the area detection algorithm."
-msgstr ""
+msgstr "Instellingen voor het algoritme voor detectie van gebied."
msgid "Boofcv - high resolution images"
-msgstr ""
+msgstr "Boofcv - hoge resolutie afbeeldingen"
msgid "Custom - low resolution images"
-msgstr ""
+msgstr "Aangepast - lage resolutie afbeeldingen"
msgid ""
"Choose wich algorithm should be used. \"Auto\" tries to find an area with "
"Boofcv and uses the custom algorithm as a fallback."
msgstr ""
+"Kies welk algoritme zou moeten worden gebruikt. \"Auto\" probeert een gebied "
+"te vinden met Boofcv en gebruikt het aangepaste algoritme om op terug te "
+"vallen."
msgid "Algorithm"
-msgstr ""
+msgstr "Algoritme"
msgid ""
"Maximum pixels a point can be away from a line and still be considered as a "
"member of this line (Default: {0})."
msgstr ""
+"Maximum aantal pixels dat een punt mag zijn gelegen vanaf een lijn om nog "
+"steeds beschouwd te worden als lid van die lijn (Standaard: {0})."
msgid "Distance Tolerance"
-msgstr ""
+msgstr "Afstandstolerantie"
msgid ""
"Lines with a smaller angle (degrees) than this will be combined to one line "
"(Default {0})."
msgstr ""
+"Lijnen met een kleinere hoek (graden) dan deze, zullen worden gecombineerd "
+"tot één lijn (Standaard {0})."
msgid "Angle Tolerance"
-msgstr ""
+msgstr "Hoektolerantie"
msgid ""
"The color threshold defines how much a color may differ from the selected "
"color. The red, green and blue values must be in the range of (selected - "
"threshold) to (selected + threshold). (Default: {0})."
msgstr ""
+"De drempelkleur definieert hoe veel een kleur mag verschillen van de "
+"geselecteerd kleur. De waarden rood, groen end blauw moeten liggen in het "
+"bereik van (geselecteerd - drempel) tot en met (geselecteerd + drempel). "
+"(Standaard: {0})."
msgid "Color Threshold"
-msgstr ""
+msgstr "Drempelkleur"
msgid "Use HSV based algorithm"
-msgstr ""
+msgstr "Op HSV gebaseerd algoritme gebruiken"
msgid ""
"Use hue and saturation instead of RGB distinction to select matching colors."
msgstr ""
+"Tint en saturatie gebruiken in plaats van onderscheid in RGB om "
+"overeenkomende kleuren te selecteren."
msgid "How often thinning operation should be applied (Default {0})."
msgstr ""
+"Hoe vaak zou de verdunningsbewerking moeten worden toegepast (Standaard {0})."
msgid "Thinning Iterations"
-msgstr ""
+msgstr "Doorlopen voor verdunning"
msgid "show address dialog"
-msgstr ""
+msgstr "Dialoogvenster Adres weergeven"
msgid "Show Address Dialog after mapping an area"
-msgstr ""
+msgstr "Dialoogvenster adres weergeven na in kaart brengen van gebied"
msgid "merge nodes"
-msgstr ""
+msgstr "knopen samenvoegen"
msgid "Merge nodes with existing nodes"
-msgstr ""
+msgstr "Knopen smaenvoegen met bestaande knopen"
msgid "Debug"
-msgstr ""
+msgstr "Foutopsporing"
msgid "Debugging mode will write images for each processing step."
-msgstr ""
+msgstr "Modus Foutopsporing zal afbeeldingen schrijven voor elke processtap"
msgid "Street Name:"
msgstr "Straatnaam:"
@@ -26179,32 +26496,33 @@ msgid "Set width of the building"
msgstr "Stel de breedte van het gebouw in"
msgid "Merge address points"
-msgstr ""
+msgstr "Adrespunten samenvoegen"
msgid "Move tags from address nodes inside buildings to building ways"
-msgstr ""
+msgstr "Tags van adresknopen in gebouwen verplaatsen naar wegen van gebouwen"
msgid "Select both address nodes and building ways to merge"
msgstr ""
+"Selecteer zowel adresknopen als wegen van gebouwen om samen te voegen"
msgid "No address nodes found in the selection"
-msgstr ""
+msgstr "Geen adresknopen in de selectie gevonden"
msgid "No building ways found in the selection"
-msgstr ""
+msgstr "Geen wegen voor gebouwen in de selectie gevonden"
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] ""
+msgstr[0] "Er is {0} gebouw met meerdere adresknopen erin"
+msgstr[1] "Er zijn {0} gebouwen met meerdere adresknopen erin"
msgid "There is {0} building with address conflicts"
msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Er is {0} gebouw met conflicten in adressen"
+msgstr[1] "Er zijn {0} gebouwen met conflicten in adressen"
msgid "No address nodes inside buildings found"
-msgstr ""
+msgstr "Geen adresknopen binnen gebouwen gevonden"
msgid "on polygon"
msgstr "op polygoon"
@@ -26475,7 +26793,7 @@ msgid "Layers:"
msgstr "Lagen:"
msgid "Sea, rivers, swimming pools."
-msgstr ""
+msgstr "Zee, rivieren, zwembaden"
msgid "Buildings, covers, underground constructions."
msgstr "Gebouwen, overkappingen, ondergrondse constructies."
@@ -26848,108 +27166,109 @@ msgid "Color Schemes"
msgstr "Kleurenschema''s"
msgid "Conflate object pair"
-msgstr ""
+msgstr "Objectpaar samenvoegen"
msgid "Added {0} object to subject layer"
msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} object toegevoegd aan onderwerplaag"
+msgstr[1] "{0} objecten toegevoegd aan onderwerplaag"
msgid "Conflation"
-msgstr ""
+msgstr "Samenvoeging"
msgid "Activates the conflation plugin"
-msgstr ""
+msgstr "Activeert de plug-in voor samenvoegen"
msgid "Matches"
-msgstr ""
+msgstr "Komt overeen"
msgid "Reference only"
-msgstr ""
+msgstr "Alleen verwijzing"
msgid "Subject only"
-msgstr ""
+msgstr "Alleen onderwerp"
msgid "Matches ({0})"
-msgstr ""
+msgstr "Overeenkomsten ({0})"
msgid "Reference only ({0})"
-msgstr ""
+msgstr "Alleen verwijzing ({0})"
msgid "Subject only ({0})"
-msgstr ""
+msgstr "Alleen onderwerp ({0})"
msgid "Configure"
msgstr "Configureren"
msgid "Configure conflation options"
-msgstr ""
+msgstr "Opties voor samenvoegen configureren"
msgid "Delete {0} conflation matches"
-msgstr ""
+msgstr "{0} overeenkomsten voor samenvoegen verwijderen"
msgid "Remove {0} unmatched objects"
-msgstr ""
+msgstr "Verwijder {0} niet overeenkomende objecten"
msgid "Remove selected matches"
-msgstr ""
+msgstr "Geselecteerde overeenkomsten verwijderen"
msgid "Conflate"
-msgstr ""
+msgstr "Samenvoegen"
msgid "Conflate selected objects"
-msgstr ""
+msgstr "Geselecteerde objecten samenvoegen"
msgid "Conflation: {0}"
-msgstr ""
+msgstr "Samenvoeging: {0}"
msgid "Cannot replace geometry."
-msgstr ""
+msgstr "Kan geometrie niet vervangen."
msgid "Zoom to selected primitive(s)"
-msgstr ""
+msgstr "Zoom naar geselecteerde primitief(ven)"
msgid "Select selected primitive(s)"
-msgstr ""
+msgstr "Selecteer geselecteerde primitief(ven)"
msgid "Select the primitives currently selected in the list"
-msgstr ""
+msgstr "Selecteer de momenteel geselecteerde primitieven in de lijst"
msgid "Match finder settings"
-msgstr ""
+msgstr "Instellingen voor Overeenkomsten zoeken"
msgid "Match finder method"
-msgstr ""
+msgstr "Methode voor Overeenkomsten zoeken"
msgid "Threshold distance"
-msgstr ""
+msgstr "Drempelafstand"
msgid "Distances greater than this will result in a score of zero."
-msgstr ""
+msgstr "Een grotere afstand dan deze zal resulteren in een score van nul."
msgid "Centroid distance"
-msgstr ""
+msgstr "Afstand zwaartepunt"
msgid "Hausdorff distance"
-msgstr ""
+msgstr "Afstand Hausdorff"
msgid "Configure conflation settings"
-msgstr ""
+msgstr "Instellingen voor samenvoegen configureren"
msgid "Generate matches"
-msgstr ""
+msgstr "Overeenkomsten genereren"
msgid "Subject"
-msgstr ""
+msgstr "Onderwerp"
msgid "Selections must be made for both reference and subject."
msgstr ""
+"Selecties moeten zowel zijn gemaakt voor de verwijzing als het onderwerp."
msgid "Incomplete selections"
-msgstr ""
+msgstr "Onvolledige selecties"
msgid "Restore subject selection"
-msgstr ""
+msgstr "Selectie van onderwerp herstellen"
msgid "Restore reference selection"
msgstr ""
@@ -27000,7 +27319,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -27043,9 +27365,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -28292,7 +28614,7 @@ msgid ""
"Maximum number of segments allowed in each generated way. Default 250."
msgstr ""
"Maximale aantal segmenten dat is toegestaan in elke gegenereerde weg. "
-"Standaard 250"
+"Standaard 250."
msgid ""
"Maximum number of nodes to generate before bailing out (before simplifying "
@@ -29813,15 +30135,21 @@ msgstr "Niet-getagde afbeeldingen"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Wilt u de huidige kalibratie van laag {0} opslaan?"
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "Afbeelding kalibreren laden..."
msgid "Loads calibration data from a file"
-msgstr "Laadt gegevens om te kalibreren uit ene bestand"
+msgstr "Laadt gegevens om te kalibreren uit een bestand"
msgid "Loading file failed: {0}"
msgstr "Laden van bestand mislukt: {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr "Laad World File Calibration..."
@@ -29862,6 +30190,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "Verplaatsen afbeeldingslaag"
@@ -29980,8 +30311,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "Wilt u het toepassen ?"
-msgid "Load calibration file ?"
-msgstr "Bestand om te kalibreren laden ?"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr "Het zal automatisch worden toegepast."
@@ -30222,9 +30553,6 @@ msgstr "Staat"
msgid "pending"
msgstr "afwachtend"
-msgid "outside"
-msgstr "buiten"
-
msgid "[incomplete]"
msgstr "[incompleet]"
@@ -32705,7 +33033,7 @@ msgid "Range of referencing relation count"
msgstr ""
msgid "Range of attached ways count"
-msgstr ""
+msgstr "Telling van bereik van verbonden wegen"
msgid "Adjacent nodes"
msgstr "Aansluitende knopen"
@@ -32879,7 +33207,7 @@ msgid "Keep centered"
msgstr "Gecentreerd houden"
msgid "follows the video icon automatically"
-msgstr ""
+msgstr "volgt automatisch het pictogram van de video"
msgid "Subtitles"
msgstr "Ondertitels"
diff --git a/i18n/po/nn.po b/i18n/po/nn.po
index 6c33bc0..3a35475 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2009-07-15 12:49+0000\n"
"Last-Translator: Skippern <Unknown>\n"
"Language-Team: Norwegian Nynorsk <nn at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:52+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:51+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: nn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr "Programtillegg"
msgid "About JOSM..."
msgstr "Om JOSM"
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,12 +3171,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "Ukjend"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/oc.po b/i18n/po/oc.po
index 097735a..d10da2f 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2012-10-03 22:14+0000\n"
"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary at yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:52+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:52+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -170,6 +170,12 @@ msgstr "Moduls extèrnes"
msgid "About JOSM..."
msgstr "A prepaus de JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2138,13 +2144,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2158,6 +2160,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2352,6 +2363,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr "Filtrar"
@@ -2370,9 +2384,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3167,12 +3178,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "DESCONEGUT"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4764,6 +4775,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "Menut : {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4936,7 +4954,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5738,20 +5756,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6983,14 +6996,17 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr "<diferent>"
+
msgid "Member Of"
msgstr "Membre de"
msgid "Position"
msgstr ""
-msgid "<different>"
-msgstr "<diferent>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -11948,6 +11964,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12110,6 +12129,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13946,6 +13968,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14552,6 +14578,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14579,7 +14608,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15155,6 +15187,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15300,6 +15335,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15338,6 +15378,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15771,9 +15816,21 @@ msgstr "terrenh fangós"
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15841,6 +15898,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15935,6 +15995,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16475,6 +16538,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16496,12 +16562,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16603,6 +16745,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17142,12 +17287,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17265,6 +17413,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17669,6 +17823,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18307,12 +18470,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18496,6 +18653,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19158,25 +19318,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19756,6 +19897,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19954,32 +20103,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20064,6 +20187,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20304,6 +20444,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21469,6 +21637,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21808,6 +22067,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22791,6 +23073,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22846,6 +23131,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24820,7 +25111,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24863,9 +25157,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27450,6 +27744,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27459,6 +27756,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27498,6 +27798,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27611,7 +27914,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27848,9 +28151,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/pa.po b/i18n/po/pa.po
index 67d2eee..f32c6f1 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2011-05-06 15:52+0000\n"
"Last-Translator: A S Alam <aalam at users.sf.net>\n"
"Language-Team: Punjabi <pa at li.org>\n"
@@ -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-10-30 04:53+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:53+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: pa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,10 +3171,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/pl.po b/i18n/po/pl.po
index f3e59d0..7f48b7b 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-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-23 04:07+0000\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-23 17:05+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-10-30 04:54+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:54+0000\n"
+"X-Generator: Launchpad (build 17850)\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"
@@ -184,6 +184,12 @@ msgstr "Wtyczki"
msgid "About JOSM..."
msgstr "O JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Nie udało się załadować zasobu ''{0}'', błąd: {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -421,7 +427,7 @@ msgid "Please select at least two ways to combine."
msgstr "Wybierz co najmniej dwie linie do połączenia."
msgid "Copy"
-msgstr "Skopiuj"
+msgstr "Kopiuj"
msgid "Copy selected objects to paste buffer."
msgstr "Kopiuje zaznaczone obiekty do schowka"
@@ -430,7 +436,7 @@ msgid "Please select something to copy."
msgstr "Proszę wybrać coś do skopiowania."
msgid "Copy Coordinates"
-msgstr "Skopiuj współrzędne"
+msgstr "Kopiuj współrzędne"
msgid "Copy coordinates of selected nodes to clipboard."
msgstr "Kopiuje współrzędne zaznaczonego węzła do schowka."
@@ -2335,14 +2341,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Zaznaczanie, przesuwanie, skalowanie i obracanie obiektów"
-msgid "Move elements"
-msgstr "Więcej elementów"
-
-msgid "Move them"
-msgstr "Przesuń je"
-
-msgid "Undo move"
-msgstr "Anuluj przesunięcie"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2365,6 +2367,15 @@ msgstr[2] ""
"jest często błędem.\n"
"Naprawdę chcesz je przesunąć?"
+msgid "Move elements"
+msgstr "Więcej elementów"
+
+msgid "Move them"
+msgstr "Przesuń je"
+
+msgid "Undo move"
+msgstr "Anuluj przesunięcie"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Zwolnij przycisk myszki, aby zaznaczyć obiekty w kwadracie."
@@ -2576,6 +2587,9 @@ msgstr "Selektor MapCSS"
msgid "add toolbar button"
msgstr "dodaj przycisk na pasku narzędzi"
+msgid "Invalid search expression"
+msgstr "Niepoprawne wyrażenie regularne."
+
msgid "Filter"
msgstr "Filtr"
@@ -2596,9 +2610,6 @@ msgstr ""
"Zadane wyrażenie regularne jest niepoprawne:\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Niepoprawne wyrażenie regularne."
-
msgid "basic examples"
msgstr "Podstawowe przykłady"
@@ -2746,10 +2757,10 @@ msgid "all parents of objects matching the expression"
msgstr "wszyscy rodzice obiektów pasujących do wyrażenia"
msgid "relation containing a member of role <i>stop</i>"
-msgstr ""
+msgstr "relacja zawierająca członka z rolą <i>stop</i>"
msgid "objects being part of a relation as role <i>stop</i>"
-msgstr ""
+msgstr "obiekty będące częścią relacji z rolą <i>stop</i>"
msgid "n-th member of relation and/or n-th node of way"
msgstr "n-ty członek relacji i/lub n-ty węzeł linii"
@@ -2780,8 +2791,9 @@ msgstr "Szukanie"
msgid "Searching in {0} object"
msgid_plural "Searching in {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Szukanie w {0} obiekcie"
+msgstr[1] "Szukanie w {0} obiektach"
+msgstr[2] "Szukanie w {0} obiektach"
msgid "No match found for ''{0}''"
msgstr "Nie znaleziono nic szukając ''{0}''"
@@ -3496,12 +3508,12 @@ msgstr "imperialny"
msgid "Nautical Mile"
msgstr "mile morskie"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Nie udało się załadować zasobu ''{0}'', błąd: {1}."
-
msgid "UNKNOWN"
msgstr "NIEZNANA"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
"Nieoczekiwany numer wersji JOSM w pliku wersji, wartość wynosi \"{0}\""
@@ -5186,6 +5198,13 @@ msgstr "Pomoc"
msgid "Menu: {0}"
msgstr "Menu: {0}"
+msgid "Main toolbar"
+msgstr "Główny pasek narzędziowy"
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "Pasek narzędzi"
@@ -5362,14 +5381,10 @@ msgstr "aż do kafelka"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Możesz również wprowadzić <strong>adres</strong> dla pojedynczego "
-"kafelka w formacie <i>powiększenie/x/y</i>, np. <i>15/256/223</i>. Adresy "
-"kafelków w formacie <i>powiększenie,x,y</i> lub <i>powiększenie;x;y</i> "
-"również są poprawne.</html>"
msgid "Tile address:"
msgstr "Adres kafelka:"
@@ -6232,26 +6247,15 @@ msgstr "Rozwiąż konflikty"
msgid "Resolve conflicts for ''{0}''"
msgstr "Rozwiąż konflikty dla \"{0}\""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Potwierdź usunięcie <strong>1 obiektu</strong> z <strong>1 "
-"relacji</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Potwierdź usunięcie <strong>1 obiektu</strong> z <strong>{0} "
-"relacji</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Potwierdź usunięcie <strong>{0} obiektów</strong> z <strong>{1} "
-"relacji</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7560,17 +7564,20 @@ msgstr "Znaczniki/członkowie"
msgid "Tags for selected objects."
msgstr "Tagi dla zaznaczonych obiektów."
+msgid "<different>"
+msgstr "<różne>"
+
msgid "Member Of"
msgstr "Członek"
msgid "Position"
msgstr "Pozycja"
-msgid "<different>"
-msgstr "<różne>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
-msgstr ""
+msgstr "Obiekty: {2} / Znaczniki: {0} / Członkowie: {1}"
msgid "Tags: {0} / Memberships: {1}"
msgstr "Znaczniki: {0} / Członkowie: {1}"
@@ -7612,7 +7619,7 @@ msgid "Launch browser with wiki help for selected object"
msgstr "Uruchom przeglądarkę ze stroną objaśnienia wybranego obiektu"
msgid "Go to Taginfo"
-msgstr ""
+msgstr "Przejdź do Taginfo"
msgid "Launch browser with Taginfo statistics for selected object"
msgstr ""
@@ -7715,13 +7722,13 @@ msgid "Remember last used tags after a restart"
msgstr "Pmiętaj ostatnio używane tagi po restarcie"
msgid "to apply first suggestion"
-msgstr ""
+msgstr "- zastosuj pierwszą podpowiedź"
msgid "to add without closing the dialog"
-msgstr ""
+msgstr "- dodaj bez zamykania okienka"
msgid "to add first suggestion without closing the dialog"
-msgstr ""
+msgstr "- zastosuj pierwszą podpowiedź bez zamykania okienka"
msgid "Please enter the number of recently added tags to display"
msgstr "Podaj liczbę wyświetlanych ostatnio dodanych tagów"
@@ -9546,7 +9553,7 @@ msgid "Best zoom: {0}"
msgstr "Najlepsze przybliżenie: {0}"
msgid "Estimated cache size: {0}"
-msgstr ""
+msgstr "Szacowany rozmiar pamięci podręcznej: {0}"
msgid "Cache stats: {0}"
msgstr "Statystyki bufora: {0}"
@@ -9668,6 +9675,9 @@ msgid ""
"Supported projections are: {2}\n"
"Change the projection again or remove the layer."
msgstr ""
+"Warstwa {0} nie obsługuje nowej projekcji {1}.\n"
+"Wspierane projekcje to: {2}\n"
+"Zmień projekcję lub usuń warstwę."
msgid "Save Layer"
msgstr "Zapisz warstwę"
@@ -9810,7 +9820,7 @@ msgstr ""
"zdjęcia i wybierz strefę czasową<hr></html>"
msgid "Photo time (from exif):"
-msgstr "Czas zrobienia zdjęcia (z exif):"
+msgstr "Czas zrobienia zdjęcia (z EXIF):"
msgid "Gps time (read from the above photo): "
msgstr "Czas GPS (odczytany ze zdjęcia): "
@@ -12966,6 +12976,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13139,6 +13152,9 @@ msgstr "Pobieranie punktów od {0} do {1}..."
msgid "Contacting OSM Server..."
msgstr "Łączenie z serwerem OSM..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -15088,6 +15104,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "zarośla"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "skojarzone ulice"
@@ -15694,6 +15714,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -15721,7 +15744,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -16297,6 +16323,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -16446,6 +16475,11 @@ msgstr ""
"Pozwala użytkownikom na anonimizowanie znaczników czasu i szybkie usunięcie "
"części ogromnych śladów GPX."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr "Pokazuje profil wysokości i pewne dane statystyczne śladu GPX."
@@ -16484,6 +16518,11 @@ msgstr "Pozwala na odfiltrowanie niepotrzebnych śladów GPS."
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "Proste narzędzie do tagowania numerów domów."
@@ -16934,7 +16973,7 @@ msgid "dirt"
msgstr "nawierzchnia sypka"
msgid "fine_gravel"
-msgstr ""
+msgstr "żwir z podkładem"
msgid "mud"
msgstr "błoto"
@@ -16942,9 +16981,21 @@ msgstr "błoto"
msgid "Lanes"
msgstr "Liczba pasów ruchu"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Maks. prędkość (km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Most"
@@ -17006,6 +17057,9 @@ msgstr "mijanka"
msgid "spur"
msgstr "bocznica kolejowa/odnoga"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Elektryfikacja"
@@ -17100,6 +17154,9 @@ msgstr "wydzielona przestrzeń"
msgid "isolated"
msgstr "wydzielone pomieszczenie"
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr "Wysokość (w metrach)"
@@ -17151,7 +17208,7 @@ msgstr "koszykówka"
msgctxt "sport"
msgid "beachvolleyball"
-msgstr ""
+msgstr "siatkówka plażowa"
msgctxt "sport"
msgid "billiards"
@@ -17299,7 +17356,7 @@ msgstr "tenis"
msgctxt "sport"
msgid "volleyball"
-msgstr ""
+msgstr "siatkówka"
msgctxt "sport"
msgid "9pin"
@@ -17559,7 +17616,7 @@ msgid "110000;20000"
msgstr "110000;20000"
msgid "Branch operator"
-msgstr "Drugorzędny operator"
+msgstr "Operator gałęzi"
msgid "Amount of Cables"
msgstr "Liczba kabli"
@@ -17644,6 +17701,9 @@ msgstr "Bramka (opłaty)"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "Czy to woda okresowa (sezonowo zanikająca)?"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr "przepust"
@@ -17665,12 +17725,88 @@ msgstr "Motorówka"
msgid "Canoe"
msgstr "Kajak"
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "wodny"
+
+msgid "gas"
+msgstr "gazowy"
+
+msgid "heat"
+msgstr "ciepłowniczy"
+
+msgid "oil"
+msgstr "naftowy"
+
+msgid "sewage"
+msgstr "ściekowy"
+
+msgid "Support"
+msgstr "Podpora"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "słup"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "ściana"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "billboard"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "grunt"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Sieć drogowa"
msgid "Motorway"
msgstr "Autostrada"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Autostrada - dojazd"
@@ -17705,7 +17841,7 @@ msgid "Unclassified"
msgstr "Droga czwartorzędna"
msgid "Street has no name"
-msgstr ""
+msgstr "Ulica nie ma nazwy"
msgid "Passing Places"
msgstr "Zatoki dla wymijania"
@@ -17772,6 +17908,9 @@ msgstr "uliczka parkingowa"
msgid "drive-through"
msgstr "przejazd (drive-through)"
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Uliczka parkingowa"
@@ -18186,7 +18325,7 @@ msgid "Number"
msgstr "Numer"
msgid "Exit to"
-msgstr "Droga na"
+msgstr "Zjazd na"
msgid "Services"
msgstr "Miejsce obsługi podróżnych"
@@ -18311,12 +18450,15 @@ msgstr "Miejsce do zawracania"
msgid "Turning Loop"
msgstr "Rondo do zawracania"
-msgid "City Limit"
-msgstr "Granica miasta"
+msgid "City Limit Sign"
+msgstr "Znak początku/końca miejscowości"
msgid "Second Name"
msgstr "Nazwa alternatywna"
+msgid "Speed Limit Sign"
+msgstr "Znak ograniczenia prędkości"
+
msgid "Speed Camera"
msgstr "Fotoradar"
@@ -18436,6 +18578,12 @@ msgstr "Barierka drogowa"
msgid "Wall"
msgstr "Mur"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Mury miejskie"
@@ -18840,6 +18988,15 @@ msgstr "Gaz CNG (sprężony gaz ziemny)"
msgid "Pier"
msgstr "Molo"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Wrota śluzy"
@@ -19101,7 +19258,7 @@ msgid "1/50 mix (mofa/moped)"
msgstr ""
msgid "Fuel cards:"
-msgstr ""
+msgstr "Karty paliwowe:"
msgid "DKV"
msgstr ""
@@ -19464,7 +19621,7 @@ msgid "Tactile Paving"
msgstr "Nawierzchnia dla niewidomych"
msgid "incorrect"
-msgstr ""
+msgstr "nieprawidłowa"
msgid "Bus Platform"
msgstr "Peron autobusowy"
@@ -19478,12 +19635,6 @@ msgstr "Lotnictwo"
msgid "Airport Ground"
msgstr "Lotnisko"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Pas startowy"
@@ -19557,7 +19708,7 @@ msgid "Alpine Hut"
msgstr "Schronisko górskie"
msgid "Wilderness Hut"
-msgstr ""
+msgstr "Chata na odludziu"
msgid "Access rights"
msgstr "Prawa dostępu"
@@ -19667,6 +19818,9 @@ msgstr "Mikrobrowar"
msgid "Outdoor seating"
msgstr "Ogródek"
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast food"
@@ -19831,7 +19985,7 @@ msgid "Movie Theater/Cinema"
msgstr "Kino"
msgid "Drive-in theater"
-msgstr "Teatr samochodowy"
+msgstr "Samochodowe"
msgid "3D"
msgstr "3D"
@@ -20329,25 +20483,6 @@ msgstr "słoneczny"
msgid "unorthodox"
msgstr "niekonwencjonalny"
-msgid "Support"
-msgstr "Podpora"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "słup"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "ściana"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "billboard"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "grunt"
-
msgid "Visibility/readability"
msgstr "Widoczność (czytelność)"
@@ -20382,43 +20517,43 @@ msgid "Cans"
msgstr "Puszki"
msgid "Cardboard"
-msgstr ""
+msgstr "Karton"
msgid "Electrical Appliances"
-msgstr ""
+msgstr "Elektrośmieci"
msgid "Glass"
msgstr "Szkło"
msgid "Glass Bottles"
-msgstr ""
+msgstr "Butelki szklane"
msgid "Green Waste"
-msgstr ""
+msgstr "Odpady zielone"
msgid "Paper"
msgstr "Papier"
msgid "Plastic"
-msgstr ""
+msgstr "Plastik"
msgid "Plastic Bottles"
-msgstr ""
+msgstr "Butelki plastikowe"
msgid "Plastic Packaging"
-msgstr ""
+msgstr "Opakowania plastikowe"
msgid "Scrap Metal"
msgstr "Złom"
msgid "Shoes"
-msgstr "Sklep obuwniczy"
+msgstr "Obuwie"
msgid "Small Appliances"
-msgstr ""
+msgstr "Drobny sprzęt"
msgid "Waste"
-msgstr ""
+msgstr "Odpady ogólne"
msgid "Recycling Centre"
msgstr "Centrum recyklingu"
@@ -20433,13 +20568,13 @@ msgid "Sanitary Dump Station"
msgstr "Zlewnia nieczystości"
msgid "Suction pumpout"
-msgstr ""
+msgstr "Pompa"
msgid "Gravity drain for hose"
-msgstr ""
+msgstr "Opróżnianie grawitacyjne"
msgid "Casette or Elsan Disposal"
-msgstr ""
+msgstr "Wymienne pojemniki"
msgid "Operation times"
msgstr "Czas działania"
@@ -20749,7 +20884,7 @@ msgid "freeride"
msgstr ""
msgid "Grooming"
-msgstr ""
+msgstr "Rodzaj śniegu"
msgctxt "piste:grooming"
msgid "classic"
@@ -20927,6 +21062,14 @@ msgid "barn"
msgstr "stodoła"
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "budynek gospodarczy"
@@ -20972,7 +21115,7 @@ msgstr ""
msgctxt "building"
msgid "gasometer"
-msgstr ""
+msgstr "zbiornik gazu"
msgctxt "building"
msgid "cowshed"
@@ -21125,32 +21268,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr "Silos"
-msgid "Pipeline"
-msgstr "Rurociąg"
-
-msgid "water"
-msgstr "wodny"
-
-msgid "gas"
-msgstr "gazowy"
-
-msgid "heat"
-msgstr "ciepłowniczy"
-
-msgid "oil"
-msgstr "naftowy"
-
-msgid "sewage"
-msgstr "ściekowy"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "podwodny"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "naziemny"
-
msgid "Crane"
msgstr "Dźwig"
@@ -21235,6 +21352,23 @@ msgstr "Sztolnia"
msgid "Length in meters"
msgstr "Długość w metrach"
+msgid "Pipeline"
+msgstr "Rurociąg"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "podwodny"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "naziemny"
+
+msgid "Pipeline Marker"
+msgstr "Tabliczka informacyjna rurociągu"
+
+msgid "Pipeline Valve"
+msgstr "Zawór rurociągu"
+
msgid "Water Tower"
msgstr "Wieża ciśnień"
@@ -21475,6 +21609,34 @@ msgstr ""
msgid "Bridge outline"
msgstr "Obrys mostu"
+msgctxt "preset group"
+msgid "Military"
+msgstr "Obiekty wojskowe"
+
+msgid "Airfield"
+msgstr "Lotnisko wojskowe"
+
+msgid "Barracks"
+msgstr "Koszary"
+
+msgid "Bunker"
+msgstr "Bunkier"
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr "Strzelnica"
+
msgid "Power Plant"
msgstr "Elektrownia"
@@ -21847,7 +22009,7 @@ msgid "back-to-back"
msgstr ""
msgid "Amount of poles"
-msgstr ""
+msgstr "Liczba biegunów"
msgid "monopole"
msgstr ""
@@ -21935,7 +22097,7 @@ msgstr "czerwono/biały"
msgctxt "power"
msgid "Tower type"
-msgstr ""
+msgstr "Typ słupa"
msgctxt "power"
msgid "suspension"
@@ -21951,7 +22113,7 @@ msgstr "krańcowy"
msgctxt "power"
msgid "branch"
-msgstr ""
+msgstr "gałąź"
msgctxt "power"
msgid "transposing"
@@ -21962,7 +22124,7 @@ msgid "crossing"
msgstr ""
msgid "Branch tower type"
-msgstr "Drugi typ wieży"
+msgstr "Typ odgałęzienia"
msgctxt "power"
msgid "tap"
@@ -22397,7 +22559,7 @@ msgid "Ticket"
msgstr "Bilety"
msgid "For the body"
-msgstr ""
+msgstr "Dla ciała"
msgid "Chemist"
msgstr "Drogeria"
@@ -22475,7 +22637,7 @@ msgid "Pet"
msgstr "Zwierzęta domowe"
msgid "Photo"
-msgstr ""
+msgstr "Fotograf"
msgid "Funeral Directors"
msgstr "Dom pogrzebowy"
@@ -22642,6 +22804,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr "Biura"
+
+msgctxt "office"
+msgid "Accountant"
+msgstr "Księgowy"
+
+msgctxt "office"
+msgid "Administrative"
+msgstr "Administracja lokalna"
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr "Agencja reklamowa"
+
+msgctxt "office"
+msgid "Architect"
+msgstr "Architekt"
+
+msgctxt "office"
+msgid "Association"
+msgstr "Stowarzyszenie"
+
+msgctxt "office"
+msgid "Private company"
+msgstr "Przedsiębiorstwo prywatne"
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr "Instytucja edukacyjna"
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr "Agencja zatrudnienia"
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr "Nieruchomości"
+
+msgctxt "office"
+msgid "Foundation"
+msgstr "Fundacja"
+
+msgctxt "office"
+msgid "Government"
+msgstr "Instytucje rządowe"
+
+msgctxt "office"
+msgid "Insurance"
+msgstr "Ubezpieczenia"
+
+msgctxt "office"
+msgid "It specialist"
+msgstr "Usługi informatyczne"
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr "Prawnik"
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr "Redakcja gazety"
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr "Organizacja pozarządowa (NGO)"
+
+msgctxt "office"
+msgid "Notary"
+msgstr "Notariusz"
+
+msgctxt "office"
+msgid "Political party"
+msgstr "Partia polityczna"
+
+msgctxt "office"
+msgid "Religion"
+msgstr "Instytucja religijna"
+
+msgctxt "office"
+msgid "Research"
+msgstr "Badania"
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr "Doradca podatkowy"
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr "Telekomunikacja"
+
msgid "Geography"
msgstr "Geografia"
@@ -22962,7 +23215,7 @@ msgid ""
msgstr ""
msgid "Tourism attraction"
-msgstr ""
+msgstr "Atrakcja"
msgid "Stone"
msgstr "Głaz (nieprzytwierdzony)"
@@ -22981,6 +23234,29 @@ msgstr "Zagroda"
msgid "Farmland"
msgstr "Grunty rolne"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Łąka"
@@ -23336,7 +23612,7 @@ msgstr ""
msgctxt "note=*, fixme=*, description=*"
msgid "Similar but different tags:"
-msgstr ""
+msgstr "Podobne, ale inne tagi:"
msgctxt "the tag note=*"
msgid "Note"
@@ -23345,6 +23621,7 @@ msgstr "Notatka"
msgctxt "note=*"
msgid "An important hint for other mappers (not for the end user)."
msgstr ""
+"Istotna wskazówka dla innych mapowiczów (nie dla użytkowników końcowych)."
msgid "Fixme"
msgstr "Do poprawy"
@@ -23354,6 +23631,8 @@ msgid ""
"A hint for other mappers (not for the end user), that an object needs an "
"improvement."
msgstr ""
+"Wskazówka dla innych mapowiczów (nie dla użytkowników końcowych), że dany "
+"obiekt wymaga poprawy."
msgid "outer segment"
msgstr "Zewnętrzny segment"
@@ -23966,6 +24245,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -24022,6 +24304,12 @@ msgstr "Wyświetlaj etykiety ulic (przy wysokim przybliżeniu)"
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -26009,7 +26297,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -26052,9 +26343,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -28661,6 +28952,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Czy chcesz zapisać aktualną kalibrację warstwy {0}?"
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "Wczytaj kalibrację"
@@ -28670,6 +28964,9 @@ msgstr "Wczytuje dane kalibracji z pliku"
msgid "Loading file failed: {0}"
msgstr "Wczytywanie pliku zakończone niepowodzeniem: {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -28709,6 +29006,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "Przesuń PicLayer"
@@ -28822,8 +29122,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "Czy chcesz zastosować?"
-msgid "Load calibration file ?"
-msgstr "Wczytać plik kalibracji?"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr ""
@@ -29059,9 +29359,6 @@ msgstr "Stan"
msgid "pending"
msgstr "oczekujące"
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
@@ -29905,7 +30202,7 @@ msgid "unexpected column number {0}"
msgstr ""
msgid "Tagging Preset Tester"
-msgstr ""
+msgstr "Tester presetów"
msgid ""
"Open the tagging preset test tool for previewing tagging preset dialogs."
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index 2b73819..59f9435 100644
--- a/i18n/po/pt.po
+++ b/i18n/po/pt.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-28 01:11+0000\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-23 02:34+0000\n"
"Last-Translator: Rui <xande6ruz at yandex.com>\n"
"Language-Team: Portuguese <pt at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:54+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:54+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: pt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -172,6 +172,12 @@ msgstr "Módulos"
msgid "About JOSM..."
msgstr "Sobre o JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr "Não foi possível localizar o recurso ''{0}''."
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Falhou o carregamento do recurso ''{0}'', o erro é {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -675,7 +681,9 @@ msgid "The selected area is incomplete. Continue?"
msgstr "A área selecionada está incompleta. Continuar?"
msgid "No intersection found. Nothing was changed."
-msgstr "Nenhuma intersecção encontrada. Nada foi alterado."
+msgstr ""
+"Não foi encontrada nenhuma intersecção entre os objetos selecionados. Não "
+"foi nada alterado."
msgid "Move tags from ways to relations"
msgstr "Transferir as etiquetas das vias para as relações"
@@ -1141,12 +1149,15 @@ msgstr "Descarregar dados do mapa da API Overpass."
msgid "Builds an Overpass query using the Overpass Turbo query wizard"
msgstr ""
+"Cria uma consulta Overpass utilizando o wizard de consultas do Overpass Turbo"
msgid "Build query"
-msgstr ""
+msgstr "Criar consulta"
msgid "<html>The Overpass wizard could not parse the following query:"
msgstr ""
+"<html>Não foi possível processar a seguinte consulta (provavelmente contém "
+"erros):"
msgid "Parse error"
msgstr "Erro de processamento"
@@ -2353,14 +2364,12 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Selecionar, mover, escalonar e rodar objetos"
-msgid "Move elements"
-msgstr "Mover elementos"
-
-msgid "Move them"
-msgstr "Sim, mover"
-
-msgid "Undo move"
-msgstr "Desfazer movimento"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
+"Tem a certeza que quer mover elementos com linhas ligadas que estão "
+"escondidas pelos filtros?"
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2379,6 +2388,15 @@ msgstr[1] ""
"elevado de elementos.\n"
"Quer mesmo movê-los?"
+msgid "Move elements"
+msgstr "Mover elementos"
+
+msgid "Move them"
+msgstr "Sim, mover"
+
+msgid "Undo move"
+msgstr "Desfazer movimento"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Soltar o botão do rato para selecionar os objetos no retângulo"
@@ -2584,6 +2602,9 @@ msgstr "Seletor MapCSS"
msgid "add toolbar button"
msgstr "adicionar botão com esta pesquisa na barra de ferramentas"
+msgid "Invalid search expression"
+msgstr "A expressão de pesquisa está incorreta"
+
msgid "Filter"
msgstr "Filtrar"
@@ -2605,9 +2626,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "A expressão de pesquisa está incorreta"
-
msgid "basic examples"
msgstr "exemplos básicos"
@@ -3493,12 +3511,13 @@ msgstr "Imperial"
msgid "Nautical Mile"
msgstr "Milha Náutica"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Falhou o carregamento do recurso ''{0}'', o erro é {1}."
-
msgid "UNKNOWN"
msgstr "DESCONHECIDO"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+"Ocorreu um erro ao ler a informação da revisão do ficheiro de revisão: {0}"
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
"Número de versão inesperado do JOSM no ficheiro de revisão. Valor: ''{0}''"
@@ -4520,7 +4539,7 @@ msgid "Key ''{0}'' looks like ''{1}''."
msgstr "A chave ''{0}'' é parecida com ''{1}''."
msgid "Misspelled property key"
-msgstr ""
+msgstr "Propriedade da chave com erro ortográfico"
msgid "Key ''{0}'' not in presets."
msgstr "Chave ''{0}'' não existente nos modelos de etiquetas"
@@ -5240,6 +5259,14 @@ msgstr "Ajuda"
msgid "Menu: {0}"
msgstr "Menu: {0}"
+msgid "Main toolbar"
+msgstr "Barra de ferramentas"
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+"Altera a visibilidade da barra de ferramentas (barra horizontal no topo)"
+
msgid "Edit toolbar"
msgstr "Barra de ferramentas de edição"
@@ -5418,15 +5445,14 @@ msgstr "até à tela:"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Como alternativa pode introduzir um <strong>endereço de tela</strong> "
-"de uma única tela no formato <i>zoomlevel/x/y</i>, por exemplo "
-"<i>15/256/223</i>. Os endereços de telas no formato <i>zoom,x,y</i> ou "
-"<i>zoom;x;y</i> (separados por ponto ou ponto e vírgula) também são "
-"válidos.</html>"
+"<html>Como alternativa pode introduzir o <strong>endereço da tela</strong> "
+"de uma única tela no formato <i>nivel_de_zoom/x/y</i>, por exemplo "
+"<i>15/256/223</i>. Os endereços de tela no formato <i>zoom,x,y</i> ou "
+"<i>zoom;x;y</i> também são aceites.</html>"
msgid "Tile address:"
msgstr "Endereço da tela:"
@@ -6315,26 +6341,15 @@ msgstr "Resolver conflitos"
msgid "Resolve conflicts for ''{0}''"
msgstr "Resolver conflitos de ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Por favor confirme se quer remover <strong>1 objeto</strong> de "
-"<strong>1 relação</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] "Por favor confirme a eliminação de <strong>{0} objeto</strong>."
+msgstr[1] "Por favor confirme a eliminação de <strong>{0} objetos</strong>."
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Por favor confirme se quer remover <strong>1 objeto</strong> de "
-"<strong>{0} relações</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Por favor confirme se quer remover <strong>{0} objetos</strong> de "
-"<strong>{1} relações</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] "Será alterada {0} relação."
+msgstr[1] "Serão alteradas {0} relações."
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6621,40 +6636,52 @@ msgstr "Introduza as coordenadas para o novo nó."
msgid ""
"You can separate longitude and latitude with space, comma or semicolon."
msgstr ""
+"Pode-se separar a longitude e a latitude com espaço em branco, vírgula ou "
+"ponto e vírgula."
msgid ""
"Use positive numbers or N, E characters to indicate North or East cardinal "
"direction."
msgstr ""
+"Utilize números positivos ou os caracteres N e E para indicar a direção "
+"cardinal Norte ou Este."
msgid ""
"For South and West cardinal directions you can use either negative numbers "
"or S, W characters."
msgstr ""
+"Para direções cardinais de Sul e Oeste pode-se utilizar números negativos ou "
+"os caracteres S (Sul) e W (Oeste)."
msgid "Coordinate value can be in one of three formats:"
-msgstr ""
+msgstr "O valor da coordenada pode ser num dos 3 formatos:"
msgid "<i>degrees</i><tt>°</tt>"
-msgstr ""
+msgstr "<i>graus</i><tt>°</tt>"
msgid "<i>degrees</i><tt>°</tt> <i>minutes</i><tt>'</tt>"
-msgstr ""
+msgstr "<i>graus</i><tt>°</tt> <i>minutos</i><tt>'</tt>"
msgid ""
"<i>degrees</i><tt>°</tt> <i>minutes</i><tt>'</tt> "
"<i>seconds</i><tt>"</tt>"
msgstr ""
+"<i>graus</i><tt>°</tt> <i>minutos</i><tt>'</tt> "
+"<i>segundos</i><tt>"</tt>"
msgid ""
"Symbols <tt>°</tt>, <tt>'</tt>, <tt>′</tt>, <tt>"</tt>, "
"<tt>″</tt> are optional."
msgstr ""
+"Os símbolos <tt>°</tt> <tt>'</tt> <tt>′</tt> <tt>"</tt> "
+"<tt>″</tt> são opcionais."
msgid ""
"You can also use the syntax <tt>lat=\"...\" lon=\"...\"</tt> or "
"<tt>lat=''...'' lon=''...''</tt>."
msgstr ""
+"Também se pode utilizar a sintaxe <tt>lat=\"...\" lon=\"...\"</tt> or "
+"<tt>lat=''...'' lon=''...''</tt>."
msgid "Some examples:"
msgstr "Alguns exemplos:"
@@ -6840,10 +6867,11 @@ msgid "Customize the style"
msgstr "Personalizar o estilo"
msgid "Mini map"
-msgstr ""
+msgstr "Mini mapa"
msgid "Displays a small map of the current edit location"
msgstr ""
+"Mostra um pequeno mapa num painel com a localização atual onde está a editar."
msgid "List of notes"
msgstr "Lista de erros reportados"
@@ -7678,14 +7706,17 @@ msgstr "Etiquetas/Membros"
msgid "Tags for selected objects."
msgstr "Etiquetas dos objetos selecionados."
+msgid "<different>"
+msgstr "<diferente>"
+
msgid "Member Of"
msgstr "Membro das relações"
msgid "Position"
msgstr "Posição"
-msgid "<different>"
-msgstr "<diferente>"
+msgid "Tag filter"
+msgstr "Filtro de etiquetas"
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Objetos: {2} / Etiquetas: {0} / Membros: {1}"
@@ -7731,10 +7762,12 @@ msgstr ""
"Abrir no navegador de Internet a página de ajuda do objeto selecionado"
msgid "Go to Taginfo"
-msgstr ""
+msgstr "Ir ao site Taginfo"
msgid "Launch browser with Taginfo statistics for selected object"
msgstr ""
+"Acede ao site do Taginfo no navegador de internet para saber estatísticas "
+"sobre a etiqueta"
msgid "Paste Value"
msgstr "Colar Valor"
@@ -8649,7 +8682,7 @@ msgid "Node {0}"
msgstr "Nó {0}"
msgid "The nodes of this way are in reverse order"
-msgstr ""
+msgstr "Os nós desta via estão na ordem inversa"
msgid "Zoom to node"
msgstr "Enquadrar o nó"
@@ -11967,6 +12000,8 @@ msgstr "4. Introduza o nome desta camada"
msgid "Store WMS endpoint only, select layers at usage"
msgstr ""
+"Armazenar apenas o endereço do serviço WMS e escolher a camada pretendida "
+"quando o utilizar"
msgid "Show bounds"
msgstr "Mostrar limites"
@@ -13201,10 +13236,14 @@ msgstr "Criar relação"
msgid ""
"The preset <i>{0}</i> cannot be applied since nothing has been selected!"
msgstr ""
+"O modelo de etiquetas <i>{0}</i> não pode ser aplicado porque não foi "
+"selecionado nada!"
msgid ""
"The preset <i>{0}</i> cannot be applied since the selection is unsuitable!"
msgstr ""
+"O modelo de etiquetas <i>{0}</i> não pode ser aplicado porque os objetos "
+"selecionados não são adequados a este modelo de etiquetas!"
msgid "Change {0} object"
msgid_plural "Change {0} objects"
@@ -13302,6 +13341,9 @@ msgstr ""
"Modelo de etiquetas com erros \"{0}-{1}\" - o número de itens em "
"''display_values'' tem de ser igual ao número de ''values''"
+msgid "Detailed information: {0} <> {1}"
+msgstr "Informação detalhada: {0} <> {1}"
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13490,6 +13532,9 @@ msgstr "A descarregar pontos GPS {0} a {1}..."
msgid "Contacting OSM Server..."
msgstr "A contactar o servidor OpenStreetMap..."
+msgid "Downloading notes"
+msgstr "A descarregar erros reportados"
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Não foi possível abrir a entrada de dados do recurso ''{0}''"
@@ -15687,6 +15732,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "matagal"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "estrada associada"
@@ -15938,7 +15987,7 @@ msgid "OpenStreetMap GPS Traces"
msgstr "Trilhos GPS no OpenStreetMap"
msgid "OpenStreetMap (Standard layer)"
-msgstr ""
+msgstr "OpenStreetMap (camada padrão)"
msgid "skobbler"
msgstr "skobbler"
@@ -16186,7 +16235,7 @@ msgid "Géolittoral - Orthophotos 2000"
msgstr "Géolittoral - Ortofotos 2000"
msgid "Géolittoral V2 - Orthophotos 2011-2014"
-msgstr ""
+msgstr "Géolittoral V2 - Ortofotos 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
@@ -16216,7 +16265,7 @@ msgid "Tours - Orthophotos 2013"
msgstr "Tours - Ortofotos 2013"
msgid "Tours - Orthophotos 2008-2010"
-msgstr ""
+msgstr "Tours - Ortofotos 2008-2010"
msgid ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
@@ -16299,6 +16348,9 @@ msgstr "Imagens de Drone (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Imagens de Drone 2014 (Haiti)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Departamento de Guerra da Irlanda Britânica 1:25k GSGS 3906"
@@ -16327,8 +16379,11 @@ msgstr "OSMIE Paróquias Civis"
msgid "OSMIE Baronies"
msgstr "OSMIE Baronatos"
-msgid "OSMIE Political"
-msgstr "OSMIE Político"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
+msgstr ""
msgid "Lodi - Italy"
msgstr "Lodi - Itália"
@@ -16903,6 +16958,9 @@ msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "OS Town Plans, Peebles 1856 (NLS)"
@@ -16978,11 +17036,16 @@ msgid ""
"Provides Apache Commons library components. Not meant to be installed "
"directly by users, but rather as a dependency for other plugins."
msgstr ""
+"Fornece componentes da biblioteca Apache Commons. Não é suposto ser "
+"instalado diretamente, mas sim quando outros módulos precisam deste ao serem "
+"instalados."
msgid ""
"Provides Apache HTTP library. Not meant to be installed directly by users, "
"but rather as a dependency for other plugins."
msgstr ""
+"Fornece a biblioteca Apache HTTP. Não é suposto ser instalado diretamente, "
+"mas sim quando outros módulos precisam deste ao serem instalados."
msgid ""
"Allows selection of areas in an layer and automatic creation of a way as "
@@ -17069,6 +17132,11 @@ msgstr ""
"Permite tornar anónimas as marcas de tempo e eliminar rapidamente trilhos "
"GPS muito grandes"
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
"Mostra o perfil de elevação e alguns dados estatísticos de um trilho GPS"
@@ -17116,6 +17184,11 @@ msgstr ""
"Visualiza informações de itinerários numa camada com diagramas dos "
"itinerários."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "Ferramenta simples para etiquetar números de casas."
@@ -17690,9 +17763,21 @@ msgstr "lamaçal"
msgid "Lanes"
msgstr "Faixas de rodagem"
+msgid "Lanes in way direction"
+msgstr "Faixas de rodagem na direção da linha"
+
+msgid "Lanes opposed to way direction"
+msgstr "Faixas de rodagem na direção inversa da linha"
+
msgid "Max. speed (km/h)"
msgstr "Velocidade máxima (km/h)"
+msgid "Max. speed in way direction"
+msgstr "Velocidade máxima no sentido da linha"
+
+msgid "Max. speed opposed to way direction"
+msgstr "Velocidade máxima no sentido inverso da linha"
+
msgid "Bridge"
msgstr "Ponte"
@@ -17760,6 +17845,9 @@ msgstr "linha de cruzamento de comboios (normalmente em via única)"
msgid "spur"
msgstr "ramal curto (apenas de mercadorias)"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Eletrificado"
@@ -17854,6 +17942,9 @@ msgstr "área separada"
msgid "isolated"
msgstr "área completamente isolada"
+msgid "outside"
+msgstr "fora"
+
msgid "Height (meters)"
msgstr "Altura (metros)"
@@ -18399,6 +18490,9 @@ msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
"O corpo de água é ocasional (desaparece e aparece conforme as estações)?"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr "tubo de água"
@@ -18420,12 +18514,88 @@ msgstr "Mota de água"
msgid "Canoe"
msgstr "Canoa"
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "água"
+
+msgid "gas"
+msgstr "gás"
+
+msgid "heat"
+msgstr "calor"
+
+msgid "oil"
+msgstr "petróleo"
+
+msgid "sewage"
+msgstr "esgotos"
+
+msgid "Support"
+msgstr "Estrutura de Suporte"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "poste"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "na_parede"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "num painel com publicidade"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "chão"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Estradas"
msgid "Motorway"
msgstr "Auto-estrada"
+msgid "Placement"
+msgstr "Posicionamento"
+
+msgid "left_of:1"
+msgstr "à esquerda de:1"
+
+msgid "left_of:2"
+msgstr "à esquerda de:2"
+
+msgid "left_of:3"
+msgstr "à esquerda de:3"
+
+msgid "middle_of:1"
+msgstr "no meio de:1"
+
+msgid "middle_of:2"
+msgstr "no meio de:2"
+
+msgid "middle_of:3"
+msgstr "no meio de:3"
+
+msgid "right_of:1"
+msgstr "à direita de:1"
+
+msgid "right_of:2"
+msgstr "à direita de:2"
+
+msgid "right_of:3"
+msgstr "à direita de:3"
+
+msgid "transition"
+msgstr "transição"
+
msgid "Motorway Link"
msgstr "Ligação a Auto-Estrada"
@@ -18527,6 +18697,9 @@ msgstr "estrada apenas para estacionar"
msgid "drive-through"
msgstr "serviço ao volante (sem sair do carro)"
+msgid "emergency_access"
+msgstr "acesso para emergências"
+
msgid "Parking Aisle"
msgstr "Estrada de Parque de Estacionamento"
@@ -19079,12 +19252,15 @@ msgstr "Círculo de Viragem"
msgid "Turning Loop"
msgstr "Círculo de Viragem com Ilha no Meio"
-msgid "City Limit"
-msgstr "Sinal de Limite de Cidade/Vila/Aldeia/Freguesia/Município..."
+msgid "City Limit Sign"
+msgstr "Sinal de Limite de Cidade"
msgid "Second Name"
msgstr "Nome alternativo"
+msgid "Speed Limit Sign"
+msgstr "Sinal de Limite de Velocidade"
+
msgid "Speed Camera"
msgstr "Radar de Controlo de Velocidade"
@@ -19203,6 +19379,12 @@ msgstr "Railes de proteção da via"
msgid "Wall"
msgstr "Muro"
+msgid "dry_stone"
+msgstr "pedras soltas (sem argamassa)"
+
+msgid "noise_barrier"
+msgstr "barreira anti-ruído"
+
msgid "City Wall"
msgstr "Muralha de cidade"
@@ -19611,6 +19793,15 @@ msgstr "GNC (Gás Natural Comprimido)"
msgid "Pier"
msgstr "Pontão (atracadouro)"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Eclusa"
@@ -20249,12 +20440,6 @@ msgstr "Avião"
msgid "Airport Ground"
msgstr "Aeroporto / Aeródromo"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Pista de Aterragem e Descolagem"
@@ -20328,7 +20513,7 @@ msgid "Alpine Hut"
msgstr "Albergue de Montanha"
msgid "Wilderness Hut"
-msgstr ""
+msgstr "Cabana"
msgid "Access rights"
msgstr "Direitos de acesso"
@@ -20340,7 +20525,7 @@ msgid "seasonal"
msgstr "sasonal"
msgid "Reservation"
-msgstr ""
+msgstr "Pedidos de reserva"
msgid "required"
msgstr "obrigatório"
@@ -20438,6 +20623,9 @@ msgstr "Destila e vende cerveja artesanal"
msgid "Outdoor seating"
msgstr "Esplanada"
+msgid "Takeaway"
+msgstr "Refeições para fora (take-away)"
+
msgid "Fast Food"
msgstr "Comida Rápida (Fast Food)"
@@ -20725,7 +20913,7 @@ msgid "Place of Worship"
msgstr "Local de Oração"
msgid "Church"
-msgstr "Igreja"
+msgstr "Igreja / Capela"
msgid "Building type"
msgstr "Tipo de edifício"
@@ -21037,11 +21225,11 @@ msgstr "Horário de recolha"
msgctxt "post_box"
msgid "pillar"
-msgstr ""
+msgstr "pilar (típicos marcos de correio)"
msgctxt "post_box"
msgid "lamp"
-msgstr ""
+msgstr "suportado por um poste"
msgctxt "post_box"
msgid "wall"
@@ -21049,7 +21237,7 @@ msgstr "na parede"
msgctxt "post_box"
msgid "meter"
-msgstr ""
+msgstr "caixa para correio pré-franquiado"
msgid "Drive through"
msgstr "Serviço ao volante (sem sair do carro)"
@@ -21103,25 +21291,6 @@ msgstr "relógio de sol"
msgid "unorthodox"
msgstr "incomum (binário, a água...)"
-msgid "Support"
-msgstr "Estrutura de Suporte"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "poste"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "na_parede"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "num painel com publicidade"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "chão"
-
msgid "Visibility/readability"
msgstr "Visibilidade/legibilidade"
@@ -21259,15 +21428,15 @@ msgstr "Altura (metros)"
msgctxt "height"
msgid "low"
-msgstr ""
+msgstr "baixo"
msgctxt "height"
msgid "half"
-msgstr ""
+msgstr "médio"
msgctxt "height"
msgid "full"
-msgstr ""
+msgstr "alto"
msgid "Hide"
msgstr "Escondido"
@@ -21329,22 +21498,22 @@ msgid "Count"
msgstr "Nº de bocas"
msgid "Compressed Air"
-msgstr ""
+msgstr "Ar Comprimido"
msgid "Valves"
-msgstr ""
+msgstr "Válvulas"
msgid "Dunlop (Woods)"
-msgstr ""
+msgstr "Dunlop (bicicletas no Japão)"
msgid "Schrader"
-msgstr ""
+msgstr "Schrader (carros)"
msgid "Sclaverand (Presta)"
-msgstr ""
+msgstr "Presta (bicicletas)"
msgid "Regina"
-msgstr ""
+msgstr "Regina (bicicletas em Itália)"
msgid "Advertising Column"
msgstr "Coluna de publicidade"
@@ -21703,6 +21872,14 @@ msgid "barn"
msgstr "celeiro"
msgctxt "building"
+msgid "stable"
+msgstr "estábulo"
+
+msgctxt "building"
+msgid "cabin"
+msgstr "cabana"
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "edifício da quinta (não habitável, para máquinas, etc.)"
@@ -21901,32 +22078,6 @@ msgstr "vinho"
msgid "Bunker Silo"
msgstr "Silo em Corredor/Trincheira"
-msgid "Pipeline"
-msgstr "Pipeline / Tubo (água, petróleo, esgotos...)"
-
-msgid "water"
-msgstr "água"
-
-msgid "gas"
-msgstr "gás"
-
-msgid "heat"
-msgstr "calor"
-
-msgid "oil"
-msgstr "petróleo"
-
-msgid "sewage"
-msgstr "esgotos"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "submerso"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "à superfície"
-
msgid "Crane"
msgstr "Grua"
@@ -22011,6 +22162,23 @@ msgstr "Galeria de Acesso a Mina"
msgid "Length in meters"
msgstr "Comprimento em metros"
+msgid "Pipeline"
+msgstr "Pipeline / Tubo (água, petróleo, esgotos...)"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "submerso"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "à superfície"
+
+msgid "Pipeline Marker"
+msgstr "Sinalizador de Pipeline/Tubagem"
+
+msgid "Pipeline Valve"
+msgstr "Válvula de Pipeline"
+
msgid "Water Tower"
msgstr "Depósito de Água"
@@ -22252,6 +22420,34 @@ msgstr "pilar de pivot (em pontes móveis)"
msgid "Bridge outline"
msgstr "Contorno de Ponte (área)"
+msgctxt "preset group"
+msgid "Military"
+msgstr "Militar"
+
+msgid "Airfield"
+msgstr "Base Aérea"
+
+msgid "Barracks"
+msgstr "Quartel"
+
+msgid "Bunker"
+msgstr "Búnquer"
+
+msgid "pillbox"
+msgstr "posto de vigia/tiro"
+
+msgid "munitions"
+msgstr "abrigo de munições"
+
+msgid "hardened_aircraft_shelter"
+msgstr "abrigo para aviões reforçado"
+
+msgid "Historic"
+msgstr "Histórico"
+
+msgid "Range"
+msgstr "Carreira de tiro militar"
+
msgid "Power Plant"
msgstr "Central de Energia"
@@ -23172,7 +23368,7 @@ msgid "Ticket"
msgstr "Bilheteira"
msgid "For the body"
-msgstr ""
+msgstr "Para o corpo"
msgid "Chemist"
msgstr "Drogaria"
@@ -23250,7 +23446,7 @@ msgid "Pet"
msgstr "Loja de animais/artigos para animais"
msgid "Photo"
-msgstr ""
+msgstr "Loja de Fotografia"
msgid "Funeral Directors"
msgstr "Agência Funerária"
@@ -23417,6 +23613,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr "Escritórios"
+
+msgctxt "office"
+msgid "Accountant"
+msgstr "Contabilista"
+
+msgctxt "office"
+msgid "Administrative"
+msgstr "Escritório da administração local (genérico)"
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr "Agência de publicidade"
+
+msgctxt "office"
+msgid "Architect"
+msgstr "Arquiteto"
+
+msgctxt "office"
+msgid "Association"
+msgstr "Associação (desportiva, estudantil, org. sem fins lucrativos...)"
+
+msgctxt "office"
+msgid "Private company"
+msgstr "Empresa privada (genérico)"
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr "Instituição de Ensino"
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr "Agência de emprego"
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr "Imobiliária"
+
+msgctxt "office"
+msgid "Foundation"
+msgstr "Fundação"
+
+msgctxt "office"
+msgid "Government"
+msgstr "Escritório da administração nacional (genérico)"
+
+msgctxt "office"
+msgid "Insurance"
+msgstr "Agência de Seguros / Seguradora"
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr "Advogado / Empresa de Advogados"
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr "Jornal (sede ou agência)"
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr "Organização não governamental (ONG)"
+
+msgctxt "office"
+msgid "Notary"
+msgstr "Notário"
+
+msgctxt "office"
+msgid "Political party"
+msgstr "Partido político (sede ou filial)"
+
+msgctxt "office"
+msgid "Religion"
+msgstr "Instituição religiosa"
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr "Assessoria fiscal"
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr "Telecomunicações (sede ou loja)"
+
msgid "Geography"
msgstr "Geografia"
@@ -23766,6 +24053,29 @@ msgstr "Quinta (marcar apenas a área dos edifícios todos e o pátio)"
msgid "Farmland"
msgstr "Agricultura (campos isolados ou em redor de quintas)"
+msgid "Crop"
+msgstr "Tipo de cultura"
+
+msgctxt "crop"
+msgid "corn"
+msgstr "milho"
+
+msgctxt "crop"
+msgid "grass"
+msgstr "erva (genérico)"
+
+msgctxt "crop"
+msgid "rice"
+msgstr "arroz"
+
+msgctxt "crop"
+msgid "wheat"
+msgstr "trigo"
+
+msgctxt "crop"
+msgid "hop"
+msgstr "lúpulo"
+
msgid "Meadow"
msgstr "Prado"
@@ -24536,7 +24846,7 @@ msgid "{0} together with addr:*"
msgstr "{0} junto com addr:*"
msgid "{0} together with {1} and conflicting values"
-msgstr ""
+msgstr "{0} junto com {1} e valores em conflito"
msgid "{0} on suspicious object"
msgstr "{0} sem etiquetas adicionais"
@@ -24569,7 +24879,7 @@ msgid "Same value of {0}, {1} and {2}"
msgstr "O mesmo valor de {0}, {1} e {2}"
msgid "{0} and {1} together with {2} and conflicting values"
-msgstr ""
+msgstr "{0} e {1} junto com {2} e valores em conflito"
msgid "Suspicious tag combination: {0} and {1}"
msgstr "Combinação de etiquetas suspeita: {0} e {1}"
@@ -24644,7 +24954,7 @@ msgid "uncommon short key"
msgstr "chave curta incomum"
msgid "{0} is inaccurate"
-msgstr ""
+msgstr "{0} é genérico"
msgid "{0} on a node. Should be used on a way."
msgstr "{0} num nó. Deve ser usado numa linha."
@@ -24740,6 +25050,8 @@ msgstr "{0}: medida por defeito em metros; o separador deve ser um ponto"
msgid ""
"{0}: tonne is default; period is separator; if units, put space then unit"
msgstr ""
+"{0}: por padrão em toneladas; ponto para separador; para unidades colocar "
+"espaço e depois a unidade"
msgid "unusual {0} format"
msgstr "formato {0} incomum"
@@ -24748,6 +25060,8 @@ msgid ""
"{0}: kilometers is default; period is separator; if units, put space then "
"unit"
msgstr ""
+"{0}: por padrão em quilómetros; ponto para separador; para unidades colocar "
+"espaço e depois a unidade"
msgid "voltage should be in volts with no units/delimiter/spaces"
msgstr ""
@@ -24769,6 +25083,9 @@ msgstr "{0} tem de ser um número"
msgid "{0} must be a positive integer number"
msgstr "{0} tem de ser um número inteiro positivo"
+msgid "unusual value of {0}"
+msgstr "valor incomum de {0}"
+
msgid "relation without type"
msgstr "relação sem a etiqueta \"type\" (tipo de relação)"
@@ -24825,6 +25142,12 @@ 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 "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Ficheiros CSV Columbus V-900 - Visiontac VGPS-900"
@@ -27014,13 +27337,13 @@ msgid "Toggle the continuous download on/off"
msgstr ""
msgid "Download Settings"
-msgstr ""
+msgstr "Definições de Descarregamento"
msgid "Settings for the continuous download."
-msgstr ""
+msgstr "Definições para o descarregamento contínuo"
msgid "Activate continuous downloads at startup."
-msgstr ""
+msgstr "Ativar descarregamento contínuo ao iniciar."
msgid "Supress the default modal progress monitor when downloading."
msgstr ""
@@ -27032,9 +27355,12 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
msgstr ""
+msgid "Requires restart"
+msgstr "Necessita de reiniciar"
+
msgid "Max threads"
msgstr ""
@@ -27050,7 +27376,7 @@ msgid ""
msgstr ""
msgid "Wait time (milliseconds)"
-msgstr ""
+msgstr "Tempo de espera (milissegundos)"
msgid ""
"How much extra area around the viewport is it going to download. Setting "
@@ -27066,18 +27392,18 @@ msgid ""
msgstr ""
msgid "Max download area"
-msgstr ""
+msgstr "Área máxima de descarregamento"
msgid "The strategy for finding what areas to request from the server."
msgstr ""
msgid "Download strategy"
-msgstr ""
+msgstr "Estratégia de descarregamento"
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -28516,7 +28842,7 @@ msgid "Upload Mapillary pictures"
msgstr "Enviar imagens Mapillary"
msgid "Upload pictures."
-msgstr ""
+msgstr "Enviar imagens."
msgid "Walk mode"
msgstr "Modo a pé"
@@ -28534,16 +28860,16 @@ msgid "Uploaded {0} images"
msgstr "Enviadas {0} imagens"
msgid "Approve upload on the website"
-msgstr ""
+msgstr "Aprovar o envio no site."
msgid "View in website"
msgstr "Ver no site"
msgid "Copy key"
-msgstr ""
+msgstr "Copiar chave"
msgid "Copy key tag"
-msgstr ""
+msgstr "Copiar etiqueta da chave"
msgid "Edit on website"
msgstr "Editar no site"
@@ -28558,7 +28884,7 @@ msgid "Export selected images"
msgstr "Exportar imagens selecionadas"
msgid "Rewrite imported images"
-msgstr ""
+msgstr "Tornar a gravar as imagens importadas"
msgid "Select a folder"
msgstr "Selecionar pasta"
@@ -28618,7 +28944,7 @@ msgid "Open Mapillary filter dialog"
msgstr "Abrir janela de filtro Mapillary"
msgid "Not older than: "
-msgstr ""
+msgstr "Não mais antigas que: "
msgid "Downloaded images"
msgstr "Imagens descarregadas"
@@ -28687,7 +29013,7 @@ msgid "Pauses the walk."
msgstr "Pausa o modo a pé"
msgid "Reverse buttons position when displaying images."
-msgstr ""
+msgstr "Inverter posição dos botões ao ver as imagens."
msgid "Display hour when the picture was taken"
msgstr "Mostrar a hora a que a fotografia foi tirada"
@@ -28696,7 +29022,7 @@ msgid "Use 24 hour format"
msgstr "Usar formato 24 horas"
msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
+msgstr "Ver a localização da imagem seguinte com os botões seguinte/anterior"
msgid "Download mode: "
msgstr "Método de descarregamento: "
@@ -28708,13 +29034,13 @@ msgid "Delete after upload"
msgstr "Eliminar após o envio"
msgid "Wait for full quality pictures"
-msgstr ""
+msgstr "Esperar pelas imagens em alta qualidade"
msgid "Follow selected image"
-msgstr ""
+msgstr "Seguir a imagem selecionada"
msgid "Go forward"
-msgstr ""
+msgstr "Avançar"
msgid "Deleted {0} image"
msgid_plural "Deleted {0} images"
@@ -28759,6 +29085,8 @@ msgid ""
"<html><head><title>Mapillary login</title></head><body>Login successful, "
"return to JOSM.</body></html>"
msgstr ""
+"<html><head><title>Autenticação no Mapillary</title></head><body>A "
+"autenticação foi bem sucedida, voltar ao JOSM.</body></html>"
msgid "Downloading Mapillary images"
msgstr "A descarregar imagens Mapillary"
@@ -29851,6 +30179,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Quer gravar a calibração atual da camada {0}?"
+msgid "Select an option"
+msgstr "Selecione uma opção"
+
msgid "Load Picture Calibration..."
msgstr "Abrir Calibração de Imagem"
@@ -29860,6 +30191,9 @@ msgstr "Abre os dados de calibração de um ficheiro"
msgid "Loading file failed: {0}"
msgstr "Não foi possível carregar o ficheiro: {0}"
+msgid "Problem occurred"
+msgstr "Ocorreu um problema"
+
msgid "Load World File Calibration..."
msgstr ""
@@ -29899,6 +30233,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr "Notificação"
+
msgid "PicLayer move"
msgstr "PicLayer mover"
@@ -30017,8 +30354,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "Quer aplicar?"
-msgid "Load calibration file ?"
-msgstr "Carregar ficheiro de calibração?"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr "Será aplicado automaticamente."
@@ -30260,9 +30597,6 @@ msgstr "Estado"
msgid "pending"
msgstr "pendente"
-msgid "outside"
-msgstr "fora"
-
msgid "[incomplete]"
msgstr "[incompleto]"
@@ -31316,9 +31650,11 @@ msgid ""
"<html>Something went wrong, please update the plugin or report an issue at "
"<a href=\"\">josm-tofix-plugin/issues</a></html>"
msgstr ""
+"<html>Algo correu mal, por favor atualize o módulo ou indique o problema que "
+"ocorreu em <a href=\"\">josm-tofix-plugin/issues</a></html>"
msgid "Something went wrong, try again"
-msgstr ""
+msgstr "Algo correu mal, tente de novo"
msgid "Cannot place a node outside of the world."
msgstr "Não é possível colocar um nó fora do mundo."
diff --git a/i18n/po/pt_BR.po b/i18n/po/pt_BR.po
index 5ba1e9a..e78614d 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-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-08 11:57+0000\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-22 04: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-10-30 05:03+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 05:03+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: pt_BR\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -175,6 +175,12 @@ msgstr "Extensões"
msgid "About JOSM..."
msgstr "Sobre o JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Falhou em carregar o recurso ''{0}''. Erro é {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2323,14 +2329,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Selecionar, mover, escalar e rotacionar objetos"
-msgid "Move elements"
-msgstr "Mover elementos"
-
-msgid "Move them"
-msgstr "Mova-os"
-
-msgid "Undo move"
-msgstr "Desfazer mover"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2349,6 +2351,15 @@ msgstr[1] ""
"geralmente um erro.\n"
"Deseja realmente movê-los?"
+msgid "Move elements"
+msgstr "Mover elementos"
+
+msgid "Move them"
+msgstr "Mova-os"
+
+msgid "Undo move"
+msgstr "Desfazer mover"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Solte o botão do mouse para selecionar os objetos no retângulo."
@@ -2554,6 +2565,9 @@ msgstr ""
msgid "add toolbar button"
msgstr "adicionar botão à barra de ferramentas"
+msgid "Invalid search expression"
+msgstr "Expressão de busca inválida"
+
msgid "Filter"
msgstr "Filtro"
@@ -2575,9 +2589,6 @@ msgstr ""
"\n"
"{0}"
-msgid "Invalid search expression"
-msgstr "Expressão de busca inválida"
-
msgid "basic examples"
msgstr "exemplos básicos"
@@ -3456,12 +3467,12 @@ msgstr "Imperial"
msgid "Nautical Mile"
msgstr "Milhas náuticas"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Falhou em carregar o recurso ''{0}''. Erro é {1}."
-
msgid "UNKNOWN"
msgstr "DESCONHECIDO"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
"Número da versão JOSM inesperado na revisão do arquivo, o valor é ''{0}''"
@@ -4956,13 +4967,13 @@ msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
msgid "Set the user data directory"
-msgstr "Configurar o diretório de dados do usuário"
+msgstr "Definir o diretório de dados do usuário"
msgid "/PATH/TO/JOSM/CACHE "
msgstr ""
msgid "Set the cache directory"
-msgstr "Configurar o diretório de cache"
+msgstr "Definir o diretório de cache"
msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
@@ -5167,8 +5178,16 @@ msgstr "Ajuda"
msgid "Menu: {0}"
msgstr "Menu: {0}"
+msgid "Main toolbar"
+msgstr "Barra de ferramentas principal"
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+"Alterna a visibilidade da barra de ferramentas principal (a barra horizontal)"
+
msgid "Edit toolbar"
-msgstr "Editar barra de ferramentas"
+msgstr "Barra de edição"
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
@@ -5345,14 +5364,10 @@ msgstr "até o tile"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Alternativamente, você pode digitar um <strong>endereço de "
-"quadro</strong> para uma único quadro no formato <i>nível de zoom/x/y </i>, "
-"isto é, <i>15/256/223</i>. Endereços de quadros no formato <i>zoom,x,y</i> "
-"ou <i>zoom;x;y</i> são válidos também.</html>"
msgid "Tile address:"
msgstr "Endereço do tile:"
@@ -6246,26 +6261,15 @@ msgstr "Resolver conflitos"
msgid "Resolve conflicts for ''{0}''"
msgstr "Resolver conflitos para ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Por favor confirme para remover <strong>1 objeto</strong> de <strong>1 "
-"relação</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Por favor confirme para remover <strong>1 objeto</strong> de "
-"<strong>{0} relações</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Por gentileza confirme a remoção de <strong>{0} objetos</strong> de "
-"<strong>{1} relações</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7606,20 +7610,23 @@ msgstr "Tags/Membros"
msgid "Tags for selected objects."
msgstr "Tagps para objetos selecionados."
+msgid "<different>"
+msgstr "<diferente>"
+
msgid "Member Of"
msgstr "Membro de"
msgid "Position"
msgstr "Posição"
-msgid "<different>"
-msgstr "<diferente>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Objetos: {2} / Tags: {0} / Membros: {1}"
msgid "Tags: {0} / Memberships: {1}"
-msgstr "Tags: {0}/ Membors: {1}"
+msgstr "Tags: {0} / Membros: {1}"
msgid "Tags / Memberships"
msgstr "Tags / Membros"
@@ -13145,6 +13152,9 @@ msgstr ""
"Quebrada codificação da predefinição \"{0}-{1}\" - número de itens em "
"''display_values'' deve ser o mesmo que em ''values''"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13332,6 +13342,9 @@ msgstr "Baixando pontos {0} a {1}..."
msgid "Contacting OSM Server..."
msgstr "Acessando Servidor OSM..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Falha ao abrir o fluxo de entrada de recursos ''{0}''"
@@ -15488,7 +15501,7 @@ msgstr "cidade"
msgctxt "landuse"
msgid "forest"
-msgstr "floresta"
+msgstr "floresta manejada"
msgctxt "landuse"
msgid "meadow"
@@ -15506,6 +15519,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "arbusto"
+msgctxt "natural"
+msgid "wood"
+msgstr "floresta"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "associatedStreet"
@@ -16117,6 +16134,9 @@ msgstr "Drone Imagery (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Imagery 2014 (Haiti)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16144,7 +16164,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -16720,6 +16743,9 @@ msgstr "OS Town Plans, Nairn 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "OS Town Plans, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "OS Town Plans, Peebles 1856 (NLS)"
@@ -16892,6 +16918,11 @@ msgstr ""
"permite que o usuário anonimize informações de tempo e remova partes de uma "
"trilha GPS gigante de forma muito rápida."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
"Mostra o perfil de elevação e alguns dados estatísticos de uma trilha GPX."
@@ -16938,6 +16969,11 @@ msgstr "Permite filtrar os tracks de GPS desnecessários"
msgid "Visualizes routing information as a routing graph."
msgstr "Visualiza informações de roteamento como um gráfico de roteamento."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "Ferramenta simples para etiquetar os números da casa."
@@ -17223,10 +17259,6 @@ msgid ""
"tagging presets (quick preview of the dialog that will popup). You can start "
"the jar-file as standalone as well."
msgstr ""
-"Adiciona um testador de marcação de predefinições no menu de ajuda, que "
-"ajudará você a desenvolver marcas de predefinições (pré-visualização rápida "
-"da caixa de diálogo que irá aparecer). Você pode iniciar o arquivo jar "
-"separadamente também."
msgid "Make terraced houses out of single blocks."
msgstr "Torna casas com terraço em de blocos individuais."
@@ -17445,9 +17477,21 @@ msgstr "lama"
msgid "Lanes"
msgstr "Faixas"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Velocidade máxima (km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Ponte"
@@ -17515,6 +17559,9 @@ msgstr "desvio"
msgid "spur"
msgstr "espora"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Eletrificado"
@@ -17580,7 +17627,7 @@ msgid "limited"
msgstr "limitado"
msgid "Brand"
-msgstr "Sinal"
+msgstr "Marca"
msgid "Internet access"
msgstr "Acesso à Internet"
@@ -17609,6 +17656,9 @@ msgstr "separado"
msgid "isolated"
msgstr "isolado"
+msgid "outside"
+msgstr "do lado de fora"
+
msgid "Height (meters)"
msgstr "Altura (metros)"
@@ -18153,6 +18203,9 @@ msgstr "Pedágio"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "O corpo de água é intermitente (desaparece sazonalmente)?"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -18174,12 +18227,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "água"
+
+msgid "gas"
+msgstr "gás"
+
+msgid "heat"
+msgstr "calor"
+
+msgid "oil"
+msgstr "petróleo"
+
+msgid "sewage"
+msgstr "esgoto"
+
+msgid "Support"
+msgstr "Suporte"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "pólo"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "wall_mounted"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "letreiro"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "acampar"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Ruas"
msgid "Motorway"
msgstr "Autoestrada"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Ligação de Autoestrada"
@@ -18281,6 +18410,9 @@ msgstr "corredor_de_estacionamento"
msgid "drive-through"
msgstr "drive-through"
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Vaga de Estacionamento"
@@ -18835,12 +18967,15 @@ msgstr "Círculo de retorno"
msgid "Turning Loop"
msgstr "Turning Loop"
-msgid "City Limit"
-msgstr "Limite da Cidade"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Segundo nome"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Radar de Velocidade"
@@ -18958,6 +19093,12 @@ msgstr "Guarda ferroviário"
msgid "Wall"
msgstr "Muralha"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Muro da Cidade"
@@ -19368,6 +19509,15 @@ msgstr "CNG (Compressed Natural Gas)"
msgid "Pier"
msgstr "Pier"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Portão de Dique"
@@ -19689,7 +19839,7 @@ msgid "Sale"
msgstr "Venda"
msgid "brand"
-msgstr "sinal"
+msgstr "marca"
msgid "oldtimer"
msgstr "oldtimer"
@@ -19873,10 +20023,10 @@ msgid "Stop Area"
msgstr "Área de parada"
msgid "UIC reference"
-msgstr "ReferênciaUIC"
+msgstr "Referência UIC"
msgid "UIC name"
-msgstr "nome UIC"
+msgstr "Nome UIC"
msgid "Stop Position"
msgstr "Posição de parada"
@@ -20008,12 +20158,6 @@ msgstr "Aeroporto"
msgid "Airport Ground"
msgstr "Terreno do Aeroporto"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Pista"
@@ -20197,6 +20341,9 @@ msgstr "Microcervejaria"
msgid "Outdoor seating"
msgstr "Lugares ao ar livre"
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Lanchonete"
@@ -20862,25 +21009,6 @@ msgstr "relógio de sol"
msgid "unorthodox"
msgstr "heterodoxo"
-msgid "Support"
-msgstr "Suporte"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "pólo"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "wall_mounted"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "letreiro"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "acampar"
-
msgid "Visibility/readability"
msgstr "Visibilidade/legibilidade"
@@ -21085,7 +21213,7 @@ msgid "suction"
msgstr "sucção"
msgid "Count"
-msgstr "Contaer"
+msgstr "Quantidade"
msgid "Compressed Air"
msgstr ""
@@ -21460,6 +21588,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -21658,32 +21794,6 @@ msgstr "vinho"
msgid "Bunker Silo"
msgstr "Bunker Silo"
-msgid "Pipeline"
-msgstr "Duto"
-
-msgid "water"
-msgstr "água"
-
-msgid "gas"
-msgstr "gás"
-
-msgid "heat"
-msgstr "calor"
-
-msgid "oil"
-msgstr "petróleo"
-
-msgid "sewage"
-msgstr "esgoto"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "subaquático"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "sobre o solo"
-
msgid "Crane"
msgstr "Guindaste"
@@ -21768,6 +21878,23 @@ msgstr "Galeria de Acesso"
msgid "Length in meters"
msgstr "Comprimento em metros"
+msgid "Pipeline"
+msgstr "Duto"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "subaquático"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "sobre o solo"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Torre de Água"
@@ -22008,6 +22135,34 @@ msgstr "pivot_pier"
msgid "Bridge outline"
msgstr "Bridge outline"
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "Usina"
@@ -23175,6 +23330,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Geografia"
@@ -23379,7 +23625,7 @@ msgid "Wood"
msgstr "Floresta"
msgid "Woodland where timber production does not dominate use."
-msgstr "Woodland, onde a produção de madeira não é o uso dominante."
+msgstr "Floresta onde a produção de madeira não é o uso dominante."
msgid "Forest"
msgstr "Floresta"
@@ -23530,6 +23776,29 @@ msgstr "Fazenda"
msgid "Farmland"
msgstr "Terra agrícola"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Prados"
@@ -24156,7 +24425,7 @@ msgid "anything related to the street"
msgstr "qualquer coisa relacionada à rua"
msgid "Destination Sign"
-msgstr "Sinal do destino"
+msgstr "Sinal de Destino"
msgid "Destination written on sign (w/o distance)"
msgstr "Destino escrito em placa (w/o distância)"
@@ -24443,7 +24712,7 @@ msgid "Overlapping Identical Natural Areas"
msgstr "Sobreposição de áreas naturais idênticas"
msgid "Overlapping Identical Landuses"
-msgstr "Sobrepoição de Landuses idênticos"
+msgstr "Sobreposição de landuses idênticos"
msgid "{0} must be connected to a way"
msgstr "{0} precisa estar conectado à uma via"
@@ -24536,6 +24805,9 @@ msgstr "{0} precisa ser um valor numérico"
msgid "{0} must be a positive integer number"
msgstr "{0} deve ser um número inteiro positivo"
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr "relações sem tipo"
@@ -24585,7 +24857,7 @@ msgid "Hide icons at low zoom"
msgstr "Ocultar ícones ao apróximar zoom"
msgid "Less obtrusive node symbols at low zoom"
-msgstr "Símbolos de nós menos intrusivos em apliações"
+msgstr "Símbolos de nós menos intrusivos em zoom baixo"
msgid "Display street labels (at high zoom)"
msgstr "Exibir rótulos de rua (com zoom alto)"
@@ -24593,6 +24865,12 @@ msgstr "Exibir rótulos de rua (com zoom alto)"
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Arquivos CSV Columbus V-900"
@@ -26779,7 +27057,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -26822,9 +27103,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27065,7 +27346,7 @@ msgid "refresh the port list"
msgstr "atualizar a lista de portas"
msgid "Configure Device"
-msgstr "Configurar o Aparelho"
+msgstr "Configurar Dispositivo"
msgid "Connection Error."
msgstr "Erro de conexão."
@@ -29578,6 +29859,9 @@ msgstr "Imagens sem tags"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Você quer salvar a calibração atual da camada {0}"
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "Carregar Calibração de Cor..."
@@ -29587,6 +29871,9 @@ msgstr "Carregando dados de calibração de um arquivo"
msgid "Loading file failed: {0}"
msgstr "Carregamento do arquivo falhou: {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr "Carregar Arquivo de Calibragem do Mundo..."
@@ -29630,6 +29917,9 @@ msgstr ""
"Utilize {0} para fazer upload de seus KMLs que foram calibrados de forma "
"incorreta."
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "Mover PicLayer"
@@ -29746,8 +30036,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "Você deseja aplicar?"
-msgid "Load calibration file ?"
-msgstr "Carregar arquivo de calibração ?"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr "Irá ser aplicado automaticamente."
@@ -29988,9 +30278,6 @@ msgstr "Estado"
msgid "pending"
msgstr "pendente"
-msgid "outside"
-msgstr "do lado de fora"
-
msgid "[incomplete]"
msgstr "[incompleto]"
diff --git a/i18n/po/rm.po b/i18n/po/rm.po
index 88366cc..519dc87 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2009-06-21 19:14+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Raeto-Romance <rm at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n !=1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:55+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:55+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,10 +3171,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/ro.po b/i18n/po/ro.po
index 04cb158..ac51b81 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-02-24 11:34+0000\n"
"Last-Translator: Ciprian <c1pr1an_43v3r at yahoo.com>\n"
"Language-Team: Romanian <gnomero-list at lists.sourceforge.net>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
"== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:55+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:55+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"X-Poedit-Country: ROMANIA\n"
"Language: ro\n"
"X-Poedit-Language: Romanian\n"
@@ -179,6 +179,12 @@ msgstr "Extensii"
msgid "About JOSM..."
msgstr "Despre JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2185,13 +2191,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2205,6 +2207,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2399,6 +2410,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2417,9 +2431,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3216,12 +3227,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "NECUNOSCUT"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4815,6 +4826,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4987,7 +5005,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5791,20 +5809,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7036,14 +7049,17 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr "<diferit>"
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
-msgstr "<diferit>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -12006,6 +12022,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12168,6 +12187,9 @@ msgstr "Descarc punctele {0} până la {1}..."
msgid "Contacting OSM Server..."
msgstr "Se contactează Serverul OSM..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -14004,6 +14026,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14610,6 +14636,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14637,7 +14666,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15213,6 +15245,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15358,6 +15393,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15396,6 +15436,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15829,9 +15874,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15899,6 +15956,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15993,6 +16053,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16533,6 +16596,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16554,12 +16620,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16661,6 +16803,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17200,12 +17345,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17323,6 +17471,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17727,6 +17881,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18365,12 +18528,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18554,6 +18711,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19216,25 +19376,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19814,6 +19955,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -20012,32 +20161,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20122,6 +20245,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20362,6 +20502,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21527,6 +21695,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21866,6 +22125,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22849,6 +23131,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22904,6 +23189,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24878,7 +25169,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24921,9 +25215,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27508,6 +27802,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27517,6 +27814,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27556,6 +27856,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27669,7 +27972,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27906,9 +28209,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/ru.po b/i18n/po/ru.po
index ef8d5f0..ab3210b 100644
--- a/i18n/po/ru.po
+++ b/i18n/po/ru.po
@@ -7,17 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-28 06:14+0000\n"
-"Last-Translator: Nkolay Parukhin <parukhin at gmail.com>\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-23 17:07+0000\n"
+"Last-Translator: Aleksey Kabanov <Unknown>\n"
"Language-Team: Koptev Oleg <koptev.oleg at gmail.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:55+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:55+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: ru_RU\n"
msgid "Note"
@@ -186,6 +186,12 @@ msgstr "Модули"
msgid "About JOSM..."
msgstr "О программе JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr "Не удалось найти ресурс ''{0}''."
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Сбой загрузки ресурса ''{0}'', ошибка {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2356,14 +2362,12 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Выделять, перемещать, масштабировать и вращать объекты"
-msgid "Move elements"
-msgstr "Переместить элементы?"
-
-msgid "Move them"
-msgstr "Переместить"
-
-msgid "Undo move"
-msgstr "Отмена перемещения"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
+"Вы уверены, что хотите переместить элементы с присоединёнными линиями, "
+"которые скрыты фильтрами?"
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2386,6 +2390,15 @@ msgstr[2] ""
"элементов часто происходит по ошибке.\n"
"Действительно переместить их?"
+msgid "Move elements"
+msgstr "Переместить элементы?"
+
+msgid "Move them"
+msgstr "Переместить"
+
+msgid "Undo move"
+msgstr "Отмена перемещения"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике."
@@ -2596,6 +2609,9 @@ msgstr "MapCSS-селектор"
msgid "add toolbar button"
msgstr "добавить кнопку на панель инструментов"
+msgid "Invalid search expression"
+msgstr "Неверное выражение для поиска"
+
msgid "Filter"
msgstr "Фильтр"
@@ -2617,9 +2633,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Неверное выражение для поиска"
-
msgid "basic examples"
msgstr "простые примеры"
@@ -3521,12 +3534,12 @@ msgstr "Английская система мер"
msgid "Nautical Mile"
msgstr "Морская миля"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Сбой загрузки ресурса ''{0}'', ошибка {1}."
-
msgid "UNKNOWN"
msgstr "НЕИЗВЕСТНО"
+msgid "Error reading revision info from revision file: {0}"
+msgstr "Ошибка чтения информации о ревизии из файла ревизий: {0}"
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
"Непредвиденный номер версии JOSM в файле ревизий, значение равно ''{0}''"
@@ -5226,6 +5239,15 @@ msgstr "Справка"
msgid "Menu: {0}"
msgstr "Меню: {0}"
+msgid "Main toolbar"
+msgstr "Основная панель инструментов"
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+"Переключает видимость основной панели инструментов (т.е. горизонтальной "
+"панели)"
+
msgid "Edit toolbar"
msgstr "Панель инструментов редактирования"
@@ -5404,13 +5426,13 @@ msgstr "до квадрата"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Также можно ввести <strong>адрес квадрата</strong> для одного квадрата "
-"в формате <i>zoomlevel/x/y</i>, например <i>15/256/223</i>. Адреса квадратов "
-"в формате <i>zoom,x,y</i> или <i>zoom;x;y</i> также верны.</html>"
+"<html>Или можно ввести <strong>адрес</strong> для отдельного квадрата в "
+"формате <i>zoomlevel/x/y</i>, например, <i>15/256/223</i>. Адреса квадратов "
+"в формате <i>zoom,x,y</i> or <i>zoom;x;y</i> также допустимы.</html>"
msgid "Tile address:"
msgstr "Адрес квадрата:"
@@ -6313,26 +6335,17 @@ msgstr "Уладить конфликты"
msgid "Resolve conflicts for ''{0}''"
msgstr "Уладить конфликты для ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Пожалуйста, подтвердите удаление <strong>1 объекта</strong> из "
-"<strong>1 отношения</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] "Подтвердите удаление <strong>{0} объекта</strong>."
+msgstr[1] "Подтвердите удаление <strong>{0} объектов</strong>."
+msgstr[2] "Подтвердите удаление <strong>{0} объектов</strong>."
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Пожалуйста, подтвердите удаление <strong>1 объекта</strong> из "
-"<strong>{0} отношений</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Пожалуйста, подтвердите удаление <strong>{0} объектов</strong> из "
-"<strong>{1} отношений</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] "изменения затронут {0} отношение."
+msgstr[1] "изменения затронут {0} отношения."
+msgstr[2] "изменения затронут {0} отношений."
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7666,14 +7679,17 @@ msgstr "Теги/Участие"
msgid "Tags for selected objects."
msgstr "Теги для выделенных объектов."
+msgid "<different>"
+msgstr "<различные>"
+
msgid "Member Of"
msgstr "Участник"
msgid "Position"
msgstr "Расположение"
-msgid "<different>"
-msgstr "<различные>"
+msgid "Tag filter"
+msgstr "Фильтр тегов"
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Объекты: {2} / Теги: {0} / Участие: {1}"
@@ -13265,6 +13281,9 @@ msgstr ""
"Испорченная заготовка тегов \"{0}-{1}\" - количество элементов в "
"''display_values'' должно быть такое же, как и в ''values''"
+msgid "Detailed information: {0} <> {1}"
+msgstr "Подробная информация: {0} <> {1}"
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13452,6 +13471,9 @@ msgstr "Скачивание точек с {0} до {1}..."
msgid "Contacting OSM Server..."
msgstr "Подключение к серверу OSM..."
+msgid "Downloading notes"
+msgstr "Скачивание заметок"
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Невозможно открыть входящий поток для ресурса ''{0}''"
@@ -15662,6 +15684,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "кустарник"
+msgctxt "natural"
+msgid "wood"
+msgstr "лес"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "Улица"
@@ -16269,6 +16295,9 @@ msgstr "Снимки с дрона (Гаити)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Снимки с дрона 2014 (Гаити)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ирландия, British War Office 1:25000 GSGS 3906"
@@ -16296,8 +16325,11 @@ msgstr "OSMIE: общины"
msgid "OSMIE Baronies"
msgstr "OSMIE: баронства"
-msgid "OSMIE Political"
-msgstr "Ирландская политическая карта"
+msgid "OSMIE Local Election Areas"
+msgstr "OSMIE - местные избирательные округа"
+
+msgid "OSMIE Dail Election Areas"
+msgstr "OSMIE - избирательные округа Палаты представителей (Дойл Эрен)"
msgid "Lodi - Italy"
msgstr "Лоди - Италия"
@@ -16675,7 +16707,7 @@ msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-дюймовая карта Шотландии 1842-82"
msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
+msgstr "NLS - OS 6-дюймовая County Series 1888-1913"
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25000 1-й выпуск 1937-61"
@@ -16684,7 +16716,7 @@ msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr "NLS - OS 1-дюймовая 7-й выпуск 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
-msgstr ""
+msgstr "NLS - OS 25-дюймовая (Шотландия) 1892-1905"
msgid "OS 1:25k historic (OSM-Best)"
msgstr "OS 1:25000 историческая (OSM-Best)"
@@ -16872,6 +16904,9 @@ msgstr "OS Town Plans, Нэрн 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "OS Town Plans, Обан 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr "OS Town Plans, Пейсли1858 (NLS)"
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "OS Town Plans, Пибл 1856 (NLS)"
@@ -17008,7 +17043,7 @@ msgstr ""
"(Внимание: экспериментальный!) Инструмент для объединения (слияния) данных."
msgid "Downloads new data when you pan/zoom"
-msgstr ""
+msgstr "Подкачивает новые данные при панорамировании или изменении масштаба"
msgid "Create a grid of ways."
msgstr "Создаёт сетку из линий."
@@ -17045,6 +17080,14 @@ msgstr ""
"Позволяет пользователю делать анонимными временные метки и удалять части "
"больших GPX треков"
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Предоставляет библиотеку EJML для других модулей JOSM. Предназначен не для "
+"непосредственной установки пользователем, а как зависимость для других "
+"модулей."
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
"Показывает профиль высот и некоторые статистические данные трека GPX."
@@ -17091,6 +17134,14 @@ msgstr "Фильтрация ненужных GPS треков"
msgid "Visualizes routing information as a routing graph."
msgstr "Визуализирует информацию о маршрутизации в виде графа."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Предоставляет библиотеку GSON для других модулей JOSM. Предназначен не для "
+"непосредственной установки пользователями, а как зависимость для других "
+"модулей."
+
msgid "Simple tool to tag house numbers."
msgstr "Простой инструмент для нумерации домов"
@@ -17611,9 +17662,21 @@ msgstr "грязь"
msgid "Lanes"
msgstr "Кол-во полос"
+msgid "Lanes in way direction"
+msgstr "Кол-во полос в направлении линии"
+
+msgid "Lanes opposed to way direction"
+msgstr "Кол-во полос против направления линии"
+
msgid "Max. speed (km/h)"
msgstr "Макс. скорость (км/ч)"
+msgid "Max. speed in way direction"
+msgstr "Макс. скорость в направлении линии"
+
+msgid "Max. speed opposed to way direction"
+msgstr "Макс. скорость против направления линии"
+
msgid "Bridge"
msgstr "Мост"
@@ -17681,6 +17744,9 @@ msgstr "боковой путь"
msgid "spur"
msgstr "ответвление"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Электрифицированная"
@@ -17775,6 +17841,9 @@ msgstr "разделённый"
msgid "isolated"
msgstr "изолированный"
+msgid "outside"
+msgstr "снаружи"
+
msgid "Height (meters)"
msgstr "Высота (в метрах)"
@@ -18319,6 +18388,9 @@ msgstr "Платная"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "Пересыхающий водоём (исчезает в жаркий сезон)?"
+msgid "In the tidal range"
+msgstr "В зоне прилива"
+
msgid "culvert"
msgstr "водопропускная труба"
@@ -18340,12 +18412,88 @@ msgstr "Моторные лодки"
msgid "Canoe"
msgstr "Каноэ"
+msgid "Substance"
+msgstr "Вещество"
+
+msgid "water"
+msgstr "вода"
+
+msgid "gas"
+msgstr "газ"
+
+msgid "heat"
+msgstr "теплотрасса"
+
+msgid "oil"
+msgstr "нефть"
+
+msgid "sewage"
+msgstr "канализация"
+
+msgid "Support"
+msgstr "Крепление"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "на столбе"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "на стене"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "на рекламном щите"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "наземные"
+
+msgid "IATA"
+msgstr "Код ИАТА"
+
+msgid "ICAO"
+msgstr "Код ИКАО"
+
msgid "Streets"
msgstr "Улицы"
msgid "Motorway"
msgstr "Автомагистраль"
+msgid "Placement"
+msgstr "Расположение"
+
+msgid "left_of:1"
+msgstr "по левому краю:1"
+
+msgid "left_of:2"
+msgstr "по левому краю:2"
+
+msgid "left_of:3"
+msgstr "по левому краю:3"
+
+msgid "middle_of:1"
+msgstr "по центру:1"
+
+msgid "middle_of:2"
+msgstr "по центру:2"
+
+msgid "middle_of:3"
+msgstr "по центру:3"
+
+msgid "right_of:1"
+msgstr "по правому краю:1"
+
+msgid "right_of:2"
+msgstr "по правому краю:2"
+
+msgid "right_of:3"
+msgstr "по правому краю:3"
+
+msgid "transition"
+msgstr "переходное"
+
msgid "Motorway Link"
msgstr "Съезд с автомагистрали"
@@ -18447,6 +18595,9 @@ msgstr "парковочный проезд"
msgid "drive-through"
msgstr "обслуживание в авто"
+msgid "emergency_access"
+msgstr "аварийный подъезд"
+
msgid "Parking Aisle"
msgstr "Проезд на парковке"
@@ -19003,12 +19154,15 @@ msgstr "Разворотный круг"
msgid "Turning Loop"
msgstr "Разворотная петля"
-msgid "City Limit"
-msgstr "Граница населённого пункта"
+msgid "City Limit Sign"
+msgstr "Знак границ населенного пункта"
msgid "Second Name"
msgstr "Второе название"
+msgid "Speed Limit Sign"
+msgstr "Знак ограничения скорости"
+
msgid "Speed Camera"
msgstr "Камера-скоростемер"
@@ -19128,6 +19282,12 @@ msgstr "Дорожное ограждение"
msgid "Wall"
msgstr "Стена"
+msgid "dry_stone"
+msgstr "сухая кладка"
+
+msgid "noise_barrier"
+msgstr "шумозащитный экран"
+
msgid "City Wall"
msgstr "Городская стена"
@@ -19537,6 +19697,15 @@ msgstr "природный газ"
msgid "Pier"
msgstr "Пирс"
+msgid "Mooring"
+msgstr "Швартовка"
+
+msgid "commercial"
+msgstr "коммерческая"
+
+msgid "Floating"
+msgstr "Плавучий"
+
msgid "Lock Gate"
msgstr "Ворота шлюза"
@@ -20179,12 +20348,6 @@ msgstr "Аэропорт"
msgid "Airport Ground"
msgstr "Территория аэропорта"
-msgid "IATA"
-msgstr "Код ИАТА"
-
-msgid "ICAO"
-msgstr "Код ИКАО"
-
msgid "Runway"
msgstr "Взлётно-посадочная полоса"
@@ -20368,6 +20531,9 @@ msgstr "Пивоварня"
msgid "Outdoor seating"
msgstr "Столики на улице"
+msgid "Takeaway"
+msgstr "Блюда на вынос"
+
msgid "Fast Food"
msgstr "Ресторан быстрого питания"
@@ -21030,25 +21196,6 @@ msgstr "солнечные часы"
msgid "unorthodox"
msgstr "нестандартный"
-msgid "Support"
-msgstr "Крепление"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "на столбе"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "на стене"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "на рекламном щите"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "наземные"
-
msgid "Visibility/readability"
msgstr "Контрастность/четкость"
@@ -21628,6 +21775,14 @@ msgid "barn"
msgstr "амбар"
msgctxt "building"
+msgid "stable"
+msgstr "конюшня"
+
+msgctxt "building"
+msgid "cabin"
+msgstr "хижина"
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "нежилое здание фермы"
@@ -21826,32 +21981,6 @@ msgstr "вино"
msgid "Bunker Silo"
msgstr "Силосная яма"
-msgid "Pipeline"
-msgstr "Трубопровод"
-
-msgid "water"
-msgstr "вода"
-
-msgid "gas"
-msgstr "газ"
-
-msgid "heat"
-msgstr "теплотрасса"
-
-msgid "oil"
-msgstr "нефть"
-
-msgid "sewage"
-msgstr "канализация"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "подводный"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "наземный"
-
msgid "Crane"
msgstr "Кран"
@@ -21936,6 +22065,23 @@ msgstr "Штольня"
msgid "Length in meters"
msgstr "Длина в метрах"
+msgid "Pipeline"
+msgstr "Трубопровод"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "подводный"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "наземный"
+
+msgid "Pipeline Marker"
+msgstr "Указатель трубопровода"
+
+msgid "Pipeline Valve"
+msgstr "Задвижка трубопровода"
+
msgid "Water Tower"
msgstr "Водонапорная башня"
@@ -22176,6 +22322,34 @@ msgstr "опора разводного пролёта"
msgid "Bridge outline"
msgstr "Контур моста"
+msgctxt "preset group"
+msgid "Military"
+msgstr "Военные объекты"
+
+msgid "Airfield"
+msgstr "Аэродром"
+
+msgid "Barracks"
+msgstr "Казармы"
+
+msgid "Bunker"
+msgstr "Укрытие"
+
+msgid "pillbox"
+msgstr "блиндаж"
+
+msgid "munitions"
+msgstr "военное имущество"
+
+msgid "hardened_aircraft_shelter"
+msgstr "укреплённый ангар"
+
+msgid "Historic"
+msgstr "Имеет историческое значение"
+
+msgid "Range"
+msgstr "Полигон"
+
msgid "Power Plant"
msgstr "Электростанция"
@@ -23343,6 +23517,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr "Офисы"
+
+msgctxt "office"
+msgid "Accountant"
+msgstr "Бухгалтерский"
+
+msgctxt "office"
+msgid "Administrative"
+msgstr "Административный"
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr "Рекламное агентство"
+
+msgctxt "office"
+msgid "Architect"
+msgstr "Архитектурный"
+
+msgctxt "office"
+msgid "Association"
+msgstr "Некоммерческая организация"
+
+msgctxt "office"
+msgid "Private company"
+msgstr "Частная компания"
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr "Учебное заведение"
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr "Бюро по трудоустройству"
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr "Агентство недвижимости"
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr "Государственное учреждение"
+
+msgctxt "office"
+msgid "Insurance"
+msgstr "Страховая компания"
+
+msgctxt "office"
+msgid "It specialist"
+msgstr "Информационные технологии"
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr "Юридические услуги"
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr "Редакция газеты или журнала"
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr "Общественная организация"
+
+msgctxt "office"
+msgid "Notary"
+msgstr "Нотариус"
+
+msgctxt "office"
+msgid "Political party"
+msgstr "Политическая партия"
+
+msgctxt "office"
+msgid "Religion"
+msgstr "Религиозная организация"
+
+msgctxt "office"
+msgid "Research"
+msgstr "Научно-исследовательская организация"
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr "Налоговый консультант"
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr "Телекоммуникационная компания"
+
msgid "Geography"
msgstr "География"
@@ -23697,6 +23962,29 @@ msgstr "Двор фермы"
msgid "Farmland"
msgstr "Сельскохозяйственные угодья"
+msgid "Crop"
+msgstr "Урожай"
+
+msgctxt "crop"
+msgid "corn"
+msgstr "кукуруза"
+
+msgctxt "crop"
+msgid "grass"
+msgstr "трава"
+
+msgctxt "crop"
+msgid "rice"
+msgstr "рис"
+
+msgctxt "crop"
+msgid "wheat"
+msgstr "пшеница"
+
+msgctxt "crop"
+msgid "hop"
+msgstr "хмель"
+
msgid "Meadow"
msgstr "Сенокосный луг"
@@ -24707,6 +24995,9 @@ msgstr "{0} должно быть числовым значением"
msgid "{0} must be a positive integer number"
msgstr "{0} должен быть положительным целым числом"
+msgid "unusual value of {0}"
+msgstr "необычное значение {0}"
+
msgid "relation without type"
msgstr "отношение без типа"
@@ -24764,6 +25055,12 @@ msgstr "Показывать названия улиц (при крупных
msgid "Use alternative turn restriction icon set"
msgstr "Использовать альтернативный набор значков для запретов поворотов"
+msgid "Display fill colour of areas with place=*"
+msgstr "Показывать цвет заливки областей с place=*"
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr "Отображать заливку областей только вдоль их внутренних краёв"
+
msgid "Columbus V-900 CSV Files"
msgstr "Файлы Columbus V-900 CSV"
@@ -26929,38 +27226,47 @@ msgid "Invalid reference or subject"
msgstr "Неверный объект справочного или целевого слоя"
msgid "Download OSM data continuously"
-msgstr ""
+msgstr "Скачивать данные OSM постоянно"
msgid "Download map data continuously when paning and zooming."
msgstr ""
+"Постоянно скачивать данные карты при панорамировании и изменении масштаба."
msgid "Toggle the continuous download on/off"
-msgstr ""
+msgstr "Включить/отключить постоянное скачивание"
msgid "Download Settings"
-msgstr ""
+msgstr "Параметры загрузки"
msgid "Settings for the continuous download."
-msgstr ""
+msgstr "Настройки постоянного скачивания."
msgid "Activate continuous downloads at startup."
-msgstr ""
+msgstr "Активировать постоянное скачивание при запуске."
msgid "Supress the default modal progress monitor when downloading."
msgstr ""
+"Не показывать стандартный модальный индикатор прогресса при скачивании."
msgid ""
"If this plugin is active at startup. This default state will not change when "
"you are toggeling the plugin with the menu option."
msgstr ""
+"Активировать ли этот модуль при запуске JOSM. Это состояние по умолчанию не "
+"будет изменяться при переключении модуля через пункт меню."
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
msgstr ""
+"Максимальное количество потоков для скачивания. При увеличении клиент будет "
+"отправлять больше одновременных запросов к серверу."
+
+msgid "Requires restart"
+msgstr "Требует перезапуска"
msgid "Max threads"
-msgstr ""
+msgstr "Макс. число потоков"
msgid "Maximum number of boxes to download for each pan/zoom."
msgstr ""
@@ -26972,37 +27278,47 @@ msgid ""
"Time in milliseconds after a pan/zoom before it starts downloading. "
"Additional changes in the viewport in the waiting time will reset the timer."
msgstr ""
+"Время (в миллисекундах) до начала скачивания после панорамирования или "
+"изменения масштаба. Дополнительные изменения в области просмотра во время "
+"ожидания будут сбрасывать таймер."
msgid "Wait time (milliseconds)"
-msgstr ""
+msgstr "Время ожидания (в миллисекундах)"
msgid ""
"How much extra area around the viewport is it going to download. Setting "
"this to 0 will not download any extra data."
msgstr ""
+"Насколько большую дополнительную область скачивать вокруг видимой. При "
+"установке значения 0 дополнительные данные загружены не будут."
msgid "Extra download area"
-msgstr ""
+msgstr "Дополнительная область скачивания"
msgid ""
"Max area to download in degrees^2. Increasing this number will cause the "
"plugin to download areas when you are zoomed far out."
msgstr ""
+"Максимальная область загрузки в кв. градусах. Увеличение этого числа "
+"приведёт к загрузке модулем областей при большом отдалении."
msgid "Max download area"
-msgstr ""
+msgstr "Максимальная область скачивания"
msgid "The strategy for finding what areas to request from the server."
-msgstr ""
+msgstr "Стратегия поиска запрашиваемых с сервера областей"
msgid "Download strategy"
-msgstr ""
+msgstr "Стратегия скачивания"
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
+"Подавить показ индикатора прогресса при скачивании. Если включено, то не "
+"будет никакой индикации о том, что выполняются какие-либо действия, и "
+"никакого способа отменить скачивание."
msgid "Address"
msgstr "Адрес"
@@ -28532,7 +28848,7 @@ msgid "Open Mapillary filter dialog"
msgstr "Открыть диалог фильтра Mapillary"
msgid "Not older than: "
-msgstr ""
+msgstr "Не старее: "
msgid "Downloaded images"
msgstr "Скачанные снимки"
@@ -29757,6 +30073,9 @@ msgstr "Не отмеченные изображения"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Вы хотите сохранить калибровку слоя {0}?"
+msgid "Select an option"
+msgstr "Выберите один из вариантов"
+
msgid "Load Picture Calibration..."
msgstr "Загрузить калибровку изображения..."
@@ -29766,6 +30085,9 @@ msgstr "Загрузить калибровочные данные из файл
msgid "Loading file failed: {0}"
msgstr "Загрузка файла не удалась: {0}"
+msgid "Problem occurred"
+msgstr "Возникла проблема"
+
msgid "Load World File Calibration..."
msgstr "Загрузить калибровочные данные из world-файла..."
@@ -29809,6 +30131,9 @@ msgstr ""
"Используйте {0}, чтобы загрузить свои KML, которые были привязаны "
"неправильно."
+msgid "Notification"
+msgstr "Уведомление"
+
msgid "PicLayer move"
msgstr "Передвижение PicLayer"
@@ -29925,7 +30250,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "Хотите применить?"
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr "Загрузить калибровочный файл?"
msgid "It will be applied automatically."
@@ -30165,9 +30490,6 @@ msgstr "Штат"
msgid "pending"
msgstr "в ожидании"
-msgid "outside"
-msgstr "снаружи"
-
msgid "[incomplete]"
msgstr "[неполный]"
diff --git a/i18n/po/sk.po b/i18n/po/sk.po
index af67823..28ae595 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-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-18 12:57+0000\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-23 18:23+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-10-30 04:57+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:57+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: sk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -176,6 +176,12 @@ msgstr "Pluginy"
msgid "About JOSM..."
msgstr "O programe JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr "Nepodarilo sa nájsť zdroj \"{0}\"."
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Neúspešné nahratie zdroja ''{0}'', chyba je {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2328,14 +2334,12 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Vybrať, presúvať, mierka a otočenie objektov"
-msgid "Move elements"
-msgstr "Posunúť elementy"
-
-msgid "Move them"
-msgstr "Posunúť ich"
-
-msgid "Undo move"
-msgstr "Odvolať posun"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
+"Naozaj chcete presunúť objekty s pripojenými cestami, ktoré sú skryté "
+"filtrom?"
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2355,6 +2359,15 @@ msgstr[2] ""
"Presúvate viac než {0} prvky. Presúvanie viacerých prvkov je často chyba.\n"
"Skutočne ich chcete presunúť?"
+msgid "Move elements"
+msgstr "Posunúť elementy"
+
+msgid "Move them"
+msgstr "Posunúť ich"
+
+msgid "Undo move"
+msgstr "Odvolať posun"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Pustite tlačítko myši pre vybratie objektov v obdĺžniku."
@@ -2560,6 +2573,9 @@ msgstr "Identifikátor MapCSS"
msgid "add toolbar button"
msgstr "pridať tlačidlo na panel nástrojov"
+msgid "Invalid search expression"
+msgstr "Chybný vyhľadávaný výraz"
+
msgid "Filter"
msgstr "Filter"
@@ -2581,9 +2597,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Chybný vyhľadávaný výraz"
-
msgid "basic examples"
msgstr "základné príklady"
@@ -3477,12 +3490,12 @@ msgstr "Britský"
msgid "Nautical Mile"
msgstr "Námorné Míle"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Neúspešné nahratie zdroja ''{0}'', chyba je {1}."
-
msgid "UNKNOWN"
msgstr "NEZNÁMA"
+msgid "Error reading revision info from revision file: {0}"
+msgstr "Nepodarilo sa prečítať informácia o verzii zo súboru: {0}"
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr "Neočakávaná verzia JOSM v súbore revízií, hodnota je \"{0}\""
@@ -5179,6 +5192,13 @@ msgstr "Pomocník"
msgid "Menu: {0}"
msgstr "Menu: {0}"
+msgid "Main toolbar"
+msgstr "Hlavný panel nástrojov"
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr "Prepína viditeľnosť hlavného panela nástrojov (vodorovný panel)"
+
msgid "Edit toolbar"
msgstr "Editačná nástrojová lišta"
@@ -5355,14 +5375,14 @@ msgstr "až do dlaždice"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Alternatívne môžete zadať <strong>adresu dlaždice</strong> pre jednu "
-"dlaždicu vo formáte<i>úroveň priblíženia/x/y</i>, napr. <i>15/256/223</i>. "
-"Adresy dlaždíc vo formáte <i>priblíženie,x,y</i> alebo "
-"<i>priblíženie;x;y</i> sú tiež platné.</html>"
+"<html>Namiesto toho môžete zadať <strong>adresu dlaždice</strong> pre "
+"konktrétnu dlaždicu vo formáte <i>priblíženie/x/y</i>, napr. "
+"<i>15/256/223</i>. Adresy dlaždíc vo formáte <i>priblíženie,x,y</i> alebo "
+"<i>priblíženie;x;y</i> sú tiež použiteľné.</html>"
msgid "Tile address:"
msgstr "Adresa dlaždice:"
@@ -6263,26 +6283,17 @@ msgstr "Rozhodnutie konfliktov"
msgid "Resolve conflicts for ''{0}''"
msgstr "Rozhodnúť konflikt pre ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Prosím potvrdiť odstránenie <strong>1 objekt</strong> z <strong>1 "
-"relácie</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Prosím potvrdiť odstránenie <strong>1 objekt</strong> z <strong>{0} "
-"relácií</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] "Prosím potvrďte odstránenie <strong>{0} objektov</strong>."
+msgstr[1] "Prosím potvrďte odstránenie <strong>{0} objektu</strong>."
+msgstr[2] "Prosím potvrďte odstránenie <strong>{0} objektov</strong>."
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Prosím potvrdiť odstránenie <strong>{0} objektov</strong> z "
-"<strong>{1} relácií</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] "Ovplyvní to {0} relácií."
+msgstr[1] "Ovplyvní to {0} reláciu."
+msgstr[2] "Ovplyvní to {0} relácie."
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7621,14 +7632,17 @@ msgstr "Značky/Členstvá"
msgid "Tags for selected objects."
msgstr "Značky pre zvolené objekty."
+msgid "<different>"
+msgstr "<rôzne>"
+
msgid "Member Of"
msgstr "Člen"
msgid "Position"
msgstr "Poloha"
-msgid "<different>"
-msgstr "<rôzne>"
+msgid "Tag filter"
+msgstr "Filter značiek"
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Objekty: {2} / Značky: {0} / Členstvá: {1}"
@@ -13185,6 +13199,9 @@ msgstr ""
"Poškodené prednastavenie tagovania \"{0}-{1}\" - počet položiek v "
"''display_values'' musí byť rovnaký ako vo ''values''"
+msgid "Detailed information: {0} <> {1}"
+msgstr "Podrobné informácie: {0} <> {1}"
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13371,6 +13388,9 @@ msgstr "Sťahujem body {0} až {1}..."
msgid "Contacting OSM Server..."
msgstr "Pripája sa na OSM Server..."
+msgid "Downloading notes"
+msgstr "Sťahovanie poznámok"
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Nepodarilo sa otvoriť vstupný tok pre zdroj ''{0}''"
@@ -15593,6 +15613,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "krovie"
+msgctxt "natural"
+msgid "wood"
+msgstr "les"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "associatedStreet (pridružená ulica)"
@@ -16203,6 +16227,9 @@ msgstr "Snímky automatických lietadiel (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Fotografie z bezpilotných lietadiel 2014 (Haiti)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16230,8 +16257,11 @@ msgstr "OSMIE Civil Parishes"
msgid "OSMIE Baronies"
msgstr "OSMIE Baronies"
-msgid "OSMIE Political"
-msgstr "OSMIE Politická"
+msgid "OSMIE Local Election Areas"
+msgstr "OSMIE Local Election Areas"
+
+msgid "OSMIE Dail Election Areas"
+msgstr "OSMIE Dail Election Areas"
msgid "Lodi - Italy"
msgstr "Lodi - Taliansko"
@@ -16609,7 +16639,7 @@ msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Škótsko 1842-82"
msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
+msgstr "NLS - OS 6-inch County Series 1888-1913"
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -16618,7 +16648,7 @@ msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
-msgstr ""
+msgstr "NLS - OS 25-inch (Śkótsko) 1892-1905"
msgid "OS 1:25k historic (OSM-Best)"
msgstr "OS 1:25k historická (OSM-Best)"
@@ -16806,6 +16836,9 @@ msgstr "OS Plány miest, Nairn 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "OS Plány miest, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr "OS Town Plans, Paisley 1858 (NLS)"
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "OS Plány miest, Peebles 1856 (NLS)"
@@ -16881,11 +16914,15 @@ msgid ""
"Provides Apache Commons library components. Not meant to be installed "
"directly by users, but rather as a dependency for other plugins."
msgstr ""
+"Poskytuje komponenty knižníc Apache Commons. Nie je určený na priamu "
+"inštaláciu, ale ako závislosť pre iné pluginy."
msgid ""
"Provides Apache HTTP library. Not meant to be installed directly by users, "
"but rather as a dependency for other plugins."
msgstr ""
+"Poskytuje knižnicu Apache HTTP. Nie je určený na priamu inštaláciu, ale ako "
+"závislosť pre iné pluginy."
msgid ""
"Allows selection of areas in an layer and automatic creation of a way as "
@@ -16938,7 +16975,7 @@ msgid "(Warning: Experimental!) Tool for conflating (merging) data."
msgstr "(Varovanie: Experimentálne!) Nástroj pre spájanie (zlučovanie) dát."
msgid "Downloads new data when you pan/zoom"
-msgstr ""
+msgstr "Sťahuje nové údaje pri posúvaní/približovaní"
msgid "Create a grid of ways."
msgstr "Vytvára sieť ciest."
@@ -16974,6 +17011,13 @@ msgstr ""
"Dovoľuje používateľovi anonymizovať časovú značku a rýchlo zmazať časti z "
"veľkých GPX logov."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Poskytuje knižnicu EJML library pre iné pluginy do JOSM. Nie je určený na "
+"priamu inštaláciu, ale ako závislosť pre iné pluginy."
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr "Zobrazuje výškový profil a niektoré štatistické údaje z GPX stopy."
@@ -17016,6 +17060,13 @@ msgstr "Umožňuje odfiltrovať nepotrebné GPS stopy"
msgid "Visualizes routing information as a routing graph."
msgstr "Vizualizuje graf možností navigovania (routing information)."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Poskytuje knižnicu GSON pre iné JOSM pluginy. Nie je určený na priamu "
+"inštaláciu, ale ako závislosť pre iné pluginy."
+
msgid "Simple tool to tag house numbers."
msgstr "Jednoduchý nástroj na označenie čísla domov."
@@ -17524,9 +17575,21 @@ msgstr "blato (mud)"
msgid "Lanes"
msgstr "Jazdné pruhy"
+msgid "Lanes in way direction"
+msgstr "Počet pruhov v smere cesty"
+
+msgid "Lanes opposed to way direction"
+msgstr "Počet pruhov proti smeru cesty"
+
msgid "Max. speed (km/h)"
msgstr "Max. rýchlosť (km/h)"
+msgid "Max. speed in way direction"
+msgstr "Max. rýchlosť v smere cesty"
+
+msgid "Max. speed opposed to way direction"
+msgstr "Max. rýchlosť proti smeru cesty"
+
msgid "Bridge"
msgstr "Most"
@@ -17594,6 +17657,9 @@ msgstr "vedľajšia odstavná koľaj (napr. na stanici)"
msgid "spur"
msgstr "železničná vlečka (v závode)"
+msgid "crossover"
+msgstr "prepojenie koľají"
+
msgid "Electrified"
msgstr "Elektrifikovaný"
@@ -17688,6 +17754,9 @@ msgstr "oddelený"
msgid "isolated"
msgstr "izolovaný"
+msgid "outside"
+msgstr "vonku"
+
msgid "Height (meters)"
msgstr "Výška (metre)"
@@ -18235,6 +18304,9 @@ msgstr "Mýto (Toll)"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "Je voda občasná (mizne v závislosti od ročného obdobia)?"
+msgid "In the tidal range"
+msgstr "V zóne prílivu"
+
msgid "culvert"
msgstr "priepust"
@@ -18256,12 +18328,88 @@ msgstr "Motorový čln"
msgid "Canoe"
msgstr "Kanoe"
+msgid "Substance"
+msgstr "Látka (materiál)"
+
+msgid "water"
+msgstr "voda"
+
+msgid "gas"
+msgstr "plyn"
+
+msgid "heat"
+msgstr "teplo (heat)"
+
+msgid "oil"
+msgstr "ropa (oil)"
+
+msgid "sewage"
+msgstr "splašky (sewage)"
+
+msgid "Support"
+msgstr "Upevnenie"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "stĺp"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "na stene"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "na bilboarde"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "na zemi"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Hlavné komunikácie"
msgid "Motorway"
msgstr "Diaľnica"
+msgid "Placement"
+msgstr "Umiestnenie"
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Diaľničná prípojka"
@@ -18363,6 +18511,9 @@ msgstr "parkovacia ulička"
msgid "drive-through"
msgstr "prejazd"
+msgid "emergency_access"
+msgstr "núdzový prístup"
+
msgid "Parking Aisle"
msgstr "Parkovacia ulička"
@@ -18920,12 +19071,15 @@ msgstr "Obratisko (zaokrúhlený koniec cesty pre ľahšie otáčanie sa áut)"
msgid "Turning Loop"
msgstr "Obratisko s ostrovčekom"
-msgid "City Limit"
-msgstr "Hranica mesta/obce"
+msgid "City Limit Sign"
+msgstr "Značka začiatku obce"
msgid "Second Name"
msgstr "Druhé meno"
+msgid "Speed Limit Sign"
+msgstr "Značka povolenej rýchlosti"
+
msgid "Speed Camera"
msgstr "Kamera na meranie rýchlosti"
@@ -19047,6 +19201,12 @@ msgstr "Zvodidlá"
msgid "Wall"
msgstr "Múr"
+msgid "dry_stone"
+msgstr "nespojené kamene"
+
+msgid "noise_barrier"
+msgstr "protihluková stena"
+
msgid "City Wall"
msgstr "Mestské hradby"
@@ -19454,6 +19614,15 @@ msgstr "CNG (Stlačený zemný plyn)"
msgid "Pier"
msgstr "Mólo"
+msgid "Mooring"
+msgstr "Kotvenie"
+
+msgid "commercial"
+msgstr "obchodné"
+
+msgid "Floating"
+msgstr "Plávajúce"
+
msgid "Lock Gate"
msgstr "Plavebná komora"
@@ -20094,12 +20263,6 @@ msgstr "Letisko"
msgid "Airport Ground"
msgstr "Územie letiska"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Pristávacia dráha"
@@ -20283,6 +20446,9 @@ msgstr "Minipivovar"
msgid "Outdoor seating"
msgstr "Vonkajšie sedenie"
+msgid "Takeaway"
+msgstr "So sebou"
+
msgid "Fast Food"
msgstr "Rýchle občerstvenie (fast food)"
@@ -20945,25 +21111,6 @@ msgstr "slnečné"
msgid "unorthodox"
msgstr "nezvyčajné"
-msgid "Support"
-msgstr "Upevnenie"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "stĺp"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "na stene"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "na bilboarde"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "na zemi"
-
msgid "Visibility/readability"
msgstr "Viditeľnosť/čitateľnosť"
@@ -21543,6 +21690,14 @@ msgid "barn"
msgstr "stodola"
msgctxt "building"
+msgid "stable"
+msgstr "stajňa"
+
+msgctxt "building"
+msgid "cabin"
+msgstr "zrub"
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "hospodárska budova na farme"
@@ -21741,32 +21896,6 @@ msgstr "víno"
msgid "Bunker Silo"
msgstr "Silážna jama"
-msgid "Pipeline"
-msgstr "Potrubie"
-
-msgid "water"
-msgstr "voda"
-
-msgid "gas"
-msgstr "plyn"
-
-msgid "heat"
-msgstr "teplo (heat)"
-
-msgid "oil"
-msgstr "ropa (oil)"
-
-msgid "sewage"
-msgstr "splašky (sewage)"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "pod hladinou"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "nad zemou"
-
msgid "Crane"
msgstr "Žeriav"
@@ -21851,6 +21980,23 @@ msgstr "Štôlňa"
msgid "Length in meters"
msgstr "Dĺžka v metroch"
+msgid "Pipeline"
+msgstr "Potrubie"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "pod hladinou"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "nad zemou"
+
+msgid "Pipeline Marker"
+msgstr "Značka potrubia"
+
+msgid "Pipeline Valve"
+msgstr "Ventil na potrubí"
+
msgid "Water Tower"
msgstr "Vodojem"
@@ -22091,6 +22237,34 @@ msgstr "mostný čap (pivot_pier)"
msgid "Bridge outline"
msgstr "Obrys mostu"
+msgctxt "preset group"
+msgid "Military"
+msgstr "Vojenské"
+
+msgid "Airfield"
+msgstr "Letisko"
+
+msgid "Barracks"
+msgstr "Kasárne"
+
+msgid "Bunker"
+msgstr "Bunker"
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr "munícia"
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr "Historický"
+
+msgid "Range"
+msgstr "Strelnica"
+
msgid "Power Plant"
msgstr "Elektráreň"
@@ -23258,6 +23432,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr "Kancelárie"
+
+msgctxt "office"
+msgid "Accountant"
+msgstr "Účtovník"
+
+msgctxt "office"
+msgid "Administrative"
+msgstr "Administratíva"
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr "Reklamná agentúra"
+
+msgctxt "office"
+msgid "Architect"
+msgstr "Architekt"
+
+msgctxt "office"
+msgid "Association"
+msgstr "Asociácia"
+
+msgctxt "office"
+msgid "Private company"
+msgstr "Súkromná firma"
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr "Vzdelávacia inštitúcia"
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr "Pracovná agentúra"
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr "Realitná kancelária"
+
+msgctxt "office"
+msgid "Foundation"
+msgstr "Nadácia"
+
+msgctxt "office"
+msgid "Government"
+msgstr "Vládny orgán"
+
+msgctxt "office"
+msgid "Insurance"
+msgstr "Poisťovacia spoločnosť"
+
+msgctxt "office"
+msgid "It specialist"
+msgstr "IT špecialista"
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr "Právnická kancelária"
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr "Tlačové médium"
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr "Mimovládna organizácia"
+
+msgctxt "office"
+msgid "Notary"
+msgstr "Notár"
+
+msgctxt "office"
+msgid "Political party"
+msgstr "Politická strana"
+
+msgctxt "office"
+msgid "Religion"
+msgstr "Náboženské združenie"
+
+msgctxt "office"
+msgid "Research"
+msgstr "Výskumná spoločnosť"
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr "Daňový poradca"
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr "Telekomunikácie"
+
msgid "Geography"
msgstr "Geografia(Zemepis)"
@@ -23609,6 +23874,29 @@ msgstr "Farma"
msgid "Farmland"
msgstr "Poľnohospodárska pôda"
+msgid "Crop"
+msgstr "Plodiny"
+
+msgctxt "crop"
+msgid "corn"
+msgstr "kukurica"
+
+msgctxt "crop"
+msgid "grass"
+msgstr "tráva"
+
+msgctxt "crop"
+msgid "rice"
+msgstr "ryža"
+
+msgctxt "crop"
+msgid "wheat"
+msgstr "pšenica"
+
+msgctxt "crop"
+msgid "hop"
+msgstr "chmeľ"
+
msgid "Meadow"
msgstr "Lúka"
@@ -24616,6 +24904,9 @@ msgstr "{0} musí byť numerická hodnota"
msgid "{0} must be a positive integer number"
msgstr "{0} musí byť kladné celé číslo"
+msgid "unusual value of {0}"
+msgstr "nezvyčajná hodnota {0}"
+
msgid "relation without type"
msgstr "relácia bez \"type\""
@@ -24672,6 +24963,12 @@ 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 "Display fill colour of areas with place=*"
+msgstr "Zobraziť farbu výplne oblastí s place=*"
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr "Oblasti sú vyfarbené len okolo ich vnútorných hrán"
+
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV Súbory"
@@ -26728,7 +27025,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -26771,9 +27071,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -28131,37 +28431,37 @@ msgid "Import pictures into Mapillary layer"
msgstr "Importovať obrázky do vrstvy Mapillary"
msgid "Select pictures"
-msgstr "Zvoliť obrázky"
+msgstr ""
msgid "Import pictures into sequence"
-msgstr ""
+msgstr "Importovať obrázky do postupnosti"
msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
+msgstr "Importovať obrázky do vrstvy Mapillary v postupnosti"
msgid "Join mode"
-msgstr ""
+msgstr "Režim spájania"
msgid "Join/unjoin pictures"
-msgstr ""
+msgstr "Spojiť/oddeliť obrázky"
msgid "Join Mapillary pictures"
-msgstr ""
+msgstr "Spojiť obrázky Mapillary"
msgid "Upload pictures"
-msgstr ""
+msgstr "Odoslať obrázky"
msgid "Upload Mapillary pictures"
-msgstr ""
+msgstr "Odoslať obrázky Mapillary"
msgid "Upload pictures."
-msgstr ""
+msgstr "Odoslať obrázky."
msgid "Walk mode"
-msgstr ""
+msgstr "Režim chôdze"
msgid "Start walk mode"
-msgstr ""
+msgstr "Spustiť režim chôdze"
msgid "Zoom to selected image"
msgstr "Priblížiť na zvolený obrázok"
@@ -28170,22 +28470,22 @@ msgid "Zoom to the currently selected Mapillary image"
msgstr "Priblížiť na zvolený obrázok z Mapillary"
msgid "Uploaded {0} images"
-msgstr ""
+msgstr "Odoslalo sa {0} obrázkov"
msgid "Approve upload on the website"
-msgstr ""
+msgstr "Potvrdiť odoslanie na webstránke"
msgid "View in website"
msgstr "Zobraziť na webstránke"
msgid "Copy key"
-msgstr ""
+msgstr "Kopírovať kľúč"
msgid "Copy key tag"
-msgstr ""
+msgstr "Kopírovať značku"
msgid "Edit on website"
-msgstr ""
+msgstr "Upraviť na webstránke"
msgid "Export all images"
msgstr "Exportovať všetky obrázky"
@@ -28206,49 +28506,49 @@ msgid "Explore"
msgstr "Preskúmať"
msgid "Select a directory"
-msgstr "Vyberte priečinok"
+msgstr "Vybrať priečinok"
msgid "Speed limit"
msgstr "Rýchlostné obmedzenie"
msgid "Give way"
-msgstr ""
+msgstr "Daj prednosť v jazde"
msgid "No entry"
-msgstr ""
+msgstr "Zákaz vstupu"
msgid "Intersection danger"
msgstr ""
msgid "Mandatory direction (any)"
-msgstr ""
+msgstr "Prikázaný smer jazdy"
msgid "No turn"
-msgstr ""
+msgstr "Zákaz odbočenia"
msgid "Uneven road"
-msgstr ""
+msgstr "Nerovná cesta"
msgid "No parking"
-msgstr ""
+msgstr "Zákaz parkovania"
msgid "No overtaking"
-msgstr ""
+msgstr "Zákaz predbiehania"
msgid "Pedestrian crossing"
-msgstr ""
+msgstr "Priechod pre chodcov"
msgid "Years"
-msgstr ""
+msgstr "Rokov"
msgid "Months"
-msgstr ""
+msgstr "Mesiacov"
msgid "Days"
-msgstr ""
+msgstr "Dní"
msgid "Imported images"
-msgstr ""
+msgstr "Importované obrázky"
msgid "Mapillary filter"
msgstr "Filter Mapillary"
@@ -28257,7 +28557,7 @@ msgid "Open Mapillary filter dialog"
msgstr "Otvoriť okno filtra Mapillary"
msgid "Not older than: "
-msgstr ""
+msgstr "Nie staršie ako: "
msgid "Downloaded images"
msgstr "Stiahnuté obrázky"
@@ -28275,7 +28575,7 @@ msgid "Open Mapillary history dialog"
msgstr "Otvoriť okno histórie Mapillary"
msgid "Mapillary picture"
-msgstr ""
+msgstr "Obrázok Mapillary"
msgid "Open Mapillary window"
msgstr "Otvoriť okno Mapillary"
@@ -28311,19 +28611,19 @@ msgid "Jumps to the picture at the other side of the blue line"
msgstr "Preskočí na obrázok na druhej strane modrej čiary"
msgid "Stops the walk."
-msgstr ""
+msgstr "Zastaví chôdzu."
msgid "Play"
-msgstr ""
+msgstr "Prehrať"
msgid "Continues with the paused walk."
-msgstr ""
+msgstr "Pokračuje v pozastavenej chôdzi."
msgid "Pause"
-msgstr ""
+msgstr "Pozastaviť"
msgid "Pauses the walk."
-msgstr ""
+msgstr "Pozastaví chôdzu."
msgid "Reverse buttons position when displaying images."
msgstr "Otočiť pozície tlačidiel pri zobrazení obrázkov."
@@ -28335,82 +28635,90 @@ msgid "Use 24 hour format"
msgstr "Použiť 24-hodinový formát"
msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
+msgstr "Tlačidlom nasledujúci/predchádzajúci sa presunúť na pozíciu obrázka"
msgid "Download mode: "
-msgstr ""
+msgstr "Režim sťahovania: "
msgid "Upload selected sequence"
-msgstr ""
+msgstr "Odoslať vybranú postupnosť"
msgid "Delete after upload"
-msgstr ""
+msgstr "Vymazať po odoslaní"
msgid "Wait for full quality pictures"
-msgstr ""
+msgstr "Čakať na obrázky v plnej kvalite"
msgid "Follow selected image"
-msgstr ""
+msgstr "Nasledovať vybraný obrázok"
msgid "Go forward"
-msgstr ""
+msgstr "Prejsť dopredu"
msgid "Deleted {0} image"
msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} obrázkov vymazaných"
+msgstr[1] "{0} obrázok vymazaný"
+msgstr[2] "{0} obrázky vymazané"
msgid "Imported {0} image"
msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} obrázkov importovaných"
+msgstr[1] "{0} obrázok importovaný"
+msgstr[2] "{0} obrázky importované"
msgid "2 images joined"
-msgstr ""
+msgstr "2 obrázky spojené"
msgid "Moved {0} image"
msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} obrázkov presunutých"
+msgstr[1] "{0} obrázok presunutý"
+msgstr[2] "{0} obrázky presunuté"
msgid "Turned {0} image"
msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} obrázkov otočených"
+msgstr[1] "{0} obrázok otočený"
+msgstr[2] "{0} obrázky otočené"
msgid "2 images unjoined"
-msgstr ""
+msgstr "2 obrázky rozpojené"
msgid ""
"The downloaded OSM area is too big. Download mode has been changed to "
"semiautomatic until the layer is restarted."
msgstr ""
+"Stiahnutá oblasť OSM je príliš veľká. Režim sťahovania bol zmenený na "
+"poloautomatický, kým nezačnete vrstvu znovu."
msgid "Downloading"
msgstr "Sťahuje sa"
msgid "Select mode"
-msgstr ""
+msgstr "Vyberte režim"
msgid ""
"<html><head><title>Mapillary login</title></head><body>Login successful, "
"return to JOSM.</body></html>"
msgstr ""
+"<html><head><title>Prihlásenie Mapillary</title></head><body>Prihlásenie "
+"úspešné, vráťte sa do JOSM.</body></html>"
msgid "Downloading Mapillary images"
-msgstr ""
+msgstr "Sťahujú sa obrázky Mapillary"
msgid "Total Mapillary images: {0}"
-msgstr ""
+msgstr "Spolu obrázkov Mapillary: {0}"
msgid "No images found"
msgstr "Nenašli sa žiadne obrázky"
msgid "Finished upload"
-msgstr ""
+msgstr "Odoslanie ukončené"
msgid "Uploading: {0}"
-msgstr ""
+msgstr "Odosiela sa: {0}"
msgid "Measured values"
msgstr "Namerané hodnoty"
@@ -28431,19 +28739,19 @@ msgid "Selection Area"
msgstr "Plocha výberu"
msgid "Selection Radius"
-msgstr ""
+msgstr "Polomer výberu"
msgid "Angle"
msgstr "Uhol"
msgid "Angle between two selected Nodes"
-msgstr "Úhol medzi dvoma zvolenými bodmi"
+msgstr "Uhol medzi dvoma zvolenými bodmi"
msgid "Layer to make measurements"
msgstr "Vrstva pre vykonávanie meraní"
msgid "measurement mode"
-msgstr "Režim merania"
+msgstr "režim merania"
msgid "Measurements"
msgstr "Meranie"
@@ -29403,6 +29711,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "Nahrať obrázok kalibrácie ..."
@@ -29412,6 +29723,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr "Nahrávanie súboru zlyhalo: {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -29451,6 +29765,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "PicLayer premiestnenie"
@@ -29565,7 +29882,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -29802,9 +30119,6 @@ msgstr "Štát (vo federácii)"
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/sl.po b/i18n/po/sl.po
index 08426e0..b50df4b 100644
--- a/i18n/po/sl.po
+++ b/i18n/po/sl.po
@@ -7,17 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
-"PO-Revision-Date: 2013-03-30 13:06+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-07 17:38+0000\n"
+"Last-Translator: Joško Horvat <Unknown>\n"
"Language-Team: Slovenian <sl at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"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-10-30 04:57+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:57+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: sl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -117,10 +117,10 @@ msgid ""
msgstr ""
msgid "Exit JOSM"
-msgstr ""
+msgstr "Zapri JOSM"
msgid "Continue, try anyway"
-msgstr ""
+msgstr "Nadaljuj, poizkusi ponovno"
msgid "Error"
msgstr "Napaka"
@@ -170,6 +170,12 @@ msgstr "Vstavki"
msgid "About JOSM..."
msgstr "O JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2145,14 +2151,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr "Premakni elemente"
-
-msgid "Move them"
-msgstr "Premakni jih"
-
-msgid "Undo move"
-msgstr "Razveljavi premik"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2165,6 +2167,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr "Premakni elemente"
+
+msgid "Move them"
+msgstr "Premakni jih"
+
+msgid "Undo move"
+msgstr "Razveljavi premik"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Za izbor predmetov v pravokotniku izpustite miškin gumb."
@@ -2359,6 +2370,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2377,9 +2391,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3176,12 +3187,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "NEZNANO"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4787,6 +4798,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "Meni: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4959,7 +4977,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5761,20 +5779,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7006,14 +7019,17 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr "<različno>"
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
-msgstr "<različno>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -11993,6 +12009,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12155,6 +12174,9 @@ msgstr "Sprejem točk od {0} do {1}..."
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -14001,6 +14023,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14607,6 +14633,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14634,7 +14663,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15210,6 +15242,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15355,6 +15390,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15393,6 +15433,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15826,9 +15871,21 @@ msgstr ""
msgid "Lanes"
msgstr "Voznih pasov"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Najvišja hitrost (km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Most"
@@ -15896,6 +15953,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15990,6 +16050,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16530,6 +16593,9 @@ msgstr "Cestnina"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16551,12 +16617,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr "Ceste"
msgid "Motorway"
msgstr "Avtocesta"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Avtocestni priključek"
@@ -16658,6 +16800,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17197,12 +17342,15 @@ msgstr "Obračališče"
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
-msgstr "Znak za naselje"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17320,6 +17468,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17724,6 +17878,15 @@ msgstr ""
msgid "Pier"
msgstr "Pomol"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Vodna zapornica"
@@ -18362,12 +18525,6 @@ msgstr "Letališče"
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18551,6 +18708,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19213,25 +19373,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19811,6 +19952,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -20009,32 +20158,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "Cevovod"
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr "Žerjav"
@@ -20119,6 +20242,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr "Cevovod"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Vodni stolp"
@@ -20359,6 +20499,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21524,6 +21692,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21863,6 +22122,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22846,6 +23128,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22901,6 +23186,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24875,7 +25166,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24918,9 +25212,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27507,6 +27801,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27516,6 +27813,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27555,6 +27855,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27668,7 +27971,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27905,9 +28208,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/sq.po b/i18n/po/sq.po
index 9c57363..8d5ce8c 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2011-11-04 19:43+0000\n"
"Last-Translator: StefanPrifti <Unknown>\n"
"Language-Team: FLOSS Kosova\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:31+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:31+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr "Shtojca"
msgid "About JOSM..."
msgstr "Rreth JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,12 +3171,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "E PANJOHUR"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/sr.po b/i18n/po/sr.po
index fc86c98..887eb35 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-02-01 15:30+0000\n"
"Last-Translator: Slobodan Simić <Unknown>\n"
"Language-Team: Serbian <sr at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:56+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:56+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: sr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -170,6 +170,12 @@ msgstr "Додаци"
msgid "About JOSM..."
msgstr "О програму ЈОСМ"
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2132,13 +2138,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2152,6 +2154,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2346,6 +2357,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2364,9 +2378,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3161,12 +3172,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "НЕПОЗНАТО"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4758,6 +4769,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4930,7 +4948,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5732,20 +5750,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6977,13 +6990,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11941,6 +11957,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12103,6 +12122,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13939,6 +13961,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14545,6 +14571,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14572,7 +14601,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15148,6 +15180,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15293,6 +15328,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15331,6 +15371,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15764,9 +15809,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15834,6 +15891,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15928,6 +15988,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16468,6 +16531,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16489,12 +16555,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16596,6 +16738,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17135,12 +17280,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17258,6 +17406,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17662,6 +17816,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18300,12 +18463,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18489,6 +18646,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19151,25 +19311,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19749,6 +19890,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19947,32 +20096,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20057,6 +20180,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20297,6 +20437,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21462,6 +21630,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21801,6 +22060,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22784,6 +23066,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22839,6 +23124,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24813,7 +25104,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24856,9 +25150,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27443,6 +27737,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27452,6 +27749,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27491,6 +27791,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27604,7 +27907,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27841,9 +28144,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/sv.po b/i18n/po/sv.po
index fe3a779..989836f 100644
--- a/i18n/po/sv.po
+++ b/i18n/po/sv.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-27 23:51+0000\n"
-"Last-Translator: Tomas Marklund <tomasmarklund75 at gmail.com>\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-15 04:21+0000\n"
+"Last-Translator: Niklas Henriksson <fringillus92 at gmail.com>\n"
"Language-Team: Swedish <sv at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:58+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:58+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: sv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -172,6 +172,12 @@ msgstr "Insticksmoduler"
msgid "About JOSM..."
msgstr "Om JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Misslyckades med att ladda resursen ''{0}'', med felet {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -1106,28 +1112,28 @@ msgid "Please select ways with angles of approximately 90 or 180 degrees."
msgstr "Välj sträckor som står i ungefär 90 eller 180 graders vinkel."
msgid "Download from Overpass API ..."
-msgstr ""
+msgstr "Ladda ner från Overpass API…"
msgid "Download map data from Overpass API server."
-msgstr ""
+msgstr "Ladda ner karta från Overpass API-server"
msgid "Builds an Overpass query using the Overpass Turbo query wizard"
-msgstr ""
+msgstr "Skapar en fråga för Overpass genom Overpass Turbo-verktyget"
msgid "Build query"
-msgstr ""
+msgstr "Skapar en fråga"
msgid "<html>The Overpass wizard could not parse the following query:"
-msgstr ""
+msgstr "<html>Overpass-guiden kan inte förstå följande fråga:"
msgid "Parse error"
-msgstr ""
+msgstr "Tolkningsfel"
msgid "Overpass query: "
-msgstr ""
+msgstr "Overpass-fråga: "
msgid "Overpass server: "
-msgstr ""
+msgstr "Overpass-server: "
msgid "Paste"
msgstr "Klistra in"
@@ -1461,13 +1467,13 @@ msgstr[1] ""
"sträckan."
msgid "Which way segment should reuse the history of {0}?"
-msgstr ""
+msgstr "Vilket segment ska återanvända historiken av {0}?"
msgid " [id: {0}]"
msgstr " [id: {0}]"
msgid "Segment {0}: {1}"
-msgstr ""
+msgstr "Segment {0}: {1}"
msgid "You must select two or more nodes to split a circular way."
msgstr "Du måste välja två eller fler noder för att dela en sluten sträcka."
@@ -1893,6 +1899,8 @@ msgstr[1] "{0} anteckningar har laddats ner"
msgid ""
"Since the download limit was {0}, there might be more notes to download."
msgstr ""
+"Eftersom nedladdningsgränsen var {0}, kan det finnas fler anteckningar att "
+"ladda ner."
msgid ""
"Request a smaller area to make sure that all notes are being downloaded."
@@ -1900,13 +1908,13 @@ msgstr ""
"Begär ett mindre område för att säkra att alla anteckningar laddas ner."
msgid "More notes to download"
-msgstr ""
+msgstr "Fler anteckningar att ladda ner"
msgid "Download OSM Notes within Bounds"
-msgstr ""
+msgstr "Ladda ner fler OSM-anteckningar inom gränsen"
msgid "Download OSM Note by ID"
-msgstr ""
+msgstr "Ladda ner OSM-anteckning genom ID"
msgid "Download Compressed OSM Change"
msgstr "Ladda ner komprimerad OSM-förändring"
@@ -1918,7 +1926,7 @@ msgid "Download Compressed OSM"
msgstr "Ladda ner komprimerad OSM"
msgid "Download OSM object by ID"
-msgstr ""
+msgstr "Ladda ner OSM-objekt genom ID"
msgid "Download OSM"
msgstr "Hämta OSM"
@@ -2189,7 +2197,7 @@ msgid "Dual alignment active."
msgstr "Paralell linjering aktiv"
msgid "Segment collapsed due to its direction reversing."
-msgstr ""
+msgstr "Segmentet är kollapsat på grund av sin omvända riktning."
msgid "Move a segment along its normal, then release the mouse button."
msgstr "Flytta ett segment längs dess normal och släpp sedan musknappen."
@@ -2277,6 +2285,8 @@ msgid ""
"ParallelWayAction\n"
"The ways selected must form a simple branchless path"
msgstr ""
+"ParallelWayAction\n"
+"De valda linjerna måste vara av en gemensam grenlös väg"
msgid "Drag play head"
msgstr "Dra spelhuvudet"
@@ -2291,14 +2301,12 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Välj, flytta, skala och rotera objekt"
-msgid "Move elements"
-msgstr "Flytta element"
-
-msgid "Move them"
-msgstr "Flytta"
-
-msgid "Undo move"
-msgstr "Ångra flytt"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
+"Är du säker på att du vill ta bort elementen som är tillfogade vägarna som "
+"är dolda av filter?"
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2317,6 +2325,15 @@ msgstr[1] ""
"fel.\n"
"Vill du verkligen flytta dem?"
+msgid "Move elements"
+msgstr "Flytta element"
+
+msgid "Move them"
+msgstr "Flytta"
+
+msgid "Undo move"
+msgstr "Ångra flytt"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Släpp musknappen för att välja objekten i rektangeln."
@@ -2513,17 +2530,20 @@ msgid "Also include incomplete and deleted objects in search."
msgstr "Ta också med ofullständiga och borttagna objekt i sökningen."
msgid "standard"
-msgstr ""
+msgstr "standard"
msgid "regular expression"
msgstr "reguljärt uttryck"
msgid "MapCSS selector"
-msgstr ""
+msgstr "MapCSS selector"
msgid "add toolbar button"
msgstr "lägg till knapp på verktygsraden"
+msgid "Invalid search expression"
+msgstr "Ogiltigt sökuttryck"
+
msgid "Filter"
msgstr "Filter"
@@ -2545,9 +2565,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Ogiltigt sökuttryck"
-
msgid "basic examples"
msgstr "grundläggande exempel"
@@ -2567,10 +2584,10 @@ msgid "basics"
msgstr "grundläggande"
msgid "''valuefragment'' anywhere in ''key''"
-msgstr ""
+msgstr "''värdefragment'' någonstans inom ''nyckel''"
msgid "''valuefragment'' nowhere in ''key''"
-msgstr ""
+msgstr "''värdefragment'' ingenstans inom ''nyckel''"
msgid "''key'' with exactly ''value''"
msgstr "\"nyckel\" med exakt \"värde\""
@@ -2593,6 +2610,9 @@ msgid ""
"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
"<b>\\\\</b>)."
msgstr ""
+"för att citera operatorer.<br>Inom citerade strängar, <b>\"</b>- and <b>\\"
+"</b>karaktärer måste vara separerade av ett föregående <b>\\</b> (t.ex. <b>\\"
+"\"</b> and <b>\\\\</b>)."
msgid "combinators"
msgstr "kombinerare"
@@ -2647,11 +2667,13 @@ msgstr "egenskaper"
msgid ""
"ways with at least 20 nodes, or relations containing at least 20 nodes"
-msgstr ""
+msgstr "linjer med minst 20 noder, relationer innehållande minst 20 noder"
msgid ""
"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
+"noder med minst 3 refererande linjer eller relationer innehållande minst 3 "
+"linjer"
msgid "objects having 5 to 10 tags"
msgstr "objekt med 5 till 10 taggar"
@@ -2663,7 +2685,7 @@ 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 ""
+msgstr "linjer med en längd av minst 200 m"
msgid "state"
msgstr "status"
@@ -2690,10 +2712,10 @@ msgid "all parents of objects matching the expression"
msgstr "alla föräldrar liknande uttrycket"
msgid "relation containing a member of role <i>stop</i>"
-msgstr ""
+msgstr "relation innehållande en medlem av rollen <i>stop</i>."
msgid "objects being part of a relation as role <i>stop</i>"
-msgstr ""
+msgstr "objekt som är en del av en relation, som rollen <i>stop</i>."
msgid "n-th member of relation and/or n-th node of way"
msgstr "n:te medlemmen i relation och/eller n:te noden på en väg"
@@ -2718,12 +2740,12 @@ msgstr ""
"objekt (och alla dess vägnoder /relationsmedlemmar) i nedladdat område"
msgid "Searching"
-msgstr ""
+msgstr "Söker"
msgid "Searching in {0} object"
msgid_plural "Searching in {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Söker i {0} objekt"
+msgstr[1] "Söker i {0} objekt"
msgid "No match found for ''{0}''"
msgstr "Inga sökträffar för ''{0}''"
@@ -2754,7 +2776,7 @@ msgstr "RX"
msgctxt "search"
msgid "CSS"
-msgstr ""
+msgstr "CSS"
msgctxt "search"
msgid "A"
@@ -2787,7 +2809,7 @@ msgid "Range of primitive ids expected"
msgstr "Lista med primitiva id:n förväntas"
msgid "Range of changeset ids expected"
-msgstr ""
+msgstr "Lista med ändringsuppsättning-IDn förväntas"
msgid "Range of versions expected"
msgstr "Lista med versioner förväntas"
@@ -2812,7 +2834,7 @@ msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Oväntad symbol. Förväntade {0}, men fann {1}"
msgid "Failed to parse MapCSS selector"
-msgstr ""
+msgstr "Kunde inte tolka MapCSS-selektorn"
msgid "Unexpected token: {0}"
msgstr "Oväntad symbol: {0}"
@@ -2838,7 +2860,7 @@ msgstr ""
"längd {2}. Värdets längd är {3}"
msgid "Precondition Violation"
-msgstr ""
+msgstr "Förvalsöverträdelse"
msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
msgstr ""
@@ -2972,8 +2994,8 @@ msgstr[1] "Ta bort \"{0}\" för {1} objekt"
msgid "Set {0}={1} for {2} object"
msgid_plural "Set {0}={1} for {2} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Bestäm {0}={1} for {2} objekt"
+msgstr[1] "Bestäm {0}={1} for {2} objekt"
msgid "Deleted {0} tags for {1} object"
msgid_plural "Deleted {0} tags for {1} objects"
@@ -2982,8 +3004,8 @@ msgstr[1] "Raderade {0} taggar för {1} objekt"
msgid "Set {0} tags for {1} object"
msgid_plural "Set {0} tags for {1} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Besäm {0} taggar for {1} objekt"
+msgstr[1] "Besäm {0} taggar for {1} objekt"
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Ersätt \"{0}\" med \"{1}\" för"
@@ -3139,7 +3161,7 @@ msgid "Cannot resolve undecided conflict."
msgstr "Kan inte lösa obestämd konflikt."
msgid "Resolve conflicts in deleted state in {0}"
-msgstr ""
+msgstr "Lös konflikter med borttaget tillstånd i {0}"
msgid "Set the ''modified'' flag for node {0}"
msgstr "Sätt ''modifierad''-flaggan för noden {0}"
@@ -3151,7 +3173,7 @@ msgid "Set the ''modified'' flag for relation {0}"
msgstr "Sätt ''modifierad''-flaggan för relationen {0}"
msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
+msgstr "Lös konflikter med en medlom i relationen {0}"
msgid "Resolve {0} tag conflict in node {1}"
msgid_plural "Resolve {0} tag conflicts in node {1}"
@@ -3206,7 +3228,7 @@ msgstr[1] ""
"betydelse?</html>"
msgid "Reverse directional way."
-msgstr ""
+msgstr "Vänd på en semantisk väg"
msgid ""
"When reversing this way, the following changes are suggested in order to "
@@ -3246,7 +3268,7 @@ msgid "Please select which changes you want to apply."
msgstr "Vänligen markera de ändringar du vill tillämpa."
msgid "Tags of "
-msgstr ""
+msgstr "Taggar på "
msgid "Roles in relations referring to"
msgstr "Roller i relationer hänvisar till"
@@ -3295,6 +3317,9 @@ msgid ""
"default value is unknown at this moment.<br/> Please activate corresponding "
"function manually and retry importing."
msgstr ""
+"<html>Inställningsfilen vill lägga till egenskaper till<b>{0}</b>,<br/> men "
+"dess standarsvärde är okänt just nu.<br/> Var god aktivera motsvarande "
+"funktion manuellt och försök igen att importera."
msgid "Failed to create missing cache directory: {0}"
msgstr "Misslyckades med att skapa saknad cache-katalog: {0}"
@@ -3303,42 +3328,49 @@ msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>Misslyckades med att skapa saknad cache-katalog: {0}</html>"
msgid "Unable to delete temporary file {0}"
-msgstr ""
+msgstr "Omöjligt att ta bort tillfälliga filen {0}"
msgid "Unable to set file non-readable {0}"
-msgstr ""
+msgstr "Omöjligt att tillsätta filen oläsbar {0}"
msgid "Unable to set file non-writable {0}"
-msgstr ""
+msgstr "Omöjligt att tillsätta filen oläsbar {0}"
msgid "Unable to set file non-executable {0}"
-msgstr ""
+msgstr "Omöjligt att tillsätta filen okörbar {0}"
msgid "Unable to set file readable {0}"
-msgstr ""
+msgstr "Omöjligt att tillsätta filen läsbar {0}"
msgid "Unable to set file writable {0}"
-msgstr ""
+msgstr "Omöjligt att tillsätta filen läsbar {0}"
msgid ""
"Failed to initialize preferences. Preference directory ''{0}'' is not a "
"directory."
msgstr ""
+"Kunde inte starta inställningar. Inställningsmappen \"{0}\" är inte en mapp."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
"not a directory.</html>"
msgstr ""
+"<html>Kunde inte starta inställningar. <br>Inställningsmappen \"{0}\" är "
+"inte en mapp.</html>"
msgid ""
"Failed to initialize preferences. Failed to create missing preference "
"directory: {0}"
msgstr ""
+"Kunde inte starta inställningar. Kunde inte skapa den saknade "
+"inställningsmappen: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
"preference directory: {0}</html>"
msgstr ""
+"<html>Kunde inte starta inställningar.<br> Kunde inte skapa den saknade "
+"inställningsmappen: {0}</html>"
msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr "Saknar inställningsfil \"{0}\". Skapar en default inställningsfil."
@@ -3395,12 +3427,12 @@ msgstr "Imperisk"
msgid "Nautical Mile"
msgstr "Nautisk mil"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Misslyckades med att ladda resursen ''{0}'', med felet {1}."
-
msgid "UNKNOWN"
msgstr "OKÄND"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -3442,36 +3474,38 @@ msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable"
msgstr ""
msgid "HTTP error {0} when loading tiles"
-msgstr ""
+msgstr "HTTP-fel {0} vid nedladdning av rutor"
msgid "Error downloading tiles: {0}"
-msgstr ""
+msgstr "Fel vid nedladdning av rutor: {0}"
msgid "Could not load image from tile server"
-msgstr ""
+msgstr "Kunde inte ladda bilden från kartservern"
msgid ""
"{0} is not a valid WMS argument. Please check this server URL:\n"
"{1}"
msgstr ""
+"{0} är inte ett godkänt WMS-argument. Var god kontrollera:\n"
+"{1}"
msgid "Select WMTS layer"
-msgstr ""
+msgstr "Välj WMTS-lager"
msgid "Layer name"
-msgstr ""
+msgstr "Lagernamn"
msgid "Projection"
msgstr "Projektion"
msgid "Matrix set identifier"
-msgstr ""
+msgstr "Matrix-lägesindentifierare"
msgid "No layers defined by getCapabilities document: {0}"
-msgstr ""
+msgstr "Lager definierade av getCapabilities document: {0}"
msgid "No layer selected"
-msgstr ""
+msgstr "Inget lager valt"
msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
@@ -3515,22 +3549,22 @@ msgid ""
msgstr ""
msgid "Missing merge target for node with id {0}"
-msgstr ""
+msgstr "Saknar ihopslaglingsmål för noden med id {0}"
msgid "Missing merge target for relation with id {0}"
-msgstr ""
+msgstr "Saknar ihopslagningsmål för relation med id {0}"
msgid "Missing merge target of type {0} with id {1}"
-msgstr ""
+msgstr "Saknar ihopslagningsmål av typ {0} med id: {1}"
msgid "Conflict in ''visible'' attribute for object of type {0} with id {1}"
-msgstr ""
+msgstr "Konflikt med \"synlig\" attribut för objekt av typ {0} med id {1}"
msgid "Merging data..."
msgstr "Sammanfogar data..."
msgid "Test ''{0}'' completed in {1}"
-msgstr ""
+msgstr "Test ''{0}'' fullbordad i {1}"
msgid "Cannot add a way with only {0} nodes."
msgstr "Kan Ej lägga till en väg med endast {0} noder."
@@ -3599,7 +3633,7 @@ msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "Parametern {0} är inte inom området «0..{1}», Fick ''{2}''."
msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
-msgstr ""
+msgstr "Kunde inte ladda kartrenderingsklassen {0}. Klassen hittades inte."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -4036,10 +4070,10 @@ msgid "''{0}'': {1}"
msgstr "''{0}'': {1}"
msgid "Lane tags"
-msgstr ""
+msgstr "Filtaggar"
msgid "Test that validates ''lane:'' tags."
-msgstr ""
+msgstr "Test som validerar \"lane:\"-taggar"
msgid "Number of {0} greater than {1}"
msgstr "Antal {0} större än {1}"
@@ -4048,7 +4082,7 @@ msgid "{0}+{1}"
msgstr "{0}+{1}"
msgid "Number of lane dependent values inconsistent"
-msgstr ""
+msgstr "Antal filer oberoende av inkonsekventa värden"
msgid "Number of lane dependent values inconsistent in forward direction"
msgstr ""
@@ -4057,25 +4091,26 @@ msgid "Number of lane dependent values inconsistent in backward direction"
msgstr ""
msgid "Long segments"
-msgstr ""
+msgstr "Långa segment"
msgid "This tests for long way segments, which are usually errors."
msgstr ""
+"Detta kontrollerar för långa linjesegment, vilket ofta är felaktigheter."
msgid "Very long segment of {0} kilometers"
-msgstr ""
+msgstr "Väldigt långa segment på {0} kilometer"
msgid "Tag checker (MapCSS based)"
-msgstr ""
+msgstr "Taggkontroll (MapCSS-baserad)"
msgid "This test checks for errors in tag keys and values."
msgstr "Det här testet kontrollerar fel i taggars nycklar och värden."
msgid "Unable to replace argument {0} in {1}: {2}"
-msgstr ""
+msgstr "Omöjligt att ersätta variabel {0} i {1}: {2}"
msgid "Fix of {0}"
-msgstr ""
+msgstr "Fix på {0}"
msgid " or "
msgstr " eller "
@@ -4084,16 +4119,16 @@ msgid "{0}, use {1} instead"
msgstr "{0}, använd {1} istället"
msgid "Adding {0} to tag checker"
-msgstr ""
+msgstr "Lägger till {0} i taggkontrollen"
msgid "Failed to add {0} to tag checker"
-msgstr ""
+msgstr "Misslyckades att lägga till {0} i taggkontrollen"
msgid "Multipolygon"
msgstr "Multipolygon"
msgid "This test checks if multipolygons are valid."
-msgstr ""
+msgstr "Detta testar om multipolygoner är giltiga."
msgid "Area style way is not closed"
msgstr "Sträcka av typen yta är inte sluten"
@@ -4554,7 +4589,7 @@ msgid "Connected way end node near other way"
msgstr "Slutnod på sträcka nära annan sträcka"
msgid "Unconnected nodes without physical tags"
-msgstr ""
+msgstr "Oanslutna noder utan fysiska taggar"
msgid "Untagged and unconnected nodes"
msgstr "Otaggade och icke anslutna noder"
@@ -4612,7 +4647,7 @@ msgid "Way connected to Area"
msgstr "Sträcka ansluter till yta"
msgid "Checks for ways connected to areas."
-msgstr ""
+msgstr "Kontrollerar för vägar anslutna till ytor"
msgid "Way terminates on Area"
msgstr "Sträcka avslutas på yta"
@@ -4647,13 +4682,13 @@ msgid "incomplete"
msgstr "ofullständig"
msgid "House {0}"
-msgstr ""
+msgstr "Hus {0}"
msgid "House number {0} at {1}"
-msgstr ""
+msgstr "Husnummer {0} på {1}"
msgid "House number {0}"
-msgstr ""
+msgstr "Husnummer {0}"
msgid "highway"
msgstr "landsväg"
@@ -4699,7 +4734,7 @@ msgid "Illegal Data"
msgstr "Ogiltig Data"
msgid "Offline mode"
-msgstr ""
+msgstr "Offlineläge"
msgid "Internal Server Error"
msgstr "Internt serverfel"
@@ -4720,13 +4755,13 @@ msgid "Access to redacted version ''{0}'' of {1} {2} is forbidden."
msgstr ""
msgid "Authorisation Failed"
-msgstr ""
+msgstr "Behörighetskontroll misslyckades"
msgid "Client Time Out"
-msgstr ""
+msgstr "Klient-timeout"
msgid "Bandwidth Limit Exceeded"
-msgstr ""
+msgstr "Bandbreddsgränd uppnått"
msgid "Communication with OSM server failed"
msgstr "Kommunikation med OSM-servern misslyckades"
@@ -4749,7 +4784,7 @@ msgid "Downloading \"Message of the day\""
msgstr "Hämtar \"Dagens meddelande\""
msgid "Failed to read MOTD. Exception was: {0}"
-msgstr ""
+msgstr "Kunde inte läsa upp MOTD. Anledning var: {0}"
msgid "Message of the day not available"
msgstr "Dagens meddelande är inte tillgängligt"
@@ -4787,14 +4822,14 @@ msgid "Download the bounding box"
msgstr "Hämta hem området inom gränsvärdena"
msgid "Download the location at the URL (with lat=x&lon=y&zoom=z)"
-msgstr ""
+msgstr "Ladda ner platsen via URL (med lat=x&lon=y&zoom=z)"
msgid "Open a file (any file type that can be opened with File/Open)"
msgstr ""
"Öppna en fil (Vilken filtyp som helst som kan öppnas med Arkiv → Öppna)"
msgid "Download the bounding box as raw GPS"
-msgstr ""
+msgstr "Ladda ner valrutan som rå GPS"
msgid "Download the location at the URL (with lat=x&lon=y&zoom=z) as raw GPS"
msgstr ""
@@ -4824,7 +4859,7 @@ msgid "Print debugging messages to console"
msgstr ""
msgid "Skip loading plugins"
-msgstr ""
+msgstr "Strunta att ladda plugins"
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4833,30 +4868,32 @@ msgid "options provided as Java system properties"
msgstr "Val tillhandahållna som Java-systeminställningar"
msgid "/PATH/TO/JOSM/PREF "
-msgstr ""
+msgstr "/PATH/TO/JOSM/PREF "
msgid "Set the preferences directory"
msgstr ""
msgid "/PATH/TO/JOSM/USERDATA"
-msgstr ""
+msgstr "/PATH/TO/JOSM/USERDATA"
msgid "Set the user data directory"
-msgstr ""
+msgstr "Välj användardata-plats"
msgid "/PATH/TO/JOSM/CACHE "
-msgstr ""
+msgstr "/PATH/TO/JOSM/CACHE "
msgid "Set the cache directory"
-msgstr ""
+msgstr "Välj cache-plats"
msgid "/PATH/TO/JOSM/HOMEDIR "
-msgstr ""
+msgstr "/PATH/TO/JOSM/HOMEDIR "
msgid ""
"Relocate all 3 directories to homedir. Cache directory will be in "
"homedir/cache"
msgstr ""
+"Omlokalisera alla 3 mappar till homedir. Cachemappen kommer att vara i "
+"homedir/cache"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -4885,7 +4922,7 @@ msgstr ""
"ordning."
msgid "Make sure you load some data if you use --selection."
-msgstr ""
+msgstr "Var säker på att du laddar lite data genom att använda --selection"
msgid "Printing debugging messages to console"
msgstr ""
@@ -4961,10 +4998,10 @@ msgstr ""
"Det verkar som att JOSM kraschade förra gången. Vill du återställa data?"
msgid "Change proxy settings"
-msgstr ""
+msgstr "Ändra proxyinställningar"
msgid "Proxy errors occurred"
-msgstr ""
+msgstr "Proxyinställningsfel"
msgid ""
"JOSM tried to access the following resources:<br>{0}but <b>failed</b> to do "
@@ -5019,7 +5056,7 @@ msgstr "Mer..."
msgctxt "menu"
msgid "GPS"
-msgstr ""
+msgstr "GPS"
msgctxt "menu"
msgid "Windows"
@@ -5027,14 +5064,21 @@ msgstr "Fönster"
msgctxt "menu"
msgid "Help"
-msgstr "Help"
+msgstr "Hjälp"
msgid "Menu: {0}"
msgstr "Meny: {0}"
-msgid "Edit toolbar"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
msgstr ""
+msgid "Edit toolbar"
+msgstr "Redigera verktygsrad"
+
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
@@ -5051,7 +5095,7 @@ msgid "Click to open the imagery tab in the preferences"
msgstr "Klicka för att öppna fliken bakgrundsbilder i inställningarna"
msgid "Search menu items"
-msgstr ""
+msgstr "Sök menyrader"
msgctxt "menu"
msgid "Audio"
@@ -5067,10 +5111,10 @@ msgid "Click the arrow at the bottom to show it again."
msgstr "Klicka på pilen i botten för att visa det igen"
msgid "Hide edit toolbar"
-msgstr ""
+msgstr "Dölj redigera verktygsraden"
msgid "Hide or show this toggle button"
-msgstr ""
+msgstr "Visa eller dölj denna brytarknapp"
msgid "Move right"
msgstr "Flytta höger"
@@ -5097,7 +5141,7 @@ msgid "scale"
msgstr "skala"
msgid "Status bar background"
-msgstr ""
+msgstr "Statusbarbakgrund"
msgid "Status bar background: active"
msgstr ""
@@ -5177,16 +5221,16 @@ msgid "Click to run job in background"
msgstr "Klicka för att köra jobb i bakgrunden"
msgid " ({0})"
-msgstr ""
+msgstr " ({0})"
msgid "{0} completed in {1}"
msgstr "{0} genomfört på {1}"
msgid "Enlarge"
-msgstr ""
+msgstr "Förstora"
msgid "Shrink"
-msgstr ""
+msgstr "Krymp"
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -5204,7 +5248,7 @@ msgstr "upp till ruta"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5431,7 +5475,7 @@ msgid "List of elements in my dataset, i.e. the local dataset"
msgstr ""
msgid "Merged version"
-msgstr ""
+msgstr "Sammanfogad version"
msgid ""
"List of merged elements. They will replace the list of my elements when the "
@@ -5515,7 +5559,7 @@ msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
-msgstr ""
+msgstr "Nedåt"
msgid "Move down the selected entries by one position."
msgstr "Flytta ner valda element en position."
@@ -5620,13 +5664,13 @@ msgid "Role"
msgstr "Roll"
msgid "Primitive"
-msgstr ""
+msgstr "Primitiv"
msgid "Merged nodes not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
-msgstr ""
+msgstr "<odefinierad>"
msgid "The merged dataset will not include a tag with key {0}"
msgstr ""
@@ -5656,7 +5700,7 @@ msgid "Keep the selected key/value pairs from the server dataset"
msgstr ""
msgid "Undecide"
-msgstr ""
+msgstr "Avbesluta"
msgid "Mark the selected tags as undecided"
msgstr ""
@@ -5734,7 +5778,7 @@ msgid "all"
msgstr "alla"
msgid "sum"
-msgstr ""
+msgstr "summera"
msgid "Please decide which values to keep"
msgstr "Välj värden att behålla"
@@ -5756,19 +5800,19 @@ msgid "Tag collection does not include the selected value ''{0}''."
msgstr ""
msgid "Not decided yet."
-msgstr ""
+msgstr "Ej avgjort ännu."
msgid "Tags from nodes"
-msgstr ""
+msgstr "Taggar från noder"
msgid "Tags from ways"
msgstr "Taggar från sträckor"
msgid "Tags from relations"
-msgstr ""
+msgstr "Taggar från relationer"
msgid "Conflicts in pasted tags"
-msgstr ""
+msgstr "Konflikter i inklistrade taggar"
msgid "Paste ..."
msgstr "Klistra in ..."
@@ -5801,44 +5845,46 @@ msgid "Remove this relation member from the relation"
msgstr "Ta bort den här medlemmen från relationen"
msgid "Keep"
-msgstr ""
+msgstr "Behåll"
msgid "Keep this relation member for the target object"
-msgstr ""
+msgstr "Behåll denna relationsmedlem till målobjektet"
msgid "Undecided"
-msgstr ""
+msgstr "Obestämt"
msgid "Not decided yet"
-msgstr ""
+msgstr "Ej beslutat ännu"
msgid "Role:"
msgstr "Roll:"
msgid "Enter a role for all relation memberships"
-msgstr ""
+msgstr "Ange en roll för alla relationsmedlemmar"
msgid "Tag modified relations with "
-msgstr ""
+msgstr "Tagga ändrade relationer mer "
msgid ""
"<html>Select to enable entering a tag which will be applied<br>to all "
"modified relations.</html>"
msgstr ""
+"<html>Välj för att tagga det som kommer appliceras för<br>alla modifierade "
+"relationer</html>"
msgctxt "tag"
msgid "Key:"
msgstr "Nyckel:"
msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
-msgstr ""
+msgstr "<html>Ange en tagg, t.ex. <strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "Värde:"
msgid ""
"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
-msgstr ""
+msgstr "<html>Ange en <strong><tt>check members</tt></strong></html>"
msgid ""
"<html>The combined ways are members in one or more relations. Please decide "
@@ -5847,7 +5893,7 @@ msgid ""
"to <strong>keep</strong> the first way and <strong>remove</strong> the other "
"ways that are members of the same relation: the combined way will take the "
"place of the original way in the relation.</html>"
-msgstr ""
+msgstr "Pos."
msgid ""
"<html>The merged nodes are members in one or more relations. Please decide "
@@ -5862,13 +5908,13 @@ msgid "Apply this role to all members"
msgstr "Applicera den här rollen på alla medlemmar"
msgid "Pos."
-msgstr ""
+msgstr "Pos."
msgid "Orig. Way"
msgstr "Urspr. sträcka"
msgid "Decision"
-msgstr ""
+msgstr "Beslut"
msgid "<html>Please select the values to keep for the following tags.</html>"
msgstr ""
@@ -5877,7 +5923,7 @@ msgid "Show tags with conflicts only"
msgstr "Visa enbart taggar med konflikter"
msgid "Show tags with multiple values only"
-msgstr ""
+msgstr "Visa taggar med enbart flera värden"
msgid "For selected objects only"
msgstr "Visa enbart för valda objekt"
@@ -5912,13 +5958,13 @@ msgid "Closes the selected open changesets"
msgstr "Stänger valda öppna ändringsuppsättningar"
msgid "Show info"
-msgstr ""
+msgstr "Visa info"
msgid "Open a web page for each selected changeset"
msgstr "Öppna en webbsida för varje vald ändringsuppsättning"
msgid "Details"
-msgstr ""
+msgstr "Detaljer"
msgid "Opens the Changeset Manager window for the selected changesets"
msgstr ""
@@ -5934,7 +5980,7 @@ msgid "Toggle: {0}"
msgstr "Växla: {0}"
msgid "Command Stack: Undo: {0} / Redo: {1}"
-msgstr ""
+msgstr "Kommando: Upphäva: {0} / Gör om: {1}"
msgid ""
"Selects the objects that take part in this command (unless currently deleted)"
@@ -6021,20 +6067,15 @@ msgstr "Lös konflikter"
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6281,7 +6322,7 @@ msgid "The 2 selected objects have identical style caches."
msgstr ""
msgid "The 2 selected objects have different style caches."
-msgstr ""
+msgstr "De två valda objekten har olika stilcachen."
msgid ""
"Warning: The 2 selected objects have equal, but not identical style caches."
@@ -6289,14 +6330,14 @@ msgstr ""
msgid "{0} user last edited the selection:"
msgid_plural "{0} users last edited the selection:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} användare har senast ändrat markeringen:"
+msgstr[1] "{0} användare har senast ändrat markeringen:"
msgid "xml"
msgstr "xml"
msgid "mapcss"
-msgstr ""
+msgstr "mapcss"
msgid "unknown"
msgstr "okänd"
@@ -6343,7 +6384,7 @@ msgid ""
msgstr ""
msgid "Some examples:"
-msgstr ""
+msgstr "Några exampel:"
msgid "Projected coordinates:"
msgstr "Projicerade koordinater:"
@@ -6359,7 +6400,7 @@ msgid "East/North"
msgstr "Öst/Nord"
msgid "Please enter a GPS coordinates"
-msgstr ""
+msgstr "Var god ange GPS-koordinater"
msgid "Please enter a Easting and Northing"
msgstr ""
@@ -6404,7 +6445,7 @@ msgid "Activate layer"
msgstr "Aktivera lager"
msgid "Merge this layer into another layer"
-msgstr ""
+msgstr "Sammanfoga detta lager med ett annat"
msgid "Duplicate this layer"
msgstr "Duplicera det här lagret"
@@ -6438,16 +6479,16 @@ msgid "Information about layer"
msgstr "Information om lager"
msgid "Map paint preferences"
-msgstr ""
+msgstr "Kartfärgsegenskaper"
msgid "Map Paint Styles"
msgstr "Färgscheman karta"
msgid "configure the map painting style"
-msgstr ""
+msgstr "ställ in kartfärger"
msgid "MapPaint"
-msgstr ""
+msgstr "MapPaint"
msgid "On/Off"
msgstr "På/Av"
@@ -6540,34 +6581,34 @@ msgid "Comment"
msgstr "Kommentar"
msgid "Comment on note"
-msgstr ""
+msgstr "Kommentera en nod"
msgid "Add comment to note:"
-msgstr ""
+msgstr "Lägg till kommentar till anteckning:"
msgid "Close note"
-msgstr ""
+msgstr "Stäng anteckning"
msgid "Close note with message:"
msgstr ""
msgid "Create a new note"
-msgstr ""
+msgstr "Skapa en ny anteckning"
msgid "Create"
msgstr "Skapa"
msgid "Reopen note"
-msgstr ""
+msgstr "Återöppna antecknning"
msgid "Reopen"
-msgstr ""
+msgstr "Återöppna"
msgid "Reopen note with message:"
-msgstr ""
+msgstr "Återöppna anteckning med ett meddelande:"
msgid "Sort notes"
-msgstr ""
+msgstr "Sortera anteckningar"
msgid "Sort"
msgstr "Sortera"
@@ -6650,7 +6691,7 @@ msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
msgstr "Urval: Rel.:{0}/Sträckor:{1}/Noder:{2}"
msgid "Unselectable now"
-msgstr ""
+msgstr "Ovalbar nu"
msgid "Selection: {0}"
msgstr "Urval: {0}"
@@ -6659,7 +6700,7 @@ msgid "Always shown"
msgstr "Visas alltid"
msgid "Dynamic"
-msgstr ""
+msgstr "Dynamisk"
msgid "Always hidden"
msgstr "Alltid dold"
@@ -6693,11 +6734,11 @@ msgstr "Öppna en lista över de som arbetar med de valda objekten."
msgid "{0} Author"
msgid_plural "{0} Authors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} Skapare"
+msgstr[1] "{0} Skapare"
msgid "Select objects submitted by this user"
-msgstr ""
+msgstr "Välj objekt inskickade av denna användare"
msgid "Launches a browser with information about the user"
msgstr "Öppna en webbläsare med information om användaren"
@@ -6857,7 +6898,7 @@ msgid "Closed at"
msgstr ""
msgid "Discussions"
-msgstr ""
+msgstr "Diskussioner"
msgid "Downloading changeset content"
msgstr "Hämtar hem innehållet i ändringsuppsättningar"
@@ -6884,7 +6925,7 @@ msgid "Download the changeset content from the OSM server"
msgstr "Hämta hem ändringsuppsättningens innehåll från OSM-servern"
msgid "Update content"
-msgstr ""
+msgstr "Uppdatera innehåll"
msgid "Update the changeset content from the OSM server"
msgstr "Uppdatera ändringsuppsättningens innehåll mot OSM-servern"
@@ -7282,14 +7323,17 @@ msgstr "Taggar/Medlemskap"
msgid "Tags for selected objects."
msgstr "Taggar för valda objekt"
+msgid "<different>"
+msgstr "<olika>"
+
msgid "Member Of"
msgstr "Medlem av"
msgid "Position"
msgstr "Position"
-msgid "<different>"
-msgstr "<olika>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -12401,6 +12445,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12568,6 +12615,9 @@ msgstr "Hämtar punkter {0} till {1}..."
msgid "Contacting OSM Server..."
msgstr "Ansluter till OSM-servern..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -14511,6 +14561,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "buskage"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -15117,6 +15171,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -15144,7 +15201,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15720,6 +15780,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15867,6 +15930,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15905,6 +15973,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -16267,7 +16340,7 @@ msgid "sett"
msgstr ""
msgid "Smoothness"
-msgstr ""
+msgstr "Mjukhet"
msgid "excellent"
msgstr ""
@@ -16348,9 +16421,21 @@ msgstr "lera"
msgid "Lanes"
msgstr "Filer"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Största tillåtna hastighet (km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Bro"
@@ -16418,6 +16503,9 @@ msgstr "sidospår"
msgid "spur"
msgstr "stickspår"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "Elektrifierad"
@@ -16512,6 +16600,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr "Höjd (meter)"
@@ -17052,6 +17143,9 @@ msgstr "Betalstation"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "Är vattnet oregelgundet (försvinner säsongsbetonat)?"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr "kulvert"
@@ -17073,12 +17167,88 @@ msgstr "Motorbåt"
msgid "Canoe"
msgstr "Kanot"
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "vatten"
+
+msgid "gas"
+msgstr "naturgas"
+
+msgid "heat"
+msgstr "värme"
+
+msgid "oil"
+msgstr "olja"
+
+msgid "sewage"
+msgstr "avlopp"
+
+msgid "Support"
+msgstr "Stöd"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "stolpe"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "väggmonterad"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "anslagstavla"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "mark"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Vägar"
msgid "Motorway"
msgstr "Motorväg"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Motorvägslänk"
@@ -17154,7 +17324,7 @@ msgid "Oneway for bicycle"
msgstr "Enkelriktat för cykel"
msgid "Living Street"
-msgstr "Gårdsgata"
+msgstr "Gångfartsområde"
msgid "Pedestrian"
msgstr "Gågata"
@@ -17180,6 +17350,9 @@ msgstr "parkeringsväg"
msgid "drive-through"
msgstr "drive-through"
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Parkeringskorridor"
@@ -17252,7 +17425,7 @@ msgstr "ridstig"
msgctxt "Highway"
msgid "living_street"
-msgstr "gårdsgata"
+msgstr "gångfartsområde"
msgctxt "Highway"
msgid "pedestrian"
@@ -17702,7 +17875,7 @@ msgid "Traffic Calming"
msgstr "Farthinder"
msgid "bump"
-msgstr "fartgupp"
+msgstr "vägbula (<1m)"
msgid "chicane"
msgstr "chikan"
@@ -17714,7 +17887,7 @@ msgid "cushion"
msgstr ""
msgid "hump"
-msgstr ""
+msgstr "fartgupp (2-4m)"
msgid "rumble_strip"
msgstr ""
@@ -17731,12 +17904,15 @@ msgstr "Vändplats"
msgid "Turning Loop"
msgstr "Vändslinga"
-msgid "City Limit"
-msgstr "Stadsgräns"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Andra namn"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Hastighetskamera"
@@ -17854,6 +18030,12 @@ msgstr "Trafikavskiljare"
msgid "Wall"
msgstr "Mur"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Stadsmur"
@@ -18258,6 +18440,15 @@ msgstr "CNG"
msgid "Pier"
msgstr "Pir"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Slussport"
@@ -18896,12 +19087,6 @@ msgstr "Flygplats"
msgid "Airport Ground"
msgstr "Flygplats"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Landningsbana"
@@ -19085,6 +19270,9 @@ msgstr "Mikrobryggeri"
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Snabbmat"
@@ -19749,25 +19937,6 @@ msgstr "solur"
msgid "unorthodox"
msgstr "okonventionell"
-msgid "Support"
-msgstr "Stöd"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "stolpe"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "väggmonterad"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "anslagstavla"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "mark"
-
msgid "Visibility/readability"
msgstr "Synlighet/läsbarhet"
@@ -20347,6 +20516,14 @@ msgid "barn"
msgstr "loge"
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "jordbruksbyggnad"
@@ -20545,32 +20722,6 @@ msgstr "vin"
msgid "Bunker Silo"
msgstr "bunkersilo"
-msgid "Pipeline"
-msgstr "Rörledning"
-
-msgid "water"
-msgstr "vatten"
-
-msgid "gas"
-msgstr "naturgas"
-
-msgid "heat"
-msgstr "värme"
-
-msgid "oil"
-msgstr "olja"
-
-msgid "sewage"
-msgstr "avlopp"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "under vatten"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "ovanjordisk"
-
msgid "Crane"
msgstr "Kran"
@@ -20655,6 +20806,23 @@ msgstr ""
msgid "Length in meters"
msgstr "Längd i meter"
+msgid "Pipeline"
+msgstr "Rörledning"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "under vatten"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "ovanjordisk"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Vattentorn"
@@ -20895,6 +21063,34 @@ msgstr ""
msgid "Bridge outline"
msgstr "Ytterkontur bro"
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -22060,6 +22256,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Geografi"
@@ -22405,6 +22692,29 @@ msgstr "Gårdsplan"
msgid "Farmland"
msgstr "Jordbruksmark"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Äng"
@@ -23390,6 +23700,9 @@ msgstr "{0} måste vara ett numeriskt värde"
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -23445,6 +23758,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -25427,7 +25746,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -25470,9 +25792,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -28088,6 +28410,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -28097,6 +28422,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -28136,6 +28464,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -28249,7 +28580,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -28486,9 +28817,6 @@ msgstr "Delstat"
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
@@ -31024,13 +31352,14 @@ msgid "Enter search expression here.."
msgstr "Skriv ett sökuttryck här.."
msgid "Select waypoint to move map"
-msgstr ""
+msgstr "Välj en waypoint för att flytta kartan"
msgid "Waypoint search"
-msgstr ""
+msgstr "Waypoint-sökning"
msgid "Search after waypoint. Click and move the map view to the waypoint."
msgstr ""
+"Sök efter en waypoint. Klicka och sök på kartan för att se waypointen."
msgid "Add names from Wikipedia"
msgstr "Lägg till namn från Wikipedia"
diff --git a/i18n/po/ta.po b/i18n/po/ta.po
index 928ee75..53c99e7 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-10-28 15:55+0000\n"
"Last-Translator: நவலடி <navaladi 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-10-30 04:58+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:59+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"X-Poedit-Country: INDIA\n"
"Language: ta\n"
"X-Poedit-Language: Tamil\n"
@@ -171,6 +171,12 @@ msgstr "செருகல்கள்"
msgid "About JOSM..."
msgstr "JOSM பற்றி"
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2167,13 +2173,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2187,6 +2189,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2381,6 +2392,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2399,9 +2413,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3196,12 +3207,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "அறியாத"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4793,6 +4804,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4965,7 +4983,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5767,20 +5785,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7013,13 +7026,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11978,6 +11994,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12140,6 +12159,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13976,6 +13998,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14582,6 +14608,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14609,7 +14638,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15185,6 +15217,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15330,6 +15365,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15368,6 +15408,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15801,9 +15846,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15871,6 +15928,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15965,6 +16025,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16505,6 +16568,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16526,12 +16592,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16633,6 +16775,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17172,12 +17317,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17295,6 +17443,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17699,6 +17853,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18337,12 +18500,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18526,6 +18683,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19188,25 +19348,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19786,6 +19927,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19984,32 +20133,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20094,6 +20217,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20334,6 +20474,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21499,6 +21667,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21838,6 +22097,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22821,6 +23103,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22876,6 +23161,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24850,7 +25141,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24893,9 +25187,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27486,6 +27780,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27495,6 +27792,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27534,6 +27834,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27647,7 +27950,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27884,9 +28187,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/te.po b/i18n/po/te.po
index 747709b..3e166af 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2011-05-13 08:50+0000\n"
"Last-Translator: Praveen Illa <mail2ipn at gmail.com>\n"
"Language-Team: Telugu <te at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:59+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:59+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: te\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr "ప్లగిన్లు"
msgid "About JOSM..."
msgstr "JOSM గురించి..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,10 +3171,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/th.po b/i18n/po/th.po
index 9e60116..9860494 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2009-03-23 02:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Thai <th at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-10-30 04:59+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 04:59+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: th\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,10 +3171,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/tr.po b/i18n/po/tr.po
index 391f3f0..3d02b31 100644
--- a/i18n/po/tr.po
+++ b/i18n/po/tr.po
@@ -9,26 +9,26 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
-"PO-Revision-Date: 2014-05-16 05:31+0000\n"
-"Last-Translator: katpatuka <email at katpatuka.org>\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-16 12:04+0000\n"
+"Last-Translator: Erkin Alp Güney <Unknown>\n"
"Language-Team: Türkçe <>\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-10-30 05:00+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 05:00+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
-msgstr ""
+msgstr "{0}: {1} seçeneği ikircikli"
msgid "{0}: option ''--{1}'' does not allow an argument"
-msgstr ""
+msgstr "{0}: ''--{1}'' seçeneği argüman almaz"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
-msgstr ""
+msgstr "{0}: ''{1}{2}'' seçeneği argüman almaz"
msgid "{0}: option ''{1}'' requires an argument"
msgstr ""
@@ -49,7 +49,7 @@ msgid "{0}: option requires an argument -- {1}"
msgstr "{0}: ''--{1}'' seçeneği argüman gerektirir"
msgid "Invalid value {0} for parameter ''has_arg''"
-msgstr ""
+msgstr "{0} değeri ''has_arg'' için geçerli değil"
msgid "Background Terms of Use"
msgstr "Arkaplanın Kullanım Şartları"
@@ -173,6 +173,12 @@ msgstr "Eklentiler"
msgid "About JOSM..."
msgstr "JOSM Hakkında..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2179,15 +2185,11 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
-msgid "Move them"
-msgstr "Taşı"
-
-msgid "Undo move"
-msgstr "Taşımayı geri al"
-
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
"an error.\n"
@@ -2199,6 +2201,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr "Taşı"
+
+msgid "Undo move"
+msgstr "Taşımayı geri al"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Dikdörtgendeki objeleri seçmek için fare düğmesini bırakınız."
@@ -2395,6 +2406,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr "Süzgeç"
@@ -2413,9 +2427,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3214,12 +3225,12 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
-
msgid "UNKNOWN"
msgstr "BİLİNMEYEN"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4823,6 +4834,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "Menu: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4995,7 +5013,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5795,20 +5813,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7040,14 +7053,17 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr "<farklı>"
+
msgid "Member Of"
msgstr "Üyesi"
msgid "Position"
msgstr ""
-msgid "<different>"
-msgstr "<farklı>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr ""
@@ -12031,6 +12047,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12193,6 +12212,9 @@ msgstr "{0} ve {1} arası bilgiler indiriliyor"
msgid "Contacting OSM Server..."
msgstr "OSM Server’ına Bağlanıyor..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -14042,6 +14064,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14648,6 +14674,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14675,7 +14704,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15251,6 +15283,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15396,6 +15431,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15434,6 +15474,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15867,9 +15912,21 @@ msgstr "çamur"
msgid "Lanes"
msgstr "Şeritler"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Max. hız (km/sa)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "köprü"
@@ -15937,6 +15994,9 @@ msgstr "yük boşaltma yeri"
msgid "spur"
msgstr "demiryolu hattı şube-kısa"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -16031,6 +16091,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr "dışında"
+
msgid "Height (meters)"
msgstr ""
@@ -16571,6 +16634,9 @@ msgstr "ücret"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16592,12 +16658,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "su"
+
+msgid "gas"
+msgstr "benzin"
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Sokaklar"
msgid "Motorway"
msgstr "Araçyolu"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Araç yolu hattı"
@@ -16699,6 +16841,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Park alanı"
@@ -17238,12 +17383,15 @@ msgstr "Dönme Daire"
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
-msgstr "şehir sınırı"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "ikinci isim"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "hız kamerası"
@@ -17361,6 +17509,12 @@ msgstr ""
msgid "Wall"
msgstr "Duvar"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "Şehir Duvarı"
@@ -17765,6 +17919,15 @@ msgstr ""
msgid "Pier"
msgstr "Kemer"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Lock Gate"
@@ -18403,12 +18566,6 @@ msgstr "Havaalanı"
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr ""
@@ -18592,6 +18749,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast Food"
@@ -19254,25 +19414,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19852,6 +19993,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -20050,32 +20199,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "Suboru Hattı"
-
-msgid "water"
-msgstr "su"
-
-msgid "gas"
-msgstr "benzin"
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr "Vinç"
@@ -20160,6 +20283,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr "Suboru Hattı"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "Su Kulesi"
@@ -20400,6 +20540,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21565,6 +21733,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21904,6 +22163,29 @@ msgstr "Çiftlik"
msgid "Farmland"
msgstr "Çiftlik Arazisi"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22887,6 +23169,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22942,6 +23227,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24916,7 +25207,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24959,9 +25253,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27560,6 +27854,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27569,6 +27866,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27608,6 +27908,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27721,7 +28024,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27958,9 +28261,6 @@ msgstr "İl"
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr "dışında"
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/ug.po b/i18n/po/ug.po
index fd972fb..df0f49c 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2012-07-14 16:22+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Uyghur <ug at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-10-30 05:00+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 05:00+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,10 +3171,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/uk.po b/i18n/po/uk.po
index 361604e..4ec7c29 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-10-30 03:36+0100\n"
-"PO-Revision-Date: 2015-10-14 16:09+0000\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
+"PO-Revision-Date: 2015-11-23 09:46+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-10-30 05:01+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 05:01+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: uk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -176,6 +176,12 @@ msgstr "Втулки"
msgid "About JOSM..."
msgstr "Про JOSM…"
+msgid "Failed to locate resource ''{0}''."
+msgstr "Не вдалося знайти ресурс ''{0}''"
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Збій завантаження ресурсу ''{0}'', помилка {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -1505,13 +1511,13 @@ msgstr[2] ""
"виділіть також лінію."
msgid "Which way segment should reuse the history of {0}?"
-msgstr ""
+msgstr "Який відрізок успадковуватиме історію {0}?"
msgid " [id: {0}]"
msgstr " [id: {0}]"
msgid "Segment {0}: {1}"
-msgstr ""
+msgstr "Відрізок {0}: {1}"
msgid "You must select two or more nodes to split a circular way."
msgstr "Щоб розділити замкнену лінію, виділіть не менше двох точок."
@@ -2352,14 +2358,12 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Виділення, переміщення, масштабування та поворот об’єктів"
-msgid "Move elements"
-msgstr "Перемістити елементи"
-
-msgid "Move them"
-msgstr "Перемістити"
-
-msgid "Undo move"
-msgstr "Відмінити переміщення"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
+"Ви впевнені, що бажаєте пересунути ці елементи разом із приєднаними лініями, "
+"які приховані фільтром?"
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2382,6 +2386,15 @@ msgstr[2] ""
"елементів дуже часто є помилкою.\n"
"Дійсно перемістити їх?"
+msgid "Move elements"
+msgstr "Перемістити елементи"
+
+msgid "Move them"
+msgstr "Перемістити"
+
+msgid "Undo move"
+msgstr "Відмінити переміщення"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Відпустіть кнопку миші для вибору об’єктів в прямокутнику."
@@ -2593,6 +2606,9 @@ msgstr "MapCSS-селектор"
msgid "add toolbar button"
msgstr "додати на панель інструментів"
+msgid "Invalid search expression"
+msgstr "Помилковий вираз для пошуку"
+
msgid "Filter"
msgstr "Фільтр"
@@ -2614,9 +2630,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "Помилковий вираз для пошуку"
-
msgid "basic examples"
msgstr "основні приклади"
@@ -2764,10 +2777,10 @@ msgid "all parents of objects matching the expression"
msgstr "усі пращури об’єктів, що задовольняють умовам"
msgid "relation containing a member of role <i>stop</i>"
-msgstr ""
+msgstr "зв’язок, що містить членів з роллю <i>stop</i>"
msgid "objects being part of a relation as role <i>stop</i>"
-msgstr ""
+msgstr "об’єкти, що є частиною зв’язку з роллю <i>stop</i>"
msgid "n-th member of relation and/or n-th node of way"
msgstr "n-ий член зв’язку та/або n-а точка лінії"
@@ -2796,8 +2809,9 @@ msgstr "Пошук"
msgid "Searching in {0} object"
msgid_plural "Searching in {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Пошук серед {0} об’єкта"
+msgstr[1] "Пошук серед {0} об’єктів"
+msgstr[2] "Пошук серед {0} об’єктів"
msgid "No match found for ''{0}''"
msgstr "Не знайдено збігів для ''{0}''"
@@ -3512,12 +3526,12 @@ msgstr "Імперська"
msgid "Nautical Mile"
msgstr "Морська миля"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Збій завантаження ресурсу ''{0}'', помилка {1}."
-
msgid "UNKNOWN"
msgstr "НЕВІДОМО"
+msgid "Error reading revision info from revision file: {0}"
+msgstr "Помилка отримання інформації про ревізію з файла: {0}"
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr "Неочікуваний номер версії JOSM — ''{0}'' у файлі ревізії"
@@ -5222,6 +5236,14 @@ msgstr "Довідка"
msgid "Menu: {0}"
msgstr "Меню: {0}"
+msgid "Main toolbar"
+msgstr "Головна панель інструментів"
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+"Приховує чи показує головну панель інструментів (тобто горизонтальну панель)"
+
msgid "Edit toolbar"
msgstr "Панель інструментів редагування"
@@ -5400,14 +5422,13 @@ msgstr "до квадрата"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Також ви можете ввести <strong>адресу квадрата</strong> для одиничного "
-"квадрата в форматі <i>масштаб/x/y</i>, тобто <i>15/256/223</i>. Також "
-"припустиме введення адреси квадрата в форматі <i>масштаб,x,y</i> або "
-"<i>масштаб;x;y</i>.</html>"
+"<html>Або можна ввести <strong>адресу</strong> окремого квадрату в форматі "
+"<i>zoomlevel/x/y</i>, наприклад, <i>15/256/223</i>. Адреса квадратів в "
+"форматі <i>zoom,x,y</i> або <i>zoom;x;y</i> також можлива.</html>"
msgid "Tile address:"
msgstr "Адреса квадрата:"
@@ -6308,26 +6329,17 @@ msgstr "Розв’язати конфлікти"
msgid "Resolve conflicts for ''{0}''"
msgstr "Розв’язати кнофлікти для ''{0}''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Будь ласка, підтвердіть вилучення <strong>1 об’єкта</strong> з "
-"<strong>1 зв’язку</strong>.</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Будь ласка, підтвердіть вилучення <strong>1 об’єкта</strong> з "
-"<strong>{0} зв’язків</strong>.</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] "Будь ласка, підтвердіть вилучення <strong>{0} об’єкта</strong>."
+msgstr[1] "Будь ласка, підтвердіть вилучення <strong>{0} об’єктів</strong>."
+msgstr[2] "Будь ласка, підтвердіть вилучення <strong>{0} об’єктів</strong>."
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Будь ласка, підтвердіть вилучення <strong>{0} об’єктів</strong> із "
-"<strong>{1} зв’язків</strong>.</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] "вплине на {0} зв’язок."
+msgstr[1] "вплине на {0} зв’язки."
+msgstr[2] "вплине на {0} зв’язків."
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7661,14 +7673,17 @@ msgstr "Теґи/Членство"
msgid "Tags for selected objects."
msgstr "Теґи виділених об’єктів."
+msgid "<different>"
+msgstr "<різні>"
+
msgid "Member Of"
msgstr "Член групи"
msgid "Position"
msgstr "Розташування"
-msgid "<different>"
-msgstr "<різні>"
+msgid "Tag filter"
+msgstr "Фільтр теґів"
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Об’єкти: {2} / Теґи: {0} / Члени: {1}"
@@ -7967,7 +7982,7 @@ msgstr ""
"зв’язку?</html>"
msgid "Multiple members referring to same object."
-msgstr "Кілька членів посилаються на один і той самий об’єкт."
+msgstr "Кілька членів посилаються на один об’єкт"
msgid ""
"<html>You are trying to add a relation to itself.<br><br>This creates "
@@ -8024,7 +8039,8 @@ msgid "Sort below"
msgstr "Впорядкувати нижче"
msgid "Sort the selected relation members and all members below"
-msgstr "Впорядкувати виділених учасників зв’язків і всіх розташованих нижче"
+msgstr ""
+"Впорядкувати членів виділеного зв’язку і всіх членів розташованих нижче"
msgid "Reverse the order of the relation members"
msgstr "Змінити порядок членів зв’язку на протилежний"
@@ -13225,6 +13241,9 @@ msgstr ""
"Зламаний шаблон теґів \"{0}-{1}\" — кількість елементів у ''display_values'' "
"повинна дорівнювати кількості ''values''"
+msgid "Detailed information: {0} <> {1}"
+msgstr "Докладна інформація: {0} <> {1}"
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13413,6 +13432,9 @@ msgstr "Завантаження точок {0} з {1}…"
msgid "Contacting OSM Server..."
msgstr "З’єднання з сервером OSM…"
+msgid "Downloading notes"
+msgstr "Завантаження нотаток"
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Не вдалося відкрити вхідний потік ресурсів ''{0}''"
@@ -15625,6 +15647,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "чагарник"
+msgctxt "natural"
+msgid "wood"
+msgstr "дерева"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "Зв’язок (вулиця)"
@@ -16154,7 +16180,7 @@ msgid "Tours - Orthophotos 2013"
msgstr "Тур - ортофото 2013"
msgid "Tours - Orthophotos 2008-2010"
-msgstr ""
+msgstr "Тур - ортофото 2008-2010"
msgid ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
@@ -16233,6 +16259,9 @@ msgstr "Знімки дронів (Гаїті)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Знімки з дрону 2014 (Гаїті)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ірландія Міністерство оборони Великобританії 1:25000 GSGS 3906"
@@ -16261,8 +16290,11 @@ msgstr "OSMIE Волості"
msgid "OSMIE Baronies"
msgstr "OSMIE Баронства"
-msgid "OSMIE Political"
-msgstr "OSMIE Політична мапа"
+msgid "OSMIE Local Election Areas"
+msgstr "OSMIE - місцеві виборчі округи"
+
+msgid "OSMIE Dail Election Areas"
+msgstr "OSMIE - виборчі округи Палати представників (Дойл Ерен)"
msgid "Lodi - Italy"
msgstr "Лоді - Італія"
@@ -16451,7 +16483,7 @@ msgid "trail.pl: Szlaki (paths)"
msgstr "trail.pl: Траси"
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
-msgstr ""
+msgstr "Вроцлав: ортофото 2015 (аерофотознімки)"
msgid "ScanEx IRS"
msgstr "ScanEx IRS"
@@ -16640,7 +16672,7 @@ msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-дюймова мапа Шотландії 1842-82"
msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
+msgstr "NLS - OS 6-дюймів County Series 1888-1913"
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - ОС 1:25000 1-й серії 1937-61"
@@ -16649,7 +16681,7 @@ msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr "NLS - ОС 1-дюймова 7-ї серії 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
-msgstr ""
+msgstr "NLS - OS 25-дюймів (Шотландія) 1892-1905"
msgid "OS 1:25k historic (OSM-Best)"
msgstr "OS 1:25000 історична (OSM-Best)"
@@ -16837,6 +16869,9 @@ msgstr "Плани міст від OS, Наїрн 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "Плани міст від OS, Обан 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr "OS Town Plans, Пейслі 1858 (NLS)"
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "Плани міст від OS, Піблз 1856 (NLS)"
@@ -16913,11 +16948,17 @@ msgid ""
"Provides Apache Commons library components. Not meant to be installed "
"directly by users, but rather as a dependency for other plugins."
msgstr ""
+"Надає бібліотеку компонентів Apache Commons. Не призначений для "
+"безпосереднього встановлення користувачами, встановлюється тільки як "
+"залежність для інших втулків."
msgid ""
"Provides Apache HTTP library. Not meant to be installed directly by users, "
"but rather as a dependency for other plugins."
msgstr ""
+"Надає бібліотеку Apache HTTP. Не призначений для безпосереднього "
+"встановлення користувачами, встановлюється тільки як залежність для інших "
+"втулків."
msgid ""
"Allows selection of areas in an layer and automatic creation of a way as "
@@ -16973,7 +17014,7 @@ msgstr ""
"(Увага: Експериментальна версія!) Інструмент для об’єднання (злиття) даних."
msgid "Downloads new data when you pan/zoom"
-msgstr ""
+msgstr "Завантажує дані під час масштабування/пересування мапою"
msgid "Create a grid of ways."
msgstr "Створює сітку з ліній."
@@ -17010,6 +17051,14 @@ msgstr ""
"Дозволяє користувачеві робити анонімними часові мітки і вилучати частини "
"великих GPX треків"
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Надає бібліотеку EJML для інший втулків JOSM. Не призначений для "
+"безпосереднього встановлення користувачами, встановлюється тільки як "
+"залежність для інших втулків."
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr "Показує профілі висот і деякі статистичні дані треку GPX."
@@ -17056,6 +17105,14 @@ msgstr "Дозволяє відфільтровувати непотрібні G
msgid "Visualizes routing information as a routing graph."
msgstr "Показує інформацію про маршрут у вигляді маршрутної діаграми."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+"Надає бібліотеку GSON для інший втулків JOSM. Не призначений для "
+"безпосереднього встановлення користувачами, встановлюється тільки як "
+"залежність для інших втулків."
+
msgid "Simple tool to tag house numbers."
msgstr "Простий інструмент для нумерування будинків."
@@ -17363,6 +17420,8 @@ msgid ""
"Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
"in OpenStreetMap"
msgstr ""
+"Додає панель to-fix (http://osmlab.github.io/to-fix/) в JOSM для виправлення "
+"помилок в OpenStreetMap"
msgid ""
"Provides helper buttons to allow working with single button mouse (stylus). "
@@ -17573,9 +17632,21 @@ msgstr "грязь"
msgid "Lanes"
msgstr "Смуги"
+msgid "Lanes in way direction"
+msgstr "Кількість смуг в напрямку лінії"
+
+msgid "Lanes opposed to way direction"
+msgstr "Кількість смуг проти напрямку лінії"
+
msgid "Max. speed (km/h)"
msgstr "Макс. швидкість (км/г)"
+msgid "Max. speed in way direction"
+msgstr "Макс. швидкість в напрямку лінії"
+
+msgid "Max. speed opposed to way direction"
+msgstr "Макс. швидкість проти напрямку лінії"
+
msgid "Bridge"
msgstr "Міст"
@@ -17638,10 +17709,13 @@ msgid "yard"
msgstr "депо"
msgid "siding"
-msgstr "запасна колія"
+msgstr "бокова колія"
msgid "spur"
-msgstr "вітка"
+msgstr "підʼїздна колія"
+
+msgid "crossover"
+msgstr "зʼєднувальна колія"
msgid "Electrified"
msgstr "Електрифікація"
@@ -17737,6 +17811,9 @@ msgstr "роздільно"
msgid "isolated"
msgstr "ізольовано"
+msgid "outside"
+msgstr "за межами"
+
msgid "Height (meters)"
msgstr "Висота (в метрах)"
@@ -18281,6 +18358,9 @@ msgstr "Платна"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "Чи водойма пересихає (періодично зникає)?"
+msgid "In the tidal range"
+msgstr "В зоні приливу"
+
msgid "culvert"
msgstr "кульверт"
@@ -18302,12 +18382,88 @@ msgstr "Моторні човни"
msgid "Canoe"
msgstr "Каное"
+msgid "Substance"
+msgstr "Речовина"
+
+msgid "water"
+msgstr "вода"
+
+msgid "gas"
+msgstr "газ"
+
+msgid "heat"
+msgstr "тепло"
+
+msgid "oil"
+msgstr "нафта"
+
+msgid "sewage"
+msgstr "каналізація"
+
+msgid "Support"
+msgstr "Розташований на"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "стовпі"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "стіні"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "дошці для оголошень"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "землі"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Дороги"
msgid "Motorway"
msgstr "Автомагістраль"
+msgid "Placement"
+msgstr "Розташування"
+
+msgid "left_of:1"
+msgstr "left_of:1"
+
+msgid "left_of:2"
+msgstr "left_of:2"
+
+msgid "left_of:3"
+msgstr "left_of:3"
+
+msgid "middle_of:1"
+msgstr "middle_of:1"
+
+msgid "middle_of:2"
+msgstr "middle_of:2"
+
+msgid "middle_of:3"
+msgstr "middle_of:3"
+
+msgid "right_of:1"
+msgstr "right_of:1"
+
+msgid "right_of:2"
+msgstr "right_of:2"
+
+msgid "right_of:3"
+msgstr "right_of:3"
+
+msgid "transition"
+msgstr "transition"
+
msgid "Motorway Link"
msgstr "З’їзд з/на Автомагістраль"
@@ -18409,6 +18565,9 @@ msgstr "проїзд на стоянці"
msgid "drive-through"
msgstr "обслуговування автомобілістів"
+msgid "emergency_access"
+msgstr "аварійний підʼїзд"
+
msgid "Parking Aisle"
msgstr "Проїзд на стоянці"
@@ -18967,12 +19126,15 @@ msgstr "Круг для розвороту"
msgid "Turning Loop"
msgstr "Кільце для розвороту"
-msgid "City Limit"
-msgstr "Знак «Межа міста»"
+msgid "City Limit Sign"
+msgstr "Знак початок/кінець населеного пункту"
msgid "Second Name"
msgstr "Друга назва"
+msgid "Speed Limit Sign"
+msgstr "Знак обмеження швидкості"
+
msgid "Speed Camera"
msgstr "Камера (радар)"
@@ -19090,6 +19252,12 @@ msgstr "Захисна огорожа"
msgid "Wall"
msgstr "Стіна"
+msgid "dry_stone"
+msgstr "суха кладка"
+
+msgid "noise_barrier"
+msgstr "шумозахисний екран"
+
msgid "City Wall"
msgstr "Міська стіна"
@@ -19498,6 +19666,15 @@ msgstr "метан"
msgid "Pier"
msgstr "Пірс"
+msgid "Mooring"
+msgstr "Причал"
+
+msgid "commercial"
+msgstr "комерційного призначення"
+
+msgid "Floating"
+msgstr "Плаваючий"
+
msgid "Lock Gate"
msgstr "Ворота шлюзу"
@@ -20138,12 +20315,6 @@ msgstr "Аеропорт"
msgid "Airport Ground"
msgstr "Територія аеропорту"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Злітно-посадкова смуга"
@@ -20327,6 +20498,9 @@ msgstr "Міні-пивоварня"
msgid "Outdoor seating"
msgstr "Місця на вулиці"
+msgid "Takeaway"
+msgstr "Страви на винос"
+
msgid "Fast Food"
msgstr "Швидке харчування"
@@ -20878,15 +21052,15 @@ msgstr "Туалет/Вбиральня"
msgctxt "restroom"
msgid "Female"
-msgstr ""
+msgstr "Жіноча"
msgctxt "restroom"
msgid "Male"
-msgstr ""
+msgstr "Чоловіча"
msgctxt "restroom"
msgid "Unisex"
-msgstr ""
+msgstr "Для жінок і чоловіків"
msgid "flush"
msgstr "зі зливом"
@@ -20989,25 +21163,6 @@ msgstr "сонячний"
msgid "unorthodox"
msgstr "незвичайний"
-msgid "Support"
-msgstr "Розташований на"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "стовпі"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "стіні"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "дошці для оголошень"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "землі"
-
msgid "Visibility/readability"
msgstr "Видно з відстані"
@@ -21587,6 +21742,14 @@ msgid "barn"
msgstr "амбар"
msgctxt "building"
+msgid "stable"
+msgstr "стайня"
+
+msgctxt "building"
+msgid "cabin"
+msgstr "халупа"
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "госп. споруда (ферма)"
@@ -21785,32 +21948,6 @@ msgstr "вино"
msgid "Bunker Silo"
msgstr "Силосна яма"
-msgid "Pipeline"
-msgstr "Трубопровід"
-
-msgid "water"
-msgstr "вода"
-
-msgid "gas"
-msgstr "газ"
-
-msgid "heat"
-msgstr "тепло"
-
-msgid "oil"
-msgstr "нафта"
-
-msgid "sewage"
-msgstr "каналізація"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "підводний"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "надземний"
-
msgid "Crane"
msgstr "Кран"
@@ -21895,6 +22032,23 @@ msgstr "Штольня"
msgid "Length in meters"
msgstr "Довжина в метрах"
+msgid "Pipeline"
+msgstr "Трубопровід"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "підводний"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "надземний"
+
+msgid "Pipeline Marker"
+msgstr "Покажчик трубопроводу"
+
+msgid "Pipeline Valve"
+msgstr "Вентиль трубопроводу"
+
msgid "Water Tower"
msgstr "Водонапірна вежа"
@@ -22135,6 +22289,34 @@ msgstr "опорно-обертальний бик"
msgid "Bridge outline"
msgstr "Контур мосту"
+msgctxt "preset group"
+msgid "Military"
+msgstr "Військові обʼєкти"
+
+msgid "Airfield"
+msgstr "Аеродром"
+
+msgid "Barracks"
+msgstr "Казарми"
+
+msgid "Bunker"
+msgstr "Бункер"
+
+msgid "pillbox"
+msgstr "дот"
+
+msgid "munitions"
+msgstr "склади"
+
+msgid "hardened_aircraft_shelter"
+msgstr "укріплений ангар"
+
+msgid "Historic"
+msgstr "історичного значення"
+
+msgid "Range"
+msgstr "Вогневий рубіж"
+
msgid "Power Plant"
msgstr "Електростанція"
@@ -23057,7 +23239,7 @@ msgid "Ticket"
msgstr "Квитки"
msgid "For the body"
-msgstr ""
+msgstr "Догляд за тілом"
msgid "Chemist"
msgstr "Побутова хімія"
@@ -23302,6 +23484,97 @@ msgstr "Dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr "Офиси"
+
+msgctxt "office"
+msgid "Accountant"
+msgstr "Бухгалтерські послуги"
+
+msgctxt "office"
+msgid "Administrative"
+msgstr "Адміністративна діяльність"
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr "Рекламна агенція"
+
+msgctxt "office"
+msgid "Architect"
+msgstr "Архітектор"
+
+msgctxt "office"
+msgid "Association"
+msgstr "Некомерційна організація"
+
+msgctxt "office"
+msgid "Private company"
+msgstr "Приватна компанія"
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr "Навчальний заклад"
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr "Бюро з працевлаштування"
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr "Агенство нерухомості"
+
+msgctxt "office"
+msgid "Foundation"
+msgstr "Фундація"
+
+msgctxt "office"
+msgid "Government"
+msgstr "Уряд"
+
+msgctxt "office"
+msgid "Insurance"
+msgstr "Страхування"
+
+msgctxt "office"
+msgid "It specialist"
+msgstr "ІТ компанія"
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr "Адвокат"
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr "Редакція газети/журнала"
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr "Неурядова громадська організація"
+
+msgctxt "office"
+msgid "Notary"
+msgstr "Нотаріус"
+
+msgctxt "office"
+msgid "Political party"
+msgstr "Політична партія"
+
+msgctxt "office"
+msgid "Religion"
+msgstr "Релігійна організація"
+
+msgctxt "office"
+msgid "Research"
+msgstr "Науково-дослідна установа"
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr "Податкова консультація"
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr "Телекомунікаційна компанія"
+
msgid "Geography"
msgstr "Географія"
@@ -23660,6 +23933,29 @@ msgstr "Двір ферми"
msgid "Farmland"
msgstr "Сільськогосподарські угіддя"
+msgid "Crop"
+msgstr "Вирощується"
+
+msgctxt "crop"
+msgid "corn"
+msgstr "кукурудза"
+
+msgctxt "crop"
+msgid "grass"
+msgstr "трава"
+
+msgctxt "crop"
+msgid "rice"
+msgstr "рис"
+
+msgctxt "crop"
+msgid "wheat"
+msgstr "пшениця"
+
+msgctxt "crop"
+msgid "hop"
+msgstr "хміль"
+
msgid "Meadow"
msgstr "Левада"
@@ -24673,6 +24969,9 @@ msgstr "{0} має бути числовим значенням"
msgid "{0} must be a positive integer number"
msgstr "{0} має бути цілим позитивним числом"
+msgid "unusual value of {0}"
+msgstr "незвичайне значення {0}"
+
msgid "relation without type"
msgstr "зв’язок без типу"
@@ -24730,6 +25029,12 @@ msgstr "Показувати назви вулиць (на великих мас
msgid "Use alternative turn restriction icon set"
msgstr "Використовувати альтернативний набір значків"
+msgid "Display fill colour of areas with place=*"
+msgstr "Показувати заповнення кольором полігонів place=*"
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr "Показувати зафарбовування полігонів тільки біля їх внутрішніх меж"
+
msgid "Columbus V-900 CSV Files"
msgstr "Файли Columbus V-900 CSV"
@@ -26898,80 +27203,99 @@ msgid "Invalid reference or subject"
msgstr "Помилковий основний чи підлеглий об’єкти"
msgid "Download OSM data continuously"
-msgstr ""
+msgstr "Безперервно завантажувати дані з OSM"
msgid "Download map data continuously when paning and zooming."
msgstr ""
+"Безперервне завантаження даних під час масштабування/пересування мапою"
msgid "Toggle the continuous download on/off"
-msgstr ""
+msgstr "Включити/Виключити безперервне завантаження даних"
msgid "Download Settings"
-msgstr ""
+msgstr "Налаштування завантаженя"
msgid "Settings for the continuous download."
-msgstr ""
+msgstr "Параметри безперервного завантаження"
msgid "Activate continuous downloads at startup."
-msgstr ""
+msgstr "Активувати під час запуску JOSM"
msgid "Supress the default modal progress monitor when downloading."
-msgstr ""
+msgstr "Не показувати діалог з прогресом завантаження даних"
msgid ""
"If this plugin is active at startup. This default state will not change when "
"you are toggeling the plugin with the menu option."
msgstr ""
+"Поведінка втулка під час запуску JOSM. Ця типова поведінка втулку не "
+"зміниться навіть, якщо ви зміните режим роботи в меню."
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
msgstr ""
+"Максимальна кількість потоків для завантаження. Збільшення цього параметра "
+"призведе до зростання кількості одночасних запитів до сервера."
+
+msgid "Requires restart"
+msgstr "Потрібне перезавантаження"
msgid "Max threads"
-msgstr ""
+msgstr "Потоки"
msgid "Maximum number of boxes to download for each pan/zoom."
msgstr ""
+"Максимальна кількість частин для завантаження для кожної зміни "
+"масштабу/пересування."
msgid "Max download boxes"
-msgstr ""
+msgstr "Частин для завантаження"
msgid ""
"Time in milliseconds after a pan/zoom before it starts downloading. "
"Additional changes in the viewport in the waiting time will reset the timer."
msgstr ""
+"Час в мілісекундах після масштабування/пересування до початку завантаження. "
+"Зміни у поточному вікні мапи під час цього періоду перезапускають таймер."
msgid "Wait time (milliseconds)"
-msgstr ""
+msgstr "Час очікування (мілісекунди)"
msgid ""
"How much extra area around the viewport is it going to download. Setting "
"this to 0 will not download any extra data."
msgstr ""
+"Показує наскільки треба відступити, щоб завантажити додаткові дані, за "
+"межами поточної ділянки. 0 - не розширювати ділянку для завантаження"
msgid "Extra download area"
-msgstr ""
+msgstr "Розширити ділянку завантаження"
msgid ""
"Max area to download in degrees^2. Increasing this number will cause the "
"plugin to download areas when you are zoomed far out."
msgstr ""
+"Максимальна площа для завантаження в градусах^2. Збільшення цього параметра "
+"призведе до завантаження даних на великих масштабах."
msgid "Max download area"
-msgstr ""
+msgstr "Максимальна площа"
msgid "The strategy for finding what areas to request from the server."
-msgstr ""
+msgstr "Алгоритм вибору ділянок для завантаження з сервера."
msgid "Download strategy"
-msgstr ""
+msgstr "Стратегія завантаження"
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
+"Не показувати індикатор завантаження. Після увімкнення цього параметру "
+"діалог з інформацією про стан завантаження даних не буде показуватись, отже "
+"у вас не буде можливості скасувати завантаження даних."
msgid "Address"
msgstr "Адреса"
@@ -28486,7 +28810,7 @@ msgid "Days"
msgstr "Дні"
msgid "Imported images"
-msgstr ""
+msgstr "Імпортовані знімки"
msgid "Mapillary filter"
msgstr "Фільтр Mapillary"
@@ -28495,7 +28819,7 @@ msgid "Open Mapillary filter dialog"
msgstr "Відкрити діалог фільтра Mapillary"
msgid "Not older than: "
-msgstr ""
+msgstr "Не старіше ніж: "
msgid "Downloaded images"
msgstr "Завантажені знімки"
@@ -28513,7 +28837,7 @@ msgid "Open Mapillary history dialog"
msgstr "Відкрити історію Mapillary"
msgid "Mapillary picture"
-msgstr ""
+msgstr "Знімок Mapillary"
msgid "Open Mapillary window"
msgstr "Відкрити вікно Mapillary"
@@ -29719,6 +30043,9 @@ msgstr "Непозначені знімки"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Бажаєте зберегти поточне калібрування для шару {0}?"
+msgid "Select an option"
+msgstr "Оберіть один з варіантів"
+
msgid "Load Picture Calibration..."
msgstr "Завантажити калібрування зображення…"
@@ -29728,6 +30055,9 @@ msgstr "Завантажити дані калібрування з файлу"
msgid "Loading file failed: {0}"
msgstr "Не вдалося завантажити файл: {0}"
+msgid "Problem occurred"
+msgstr "Виникла проблема"
+
msgid "Load World File Calibration..."
msgstr "Завантаження файлу калібрування світу…"
@@ -29772,6 +30102,9 @@ msgstr ""
"Будь ласка, використовуйте {0} для надсилання ваших KML, які неправильно "
"відкалібровані."
+msgid "Notification"
+msgstr "Повідомлення"
+
msgid "PicLayer move"
msgstr "Пересування PicLayer"
@@ -29888,7 +30221,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "Бажаєте застосувати?"
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr "Завантажити калібрувальний файл?"
msgid "It will be applied automatically."
@@ -30128,9 +30461,6 @@ msgstr "Штат"
msgid "pending"
msgstr "у черзі"
-msgid "outside"
-msgstr "за межами"
-
msgid "[incomplete]"
msgstr "[неповний]"
@@ -31114,60 +31444,62 @@ msgid "Terrace"
msgstr "Ряд будинків по вулиці"
msgid "To-fix"
-msgstr ""
+msgstr "To-fix"
msgid "Open to-fix window."
-msgstr ""
+msgstr "Відкрити панель to-fix."
msgid "Tool:To-fix"
-msgstr ""
+msgstr "Інструментl:To-fix"
msgid "Skip"
-msgstr ""
+msgstr "Пропустити"
msgid "Skip Error"
-msgstr ""
+msgstr "Пропустити помилку"
msgid "Fixed"
-msgstr ""
+msgstr "Виправлено"
msgid "Fixed Error"
-msgstr ""
+msgstr "Виправлена помилка"
msgid "Not an error"
-msgstr ""
+msgstr "Не помилка"
msgid "Set download area (m²)"
-msgstr ""
+msgstr "Ділянка для завантаження (м²)"
msgid "~.02"
-msgstr ""
+msgstr "~.02"
msgid "tofix:Skip item"
-msgstr ""
+msgstr "tofix:Пропустити"
msgid "tofix:Fixed item"
-msgstr ""
+msgstr "tofix:Виправлено"
msgid "tofix:Not a Error item"
-msgstr ""
+msgstr "tofix:Не помилка"
msgid "Maintenance server"
-msgstr ""
+msgstr "Обслуговування сервера"
msgid ""
"<html>Something went wrong, please update the plugin or report an issue at "
"<a href=\"\">josm-tofix-plugin/issues</a></html>"
msgstr ""
+"<html>Здається щось не так, оновіть втулок або сповістіть про проблему на <a "
+"href=\"\">josm-tofix-plugin/issues</a></html>"
msgid "Something went wrong, try again"
-msgstr ""
+msgstr "Здається щось не так, спробуйте ще раз"
msgid "Cannot place a node outside of the world."
msgstr "Неможливо помістити точку за межі світу."
msgid "Layer to draw OSM error"
-msgstr ""
+msgstr "Шар для показу помилок OSM"
msgid "Browse"
msgstr "Огляд"
diff --git a/i18n/po/ur.po b/i18n/po/ur.po
index 187138d..42d1451 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2010-05-13 04:15+0000\n"
"Last-Translator: Shoaib Mirza <Unknown>\n"
"Language-Team: Urdu <ur at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-10-30 05:01+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 05:02+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: ur\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -169,6 +169,12 @@ msgstr "پلگانز"
msgid "About JOSM..."
msgstr ""
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2131,13 +2137,9 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr ""
-msgid "Move elements"
-msgstr ""
-
-msgid "Move them"
-msgstr ""
-
-msgid "Undo move"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
msgstr ""
msgid ""
@@ -2151,6 +2153,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr ""
+
+msgid "Move them"
+msgstr ""
+
+msgid "Undo move"
+msgstr ""
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr ""
@@ -2345,6 +2356,9 @@ msgstr ""
msgid "add toolbar button"
msgstr ""
+msgid "Invalid search expression"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2363,9 +2377,6 @@ msgid ""
" {0}"
msgstr ""
-msgid "Invalid search expression"
-msgstr ""
-
msgid "basic examples"
msgstr ""
@@ -3160,10 +3171,10 @@ msgstr ""
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
+msgid "UNKNOWN"
msgstr ""
-msgid "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
msgstr ""
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
@@ -4757,6 +4768,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr ""
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr ""
@@ -4929,7 +4947,7 @@ msgstr ""
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
@@ -5731,20 +5749,15 @@ msgstr ""
msgid "Resolve conflicts for ''{0}''"
msgstr ""
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6976,13 +6989,16 @@ msgstr ""
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "<different>"
+msgid "Tag filter"
msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
@@ -11939,6 +11955,9 @@ msgid ""
"must be the same as in ''values''"
msgstr ""
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12101,6 +12120,9 @@ msgstr ""
msgid "Contacting OSM Server..."
msgstr ""
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13937,6 +13959,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14543,6 +14569,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14570,7 +14599,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15146,6 +15178,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15291,6 +15326,11 @@ msgid ""
"very fast."
msgstr ""
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
@@ -15329,6 +15369,11 @@ msgstr ""
msgid "Visualizes routing information as a routing graph."
msgstr ""
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr ""
@@ -15762,9 +15807,21 @@ msgstr ""
msgid "Lanes"
msgstr ""
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr ""
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr ""
@@ -15832,6 +15889,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15926,6 +15986,9 @@ msgstr ""
msgid "isolated"
msgstr ""
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr ""
@@ -16466,6 +16529,9 @@ msgstr ""
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16487,12 +16553,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr ""
+
+msgid "ICAO"
+msgstr ""
+
msgid "Streets"
msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -16594,6 +16736,9 @@ msgstr ""
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -17133,12 +17278,15 @@ msgstr ""
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
+msgid "City Limit Sign"
msgstr ""
msgid "Second Name"
msgstr ""
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr ""
@@ -17256,6 +17404,12 @@ msgstr ""
msgid "Wall"
msgstr ""
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr ""
@@ -17660,6 +17814,15 @@ msgstr ""
msgid "Pier"
msgstr ""
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr ""
@@ -18298,12 +18461,6 @@ msgstr ""
msgid "Airport Ground"
msgstr ""
-msgid "IATA"
-msgstr ""
-
-msgid "ICAO"
-msgstr ""
-
msgid "Runway"
msgstr ""
@@ -18487,6 +18644,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -19149,25 +19309,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr ""
@@ -19747,6 +19888,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -19945,32 +20094,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr ""
-
-msgid "water"
-msgstr ""
-
-msgid "gas"
-msgstr ""
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr ""
-
msgid "Crane"
msgstr ""
@@ -20055,6 +20178,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr ""
@@ -20295,6 +20435,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21460,6 +21628,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -21799,6 +22058,29 @@ msgstr ""
msgid "Farmland"
msgstr ""
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr ""
@@ -22782,6 +23064,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22837,6 +23122,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -24811,7 +25102,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24854,9 +25148,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27441,6 +27735,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr ""
@@ -27450,6 +27747,9 @@ msgstr ""
msgid "Loading file failed: {0}"
msgstr ""
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27489,6 +27789,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr ""
@@ -27602,7 +27905,7 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr ""
-msgid "Load calibration file ?"
+msgid "Load calibration file?"
msgstr ""
msgid "It will be applied automatically."
@@ -27839,9 +28142,6 @@ msgstr ""
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/po/vi.po b/i18n/po/vi.po
index 33dfaf0..9a93584 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-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-05-14 20:17+0000\n"
"Last-Translator: Mạnh <laituanmanh32 at gmail.com>\n"
"Language-Team: Vietnamese <vi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-10-30 05:02+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 05:02+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: vi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -174,6 +174,12 @@ msgstr "Plugins"
msgid "About JOSM..."
msgstr "Về JOSM ..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Không thể tải tài nguyên '' {0} '', lỗi là {1}."
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2282,14 +2288,10 @@ msgstr ""
msgid "Select, move, scale and rotate objects"
msgstr "Chọn, di chuyển, quy mô và xoay đối tượng"
-msgid "Move elements"
-msgstr "Di chuyển các yếu tố"
-
-msgid "Move them"
-msgstr "Di chuyển chúng"
-
-msgid "Undo move"
-msgstr "Hoàn tác di chuyển"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2304,6 +2306,15 @@ msgstr[0] ""
"thườngMột lỗi. \n"
"Thực sự chuyển chúng?"
+msgid "Move elements"
+msgstr "Di chuyển các yếu tố"
+
+msgid "Move them"
+msgstr "Di chuyển chúng"
+
+msgid "Undo move"
+msgstr "Hoàn tác di chuyển"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Nhả chuột để chọn các đối tượng trong hình chữ nhật."
@@ -2510,6 +2521,9 @@ msgstr ""
msgid "add toolbar button"
msgstr "nút trên thanh công cụ thêm"
+msgid "Invalid search expression"
+msgstr "biểu thức tìm kiếm không hợp lệ"
+
msgid "Filter"
msgstr "Filter"
@@ -2531,9 +2545,6 @@ msgstr ""
"\n"
"{0}"
-msgid "Invalid search expression"
-msgstr "biểu thức tìm kiếm không hợp lệ"
-
msgid "basic examples"
msgstr "ví dụ cơ bản"
@@ -3368,12 +3379,12 @@ msgstr "Imperial"
msgid "Nautical Mile"
msgstr "Nautical Mile"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "Không thể tải tài nguyên '' {0} '', lỗi là {1}."
-
msgid "UNKNOWN"
msgstr "UNKNOWN"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
"Unexpected số phiên bản JOSM trong tập tin sửa đổi, giá trị là '' {0} ''"
@@ -5051,6 +5062,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "Menu: {0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "Chỉnh sửa thanh công cụ"
@@ -5229,14 +5247,10 @@ msgstr "lên đến gạch"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<Html> Hoặc bạn có thể nhập vào <strong> địa chỉ gạch </ strong> cho mộtNgói "
-"duy nhất trong định dạng <i> zoomlevel / x / y </ i>, tức là <i> 15/256/223 "
-"</ i> Tile.Địa chỉ ở định dạng <i> zoom, x, y </ i> hoặc <i> zoom; x; y </ "
-"i> có giá trịQuá. </ Html>"
msgid "Tile address:"
msgstr "Tile địa chỉ:"
@@ -6096,26 +6110,15 @@ msgstr "Giải quyết xung đột"
msgid "Resolve conflicts for ''{0}''"
msgstr "Giải quyết xung đột cho '' {0} ''"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<Html> Vui lòng xác nhận xóa <strong> 1 đối tượng </ strong> từ <strong> "
-"1Quan hệ </ strong>. </ Html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<Html> Vui lòng xác nhận xóa <strong> 1 đối tượng </ strong> từ <strong> "
-"{0}Quan hệ </ strong>. </ Html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<Html> Vui lòng xác nhận xóa <strong> {0} đối tượng </ strong> từ <strong> "
-"{1}Quan hệ </ strong>. </ Html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -7417,14 +7420,17 @@ msgstr "Tags / Thành Viên"
msgid "Tags for selected objects."
msgstr "Thẻ cho đối tượng được chọn."
+msgid "<different>"
+msgstr "<khác nhau>"
+
msgid "Member Of"
msgstr "Member Of"
msgid "Position"
msgstr "Vị trí"
-msgid "<different>"
-msgstr "<khác nhau>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Đối tượng: {2} / Tags: {0} / Thành viên: {1}"
@@ -12833,6 +12839,9 @@ msgstr ""
"Broken tagging preset \" {0} - {1} \"- số mục trong '' display_values "
"''Phải giống như trong '' giá trị ''"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -13021,6 +13030,9 @@ msgstr "Tải điểm {0} đến {1} ..."
msgid "Contacting OSM Server..."
msgstr "Liên hệ với OSM Server ..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Không mở dòng đầu vào cho tài nguyên '' {0} ''"
@@ -15119,6 +15131,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "chà"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "associatedStreet"
@@ -15730,6 +15746,9 @@ msgstr "Drone Hình ảnh (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Hình ảnh 2014 (Haiti)"
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Văn phòng 1: 25k GSGS 3906"
@@ -15757,8 +15776,11 @@ msgstr "OSMIE dân giáo xứ"
msgid "OSMIE Baronies"
msgstr "OSMIE Baronies"
-msgid "OSMIE Political"
-msgstr "OSMIE Chính trị"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
+msgstr ""
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
@@ -16333,6 +16355,9 @@ msgstr "OS Town Kế hoạch, Nairn 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr "OS Town Kế hoạch, Oban 1867-1868 (NLS)"
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr "OS Town Kế hoạch, Peebles 1856 (NLS)"
@@ -16501,6 +16526,11 @@ msgstr ""
"Cho phép người sử dụng để ẩn tên timestamps và xóa các phần của bài hát GPX "
"khổng lồRất nhanh."
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr ""
"Hiển thị hồ sơ cá nhân cao và một số dữ liệu thống kê của một ca khúc GPX."
@@ -16548,6 +16578,11 @@ msgstr "Cho phép để lọc ra các đường GPS không cần thiết"
msgid "Visualizes routing information as a routing graph."
msgstr "hình dung thông tin định tuyến như một đồ thị định tuyến."
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "công cụ đơn giản để gắn thẻ số nhà."
@@ -17062,9 +17097,21 @@ msgstr "bùn"
msgid "Lanes"
msgstr "Làn đường"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "Max. Tốc độ (km / h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "Bridge"
@@ -17132,6 +17179,9 @@ msgstr "về phe"
msgid "spur"
msgstr "thúc đẩy"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "điện"
@@ -17226,6 +17276,9 @@ msgstr "tách biệt"
msgid "isolated"
msgstr "cô lập"
+msgid "outside"
+msgstr "bên ngoài"
+
msgid "Height (meters)"
msgstr "Chiều cao (m)"
@@ -17770,6 +17823,9 @@ msgstr "Toll"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "có phải là cơ thể nước liên tục (biến mất theo mùa)?"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr "cống"
@@ -17791,12 +17847,88 @@ msgstr "Thuyền máy"
msgid "Canoe"
msgstr "Canoe"
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "nước"
+
+msgid "gas"
+msgstr "khí"
+
+msgid "heat"
+msgstr "nhiệt"
+
+msgid "oil"
+msgstr "dầu"
+
+msgid "sewage"
+msgstr "nước thải"
+
+msgid "Support"
+msgstr "Hỗ trợ"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "cực"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "wall_mounted"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "billboard"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "mặt đất"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "Streets"
msgid "Motorway"
msgstr "Đường cao tốc"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "Đường cao tốc Liên kết"
@@ -17898,6 +18030,9 @@ msgstr "parking_aisle"
msgid "drive-through"
msgstr "drive-through"
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Parking lối đi"
@@ -18453,12 +18588,15 @@ msgstr "Quay Circle"
msgid "Turning Loop"
msgstr "Quay Loop"
-msgid "City Limit"
-msgstr "City Limit"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "Tên thứ hai"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "Speed Camera"
@@ -18578,6 +18716,12 @@ msgstr "Guard Rail"
msgid "Wall"
msgstr "Wall"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "phố Wall"
@@ -18986,6 +19130,15 @@ msgstr "CNG (Compressed Natural Gas)"
msgid "Pier"
msgstr "Pier"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "Khóa Gate"
@@ -19626,12 +19779,6 @@ msgstr "Airport"
msgid "Airport Ground"
msgstr "Airport Ground"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "Runway"
@@ -19815,6 +19962,9 @@ msgstr "Microbrewery"
msgid "Outdoor seating"
msgstr "chỗ ngồi ngoài trời"
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "Thức ăn nhanh"
@@ -20479,25 +20629,6 @@ msgstr "đồng hồ mặt trời"
msgid "unorthodox"
msgstr "không chính thống"
-msgid "Support"
-msgstr "Hỗ trợ"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "cực"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "wall_mounted"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "billboard"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "mặt đất"
-
msgid "Visibility/readability"
msgstr "Visibility / dễ đọc"
@@ -21077,6 +21208,14 @@ msgid "barn"
msgstr "chuồng"
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "farm_auxiliary"
@@ -21275,32 +21414,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr "Bunker Silo"
-msgid "Pipeline"
-msgstr "đường ống"
-
-msgid "water"
-msgstr "nước"
-
-msgid "gas"
-msgstr "khí"
-
-msgid "heat"
-msgstr "nhiệt"
-
-msgid "oil"
-msgstr "dầu"
-
-msgid "sewage"
-msgstr "nước thải"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "dưới nước"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "trên mặt đất"
-
msgid "Crane"
msgstr "Crane"
@@ -21385,6 +21498,23 @@ msgstr "Adit"
msgid "Length in meters"
msgstr "Chiều dài trong mét"
+msgid "Pipeline"
+msgstr "đường ống"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "dưới nước"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "trên mặt đất"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "tháp nước"
@@ -21625,6 +21755,34 @@ msgstr "pivot_pier"
msgid "Bridge outline"
msgstr "Cầu cương"
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "Nhà máy điện"
@@ -22792,6 +22950,97 @@ msgstr "dogecoin"
msgid "Litecoin"
msgstr "Litecoin"
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "Địa lý"
@@ -23147,6 +23396,29 @@ msgstr "chuồng"
msgid "Farmland"
msgstr "Đất nông nghiệp"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "Meadow"
@@ -24152,6 +24424,9 @@ msgstr "{0} phải là một giá trị số"
msgid "{0} must be a positive integer number"
msgstr "{0} phải là một số nguyên dương"
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr "mối quan hệ không có loại"
@@ -24209,6 +24484,12 @@ msgstr "nhãn đường Display (tại zoom cao)"
msgid "Use alternative turn restriction icon set"
msgstr "Sử dụng lần lượt thay thế biểu tượng hạn chế tập"
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV Files"
@@ -26378,7 +26659,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -26421,9 +26705,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -29143,6 +29427,9 @@ msgstr "Hình ảnh Untagged"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Bạn có muốn tiết kiệm hiệu chuẩn hiện hành của {0} lớp?"
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "Tải Ảnh Calibration ..."
@@ -29152,6 +29439,9 @@ msgstr "tải dữ liệu hiệu chuẩn từ một tập tin"
msgid "Loading file failed: {0}"
msgstr "Tải tệp không thành: {0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr "Load Thế giới tin Calibration ..."
@@ -29194,6 +29484,9 @@ msgstr ""
"chỉnh không chính xácLớp! \n"
"Vui lòng sử dụng {0} để tải KML của bạn đã được hiệu chỉnh không chính xác."
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "PicLayer di chuyển"
@@ -29312,8 +29605,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "Bạn có muốn áp dụng nó?"
-msgid "Load calibration file ?"
-msgstr "tập tin tải hiệu chuẩn?"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr "Nó sẽ được áp dụng tự động."
@@ -29552,9 +29845,6 @@ msgstr "Nhà nước"
msgid "pending"
msgstr "cấp phát"
-msgid "outside"
-msgstr "bên ngoài"
-
msgid "[incomplete]"
msgstr "[không đầy đủ]"
diff --git a/i18n/po/zh_CN.po b/i18n/po/zh_CN.po
index 7e8d400..4420f5d 100644
--- a/i18n/po/zh_CN.po
+++ b/i18n/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-10-25 07:32+0000\n"
"Last-Translator: mmyfl <Unknown>\n"
"Language-Team: 汉语 <>\n"
@@ -18,8 +18,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-10-30 05:04+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 05:05+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: zh_CN\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -174,6 +174,12 @@ msgstr "插件"
msgid "About JOSM..."
msgstr "关于 JOSM..."
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "无法加载资源“{0}”，错误为 {1}。"
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2133,14 +2139,10 @@ msgstr "将播放开头拖曳并放至要播放音频的轨迹旁；按SHIFT+释
msgid "Select, move, scale and rotate objects"
msgstr "选择、移动、缩放和旋转对象"
-msgid "Move elements"
-msgstr "移动元素"
-
-msgid "Move them"
-msgstr "移动它们"
-
-msgid "Undo move"
-msgstr "取消移动"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2154,6 +2156,15 @@ msgstr[0] ""
"您移动了多于 {0} 个的元素。移动大量元素往往是由错误造成的。\n"
"确定要移动它们吗？"
+msgid "Move elements"
+msgstr "移动元素"
+
+msgid "Move them"
+msgstr "移动它们"
+
+msgid "Undo move"
+msgstr "取消移动"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "释放鼠标按钮以选择矩形内的对象。"
@@ -2346,6 +2357,9 @@ msgstr "MapCSS 选择器"
msgid "add toolbar button"
msgstr "添加工具栏按钮"
+msgid "Invalid search expression"
+msgstr "无效的搜索表达式"
+
msgid "Filter"
msgstr "过滤器"
@@ -2367,9 +2381,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "无效的搜索表达式"
-
msgid "basic examples"
msgstr "基本示例"
@@ -3154,12 +3165,12 @@ msgstr "英制"
msgid "Nautical Mile"
msgstr "海里"
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "无法加载资源“{0}”，错误为 {1}。"
-
msgid "UNKNOWN"
msgstr "不明"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr "修订文件中有意外 JOSM 版本号，值为“{0}”"
@@ -4754,6 +4765,13 @@ msgstr "帮助(H)"
msgid "Menu: {0}"
msgstr "菜单：{0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "编辑工具栏"
@@ -4926,12 +4944,10 @@ msgstr "到瓦片"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>或者您可以为单一的瓦片输入<strong>瓦片地址</strong>，格式为<i>缩放等级/x/y</i>，即<i>15/256/223</i"
-">。瓦片地址格式<i>缩放,x,y</i> 或<i>缩放;x;y</i> 也是有效的。</html>"
msgid "Tile address:"
msgstr "瓦片地址："
@@ -5731,22 +5747,15 @@ msgstr "解决冲突"
msgid "Resolve conflicts for ''{0}''"
msgstr "调解“{0}”的冲突"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr "<html>请确认是否从<strong>1 个关系</strong>中删除<strong>1 个对象</strong>。</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>请确认是否从<strong>{0} 个关系</strong>中删除<strong>1 个对象</strong>。</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>请确认是否从<strong>{1} 个关系</strong>中删除<strong>{0} 个对象</strong>。</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6992,14 +7001,17 @@ msgstr "标签/所在关系"
msgid "Tags for selected objects."
msgstr "已选对象标签"
+msgid "<different>"
+msgstr "<不同>"
+
msgid "Member Of"
msgstr "成员"
msgid "Position"
msgstr "位置"
-msgid "<different>"
-msgstr "<不同>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "对象：{2} / 标签：{0} / 所在关系：{1}"
@@ -12035,6 +12047,9 @@ msgid ""
"must be the same as in ''values''"
msgstr "预设标签“{0}-{1}”损坏 - 在“display_values”中的项目数量必须与“values”中的相同"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12197,6 +12212,9 @@ msgstr "正在下载点 {0} 到 {1}..."
msgid "Contacting OSM Server..."
msgstr "正在连接 OSM 服务器..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "打开资源“{0}”的输入串流失败"
@@ -14052,6 +14070,10 @@ msgctxt "natural"
msgid "scrub"
msgstr "灌木"
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "关联的街道"
@@ -14658,6 +14680,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14685,7 +14710,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15261,6 +15289,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15406,6 +15437,11 @@ msgid ""
"very fast."
msgstr "允许用户非常快速的隐藏时间戳记，并删除大量 GPX 轨迹的部分。"
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr "显示 GPX 轨迹的海拔设定和一些统计数据。"
@@ -15444,6 +15480,11 @@ msgstr "允许您过滤掉不必要的 GPS 轨迹"
msgid "Visualizes routing information as a routing graph."
msgstr "以路线图显示视觉化路线信息。"
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "标记门牌号码的简单工具。"
@@ -15877,9 +15918,21 @@ msgstr "泥沼"
msgid "Lanes"
msgstr "车道数"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "限速(km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "桥梁"
@@ -15947,6 +16000,9 @@ msgstr "侧线"
msgid "spur"
msgstr "专用线"
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr "电气化"
@@ -16041,6 +16097,9 @@ msgstr "隔离"
msgid "isolated"
msgstr "远离"
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr "高度(米)"
@@ -16581,6 +16640,9 @@ msgstr "收费"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr "时令水体(季节性消失)？"
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr "暗渠"
@@ -16602,12 +16664,88 @@ msgstr "汽艇"
msgid "Canoe"
msgstr "独木舟"
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "水域"
+
+msgid "gas"
+msgstr "天然气"
+
+msgid "heat"
+msgstr "热力"
+
+msgid "oil"
+msgstr "石油"
+
+msgid "sewage"
+msgstr "污水"
+
+msgid "Support"
+msgstr "支撑"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "杆"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr "墙上"
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr "展板"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "地面"
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "街道"
msgid "Motorway"
msgstr "高速公路(Motorway)"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "高速公路连络线"
@@ -16709,6 +16847,9 @@ msgstr "停车场通道"
msgid "drive-through"
msgstr "免下车"
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "停车场通道"
@@ -17248,12 +17389,15 @@ msgstr "回旋圈"
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
-msgstr "城市边界"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "第二名称"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "测速照相"
@@ -17371,6 +17515,12 @@ msgstr "护栏"
msgid "Wall"
msgstr "墙"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "城墙"
@@ -17775,6 +17925,15 @@ msgstr "压缩天然气(CNG)"
msgid "Pier"
msgstr "渡头"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "水闸"
@@ -18413,12 +18572,6 @@ msgstr "机场"
msgid "Airport Ground"
msgstr "机场"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "跑道"
@@ -18602,6 +18755,9 @@ msgstr "自酿酒"
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "快餐"
@@ -19264,25 +19420,6 @@ msgstr "日晷"
msgid "unorthodox"
msgstr "非传统"
-msgid "Support"
-msgstr "支撑"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr "杆"
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr "墙上"
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr "展板"
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr "地面"
-
msgid "Visibility/readability"
msgstr "可见性/可读性"
@@ -19862,6 +19999,14 @@ msgid "barn"
msgstr "谷仓"
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr "农场辅助"
@@ -20060,32 +20205,6 @@ msgstr "酒"
msgid "Bunker Silo"
msgstr "邦克筒仓"
-msgid "Pipeline"
-msgstr "管道"
-
-msgid "water"
-msgstr "水域"
-
-msgid "gas"
-msgstr "天然气"
-
-msgid "heat"
-msgstr "热力"
-
-msgid "oil"
-msgstr "石油"
-
-msgid "sewage"
-msgstr "污水"
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "水下"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "地上"
-
msgid "Crane"
msgstr "起重机"
@@ -20170,6 +20289,23 @@ msgstr "坑道"
msgid "Length in meters"
msgstr "长度(米)"
+msgid "Pipeline"
+msgstr "管道"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "水下"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "地上"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "贮水塔"
@@ -20410,6 +20546,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr "发电厂"
@@ -21575,6 +21739,97 @@ msgstr "狗币"
msgid "Litecoin"
msgstr "莱特币"
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "地理"
@@ -21914,6 +22169,29 @@ msgstr "农家庭院"
msgid "Farmland"
msgstr "农田"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "牧场"
@@ -22897,6 +23175,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr "没有类型的关系"
@@ -22952,6 +23233,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV 文件"
@@ -25036,7 +25323,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -25079,9 +25369,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27678,6 +27968,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr "您想保存当前的校准层 {0} 吗？"
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "加载图片校准..."
@@ -27687,6 +27980,9 @@ msgstr "从文件加载校准数据"
msgid "Loading file failed: {0}"
msgstr "加载文件失败：{0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27726,6 +28022,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "PicLayer 移动"
@@ -27839,8 +28138,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "您想要应用它吗？"
-msgid "Load calibration file ?"
-msgstr "是否加载校准文件？"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr "它将会自动应用。"
@@ -28076,9 +28375,6 @@ msgstr "省/州"
msgid "pending"
msgstr "挂起中"
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr "[不完整]"
diff --git a/i18n/po/zh_TW.po b/i18n/po/zh_TW.po
index b9caaf3..4341c94 100644
--- a/i18n/po/zh_TW.po
+++ b/i18n/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 03:36+0100\n"
+"POT-Creation-Date: 2015-11-24 00:20+0100\n"
"PO-Revision-Date: 2015-10-26 10:58+0000\n"
"Last-Translator: Sin-di Lee <Unknown>\n"
"Language-Team: Traditional Chinese\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-10-30 05:04+0000\n"
-"X-Generator: Launchpad (build 17838)\n"
+"X-Launchpad-Export-Date: 2015-11-24 05:04+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
"Language: zh_TW\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -171,6 +171,12 @@ msgstr "外掛"
msgid "About JOSM..."
msgstr "關於 JOSM"
+msgid "Failed to locate resource ''{0}''."
+msgstr ""
+
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "無法載入資源「{0}」，錯誤為 {1}。"
+
msgid ""
"You are about to launch {0} browser window.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
@@ -2128,14 +2134,10 @@ msgstr "將播放開頭拖曳並放至要播放音效的軌跡旁；按 SHIFT+
msgid "Select, move, scale and rotate objects"
msgstr "選擇、移動、縮放和旋轉物件"
-msgid "Move elements"
-msgstr "移動元素"
-
-msgid "Move them"
-msgstr "移動它們"
-
-msgid "Undo move"
-msgstr "取消移動"
+msgid ""
+"Are you sure that you want to move elements with attached ways that are "
+"hidden by filters?"
+msgstr ""
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2148,6 +2150,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Move elements"
+msgstr "移動元素"
+
+msgid "Move them"
+msgstr "移動它們"
+
+msgid "Undo move"
+msgstr "取消移動"
+
msgid "Release the mouse button to select the objects in the rectangle."
msgstr "放開滑鼠按鈕以選擇矩形內的物件。"
@@ -2342,6 +2353,9 @@ msgstr ""
msgid "add toolbar button"
msgstr "加入工具列按鈕"
+msgid "Invalid search expression"
+msgstr "無效的搜尋表示式"
+
msgid "Filter"
msgstr "過濾條件"
@@ -2363,9 +2377,6 @@ msgstr ""
"\n"
" {0}"
-msgid "Invalid search expression"
-msgstr "無效的搜尋表示式"
-
msgid "basic examples"
msgstr "基本範例"
@@ -3156,12 +3167,12 @@ msgstr "英制"
msgid "Nautical Mile"
msgstr ""
-msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "無法載入資源「{0}」，錯誤為 {1}。"
-
msgid "UNKNOWN"
msgstr "不明"
+msgid "Error reading revision info from revision file: {0}"
+msgstr ""
+
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -4752,6 +4763,13 @@ msgstr ""
msgid "Menu: {0}"
msgstr "選單：{0}"
+msgid "Main toolbar"
+msgstr ""
+
+msgid ""
+"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
+msgstr ""
+
msgid "Edit toolbar"
msgstr "編輯工具列"
@@ -4924,12 +4942,10 @@ msgstr "到拼貼"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"single tile in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile "
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>另外您也可以將<strong>拼貼位址</strong>以 <i>zoomlevel/x/y</i> 格式輸入，例如 "
-"<i>15/256/223</i>。拼貼位址的格式用 <i>zoom,x,y</i> 或 <i>zoom;x;y</i> 也是有效的。</html>"
msgid "Tile address:"
msgstr "拼貼位址："
@@ -5722,23 +5738,15 @@ msgstr "解決衝突"
msgid "Resolve conflicts for ''{0}''"
msgstr "調解「{0}」的衝突"
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>請確認是否從 <strong>1 個關係</strong>中移除 <strong>1 個物件</strong>。</html>"
-
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>請確認是否從 <strong>{0} 個關係</strong>中移除 <strong>1 個物件</strong>。</html>"
+msgid "Please confirm to remove <strong>{0} object</strong>."
+msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
+msgstr[0] ""
+msgstr[1] ""
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>請確認是否從 <strong>{1} 個關係</strong>中移除 <strong>{0} 個物件</strong>。</html>"
+msgid "{0} relation is affected."
+msgid_plural "{0} relations are affected."
+msgstr[0] ""
+msgstr[1] ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6972,14 +6980,17 @@ msgstr "標籤/成員"
msgid "Tags for selected objects."
msgstr ""
+msgid "<different>"
+msgstr "<不同>"
+
msgid "Member Of"
msgstr "成員"
msgid "Position"
msgstr "位置"
-msgid "<different>"
-msgstr "<不同>"
+msgid "Tag filter"
+msgstr ""
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "物件: {2} / 標籤: {0} / 成員: {1}"
@@ -11989,6 +12000,9 @@ msgid ""
msgstr ""
"預先設定標籤 \"{0}-{1}\" 損毀 - 在 ''display_values'' 中的項目數量必須與 ''values'' 中的相同"
+msgid "Detailed information: {0} <> {1}"
+msgstr ""
+
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
"''short_descriptions'' must be the same as in ''values''"
@@ -12152,6 +12166,9 @@ msgstr "正在下載點 {0} 到 {1}..."
msgid "Contacting OSM Server..."
msgstr "正在連接 OSM 伺服器..."
+msgid "Downloading notes"
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "開啟資源「{0}」的輸入串流失敗"
@@ -14001,6 +14018,10 @@ msgctxt "natural"
msgid "scrub"
msgstr ""
+msgctxt "natural"
+msgid "wood"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "關聯的街道"
@@ -14607,6 +14628,9 @@ msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
+msgid "Drone Imagery Canaan(Haiti) November 2015"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr ""
@@ -14634,7 +14658,10 @@ msgstr ""
msgid "OSMIE Baronies"
msgstr ""
-msgid "OSMIE Political"
+msgid "OSMIE Local Election Areas"
+msgstr ""
+
+msgid "OSMIE Dail Election Areas"
msgstr ""
msgid "Lodi - Italy"
@@ -15210,6 +15237,9 @@ msgstr ""
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
msgstr ""
+msgid "OS Town Plans, Paisley 1858 (NLS)"
+msgstr ""
+
msgid "OS Town Plans, Peebles 1856 (NLS)"
msgstr ""
@@ -15355,6 +15385,11 @@ msgid ""
"very fast."
msgstr "允許使用者非常快速的隱藏時間戳記並刪除大量 GPX 軌跡的部分。"
+msgid ""
+"Provides the EJML library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr "顯示 GPX 軌跡的海拔設定檔和一些統計資料。"
@@ -15393,6 +15428,11 @@ msgstr "允許過濾掉不必要的 GPS 軌跡"
msgid "Visualizes routing information as a routing graph."
msgstr "以路線圖顯示視覺化路線資訊"
+msgid ""
+"Provides the GSON library for other JOSM plugins. Not meant to be installed "
+"directly by users, but rather as a dependency for other plugins."
+msgstr ""
+
msgid "Simple tool to tag house numbers."
msgstr "用來標記門牌號碼的簡單工具。"
@@ -15828,9 +15868,21 @@ msgstr "泥地"
msgid "Lanes"
msgstr "車道數"
+msgid "Lanes in way direction"
+msgstr ""
+
+msgid "Lanes opposed to way direction"
+msgstr ""
+
msgid "Max. speed (km/h)"
msgstr "最高限速 (km/h)"
+msgid "Max. speed in way direction"
+msgstr ""
+
+msgid "Max. speed opposed to way direction"
+msgstr ""
+
msgid "Bridge"
msgstr "橋"
@@ -15898,6 +15950,9 @@ msgstr ""
msgid "spur"
msgstr ""
+msgid "crossover"
+msgstr ""
+
msgid "Electrified"
msgstr ""
@@ -15992,6 +16047,9 @@ msgstr "個別"
msgid "isolated"
msgstr "分離"
+msgid "outside"
+msgstr ""
+
msgid "Height (meters)"
msgstr "高度（米）"
@@ -16532,6 +16590,9 @@ msgstr "通行費"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
+msgid "In the tidal range"
+msgstr ""
+
msgid "culvert"
msgstr ""
@@ -16553,12 +16614,88 @@ msgstr ""
msgid "Canoe"
msgstr ""
+msgid "Substance"
+msgstr ""
+
+msgid "water"
+msgstr "水域"
+
+msgid "gas"
+msgstr "天然氣"
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Support"
+msgstr "支援"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "IATA"
+msgstr "IATA"
+
+msgid "ICAO"
+msgstr "ICAO"
+
msgid "Streets"
msgstr "街道"
msgid "Motorway"
msgstr "高速公路(Motorway)"
+msgid "Placement"
+msgstr ""
+
+msgid "left_of:1"
+msgstr ""
+
+msgid "left_of:2"
+msgstr ""
+
+msgid "left_of:3"
+msgstr ""
+
+msgid "middle_of:1"
+msgstr ""
+
+msgid "middle_of:2"
+msgstr ""
+
+msgid "middle_of:3"
+msgstr ""
+
+msgid "right_of:1"
+msgstr ""
+
+msgid "right_of:2"
+msgstr ""
+
+msgid "right_of:3"
+msgstr ""
+
+msgid "transition"
+msgstr ""
+
msgid "Motorway Link"
msgstr "高速公路連絡道路"
@@ -16660,6 +16797,9 @@ msgstr "停車場通道"
msgid "drive-through"
msgstr ""
+msgid "emergency_access"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "停車場通道"
@@ -17199,12 +17339,15 @@ msgstr "迴旋圈"
msgid "Turning Loop"
msgstr ""
-msgid "City Limit"
-msgstr "城市邊界"
+msgid "City Limit Sign"
+msgstr ""
msgid "Second Name"
msgstr "第二名稱"
+msgid "Speed Limit Sign"
+msgstr ""
+
msgid "Speed Camera"
msgstr "測速照相"
@@ -17322,6 +17465,12 @@ msgstr ""
msgid "Wall"
msgstr "牆"
+msgid "dry_stone"
+msgstr ""
+
+msgid "noise_barrier"
+msgstr ""
+
msgid "City Wall"
msgstr "城牆"
@@ -17726,6 +17875,15 @@ msgstr "CNG (壓縮天然氣)"
msgid "Pier"
msgstr "渡頭"
+msgid "Mooring"
+msgstr ""
+
+msgid "commercial"
+msgstr ""
+
+msgid "Floating"
+msgstr ""
+
msgid "Lock Gate"
msgstr "調節水門"
@@ -18364,12 +18522,6 @@ msgstr "機場"
msgid "Airport Ground"
msgstr "機場地面"
-msgid "IATA"
-msgstr "IATA"
-
-msgid "ICAO"
-msgstr "ICAO"
-
msgid "Runway"
msgstr "飛機跑道"
@@ -18553,6 +18705,9 @@ msgstr ""
msgid "Outdoor seating"
msgstr ""
+msgid "Takeaway"
+msgstr ""
+
msgid "Fast Food"
msgstr "速食"
@@ -19215,25 +19370,6 @@ msgstr ""
msgid "unorthodox"
msgstr ""
-msgid "Support"
-msgstr "支援"
-
-msgctxt "mounting/support"
-msgid "pole"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "wall_mounted"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "billboard"
-msgstr ""
-
-msgctxt "mounting/support"
-msgid "ground"
-msgstr ""
-
msgid "Visibility/readability"
msgstr "能見度/可讀性"
@@ -19813,6 +19949,14 @@ msgid "barn"
msgstr ""
msgctxt "building"
+msgid "stable"
+msgstr ""
+
+msgctxt "building"
+msgid "cabin"
+msgstr ""
+
+msgctxt "building"
msgid "farm_auxiliary"
msgstr ""
@@ -20011,32 +20155,6 @@ msgstr ""
msgid "Bunker Silo"
msgstr ""
-msgid "Pipeline"
-msgstr "油管"
-
-msgid "water"
-msgstr "水域"
-
-msgid "gas"
-msgstr "天然氣"
-
-msgid "heat"
-msgstr ""
-
-msgid "oil"
-msgstr ""
-
-msgid "sewage"
-msgstr ""
-
-msgctxt "pipeline"
-msgid "underwater"
-msgstr "水下"
-
-msgctxt "pipeline"
-msgid "overground"
-msgstr "地上"
-
msgid "Crane"
msgstr "起重機"
@@ -20121,6 +20239,23 @@ msgstr ""
msgid "Length in meters"
msgstr ""
+msgid "Pipeline"
+msgstr "油管"
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr "水下"
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr "地上"
+
+msgid "Pipeline Marker"
+msgstr ""
+
+msgid "Pipeline Valve"
+msgstr ""
+
msgid "Water Tower"
msgstr "貯水塔"
@@ -20361,6 +20496,34 @@ msgstr ""
msgid "Bridge outline"
msgstr ""
+msgctxt "preset group"
+msgid "Military"
+msgstr ""
+
+msgid "Airfield"
+msgstr ""
+
+msgid "Barracks"
+msgstr ""
+
+msgid "Bunker"
+msgstr ""
+
+msgid "pillbox"
+msgstr ""
+
+msgid "munitions"
+msgstr ""
+
+msgid "hardened_aircraft_shelter"
+msgstr ""
+
+msgid "Historic"
+msgstr ""
+
+msgid "Range"
+msgstr ""
+
msgid "Power Plant"
msgstr ""
@@ -21526,6 +21689,97 @@ msgstr ""
msgid "Litecoin"
msgstr ""
+msgid "Offices"
+msgstr ""
+
+msgctxt "office"
+msgid "Accountant"
+msgstr ""
+
+msgctxt "office"
+msgid "Administrative"
+msgstr ""
+
+msgctxt "office"
+msgid "Advertising agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Architect"
+msgstr ""
+
+msgctxt "office"
+msgid "Association"
+msgstr ""
+
+msgctxt "office"
+msgid "Private company"
+msgstr ""
+
+msgctxt "office"
+msgid "Educational institution"
+msgstr ""
+
+msgctxt "office"
+msgid "Employment agency"
+msgstr ""
+
+msgctxt "office"
+msgid "Estate agent"
+msgstr ""
+
+msgctxt "office"
+msgid "Foundation"
+msgstr ""
+
+msgctxt "office"
+msgid "Government"
+msgstr ""
+
+msgctxt "office"
+msgid "Insurance"
+msgstr ""
+
+msgctxt "office"
+msgid "It specialist"
+msgstr ""
+
+msgctxt "office"
+msgid "Lawyer"
+msgstr ""
+
+msgctxt "office"
+msgid "Newspaper"
+msgstr ""
+
+msgctxt "office"
+msgid "Non-governmental organisation (NGO)"
+msgstr ""
+
+msgctxt "office"
+msgid "Notary"
+msgstr ""
+
+msgctxt "office"
+msgid "Political party"
+msgstr ""
+
+msgctxt "office"
+msgid "Religion"
+msgstr ""
+
+msgctxt "office"
+msgid "Research"
+msgstr ""
+
+msgctxt "office"
+msgid "Tax advisor"
+msgstr ""
+
+msgctxt "office"
+msgid "Telecommunication"
+msgstr ""
+
msgid "Geography"
msgstr "地理學"
@@ -21865,6 +22119,29 @@ msgstr "農家庭院"
msgid "Farmland"
msgstr "農田"
+msgid "Crop"
+msgstr ""
+
+msgctxt "crop"
+msgid "corn"
+msgstr ""
+
+msgctxt "crop"
+msgid "grass"
+msgstr ""
+
+msgctxt "crop"
+msgid "rice"
+msgstr ""
+
+msgctxt "crop"
+msgid "wheat"
+msgstr ""
+
+msgctxt "crop"
+msgid "hop"
+msgstr ""
+
msgid "Meadow"
msgstr "青草地"
@@ -22848,6 +23125,9 @@ msgstr ""
msgid "{0} must be a positive integer number"
msgstr ""
+msgid "unusual value of {0}"
+msgstr ""
+
msgid "relation without type"
msgstr ""
@@ -22903,6 +23183,12 @@ msgstr ""
msgid "Use alternative turn restriction icon set"
msgstr ""
+msgid "Display fill colour of areas with place=*"
+msgstr ""
+
+msgid "Areas are drawn with fill only around their inner edges"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV 檔案"
@@ -24939,7 +25225,10 @@ msgstr ""
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
-"the client to send more concurrint queries to the server. (Requires restart)"
+"the client to send more concurrent queries to the server."
+msgstr ""
+
+msgid "Requires restart"
msgstr ""
msgid "Max threads"
@@ -24982,9 +25271,9 @@ msgid "Download strategy"
msgstr ""
msgid ""
-"If we should supress the progress monitor that is shown when downloading. If "
-"select this option there is no indication that something is being done, and "
-"no way to cancel the download."
+"Suppress the progress monitor that is shown when downloading. If this option "
+"is selected there is no indication that something is being done, and no way "
+"to cancel the download."
msgstr ""
msgid "Address"
@@ -27581,6 +27870,9 @@ msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
+msgid "Select an option"
+msgstr ""
+
msgid "Load Picture Calibration..."
msgstr "載入相片校準..."
@@ -27590,6 +27882,9 @@ msgstr "從檔案載入校準資料"
msgid "Loading file failed: {0}"
msgstr "載入檔案失敗：{0}"
+msgid "Problem occurred"
+msgstr ""
+
msgid "Load World File Calibration..."
msgstr ""
@@ -27629,6 +27924,9 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
+msgid "Notification"
+msgstr ""
+
msgid "PicLayer move"
msgstr "PicLayer 移動"
@@ -27742,8 +28040,8 @@ msgstr ""
msgid "Do you want to apply it ?"
msgstr "您想要套用它嗎？"
-msgid "Load calibration file ?"
-msgstr "是否載入校準檔案？"
+msgid "Load calibration file?"
+msgstr ""
msgid "It will be applied automatically."
msgstr "它將會自動套用。"
@@ -27979,9 +28277,6 @@ msgstr "州"
msgid "pending"
msgstr ""
-msgid "outside"
-msgstr ""
-
msgid "[incomplete]"
msgstr ""
diff --git a/i18n/specialmessages.java b/i18n/specialmessages.java
index b3b0226..62253e9 100644
--- a/i18n/specialmessages.java
+++ b/i18n/specialmessages.java
@@ -19,6 +19,7 @@
/* Landuse type used in multipolygons */ trc("landuse", "farmland");
/* Landuse type used in multipolygons */ trc("landuse", "residential");
/* Landuse type used in multipolygons */ trc("natural", "scrub");
+/* Landuse type used in multipolygons */ trc("natural", "wood");
/* relation type */ trc("Relation type", "associatedStreet");
/* relation type */ trc("Relation type", "boundary");
/* relation type */ trc("Relation type", "bridge");
diff --git a/linux/latest/usr/bin/josm-latest b/linux/latest/usr/bin/josm-latest
index 5390e6b..36f080c 100755
--- a/linux/latest/usr/bin/josm-latest
+++ b/linux/latest/usr/bin/josm-latest
@@ -11,52 +11,36 @@ ARCH="`dpkg --print-architecture 2> /dev/null || true`"
# If OpenJDK is only available headless, do not try it
if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
- JAVA9_CMDS="/usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java"
- JAVA8_CMDS="/usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
- JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-oracle/bin/java"
+ JAVA_CMDS="$JAVA_HOME/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-oracle/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java"
else
- JAVA9_CMDS="/usr/lib/jvm/java-9-oracle/bin/java"
- JAVA8_CMDS="/usr/lib/jvm/java-8-oracle/bin/java"
- JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/bin/java"
+ JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-oracle/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-7-oracle/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
fi
JAVA_OPTS="-Djosm.restart=true -Djosm.home=$HOME/.josm-latest -Djava.net.useSystemProxies=true $JAVA_OPTS"
-for jcmd in $JAVA8_CMDS; do
- if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
- JAVACMD="$jcmd"
- fi
-done
-
-for jcmd in $JAVA8_CMDS; do
- if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
- JAVACMD="$jcmd"
- fi
-done
-
-for jcmd in $JAVA7_CMDS; do
- if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
- JAVACMD="$jcmd"
- fi
-done
-
-for jcmd in $JAVA7_CMDS; do
- if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
- JAVACMD="$jcmd"
- fi
-done
-
-for jcmd in $JAVA9_CMDS; do
- if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
- JAVACMD="$jcmd"
- fi
-done
+if [ -z "${JAVACMD}" ]; then
+ for jcmd in $JAVA_CMDS; do
+ if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
+ JAVACMD="$jcmd"
+ break
+ fi
+ done
+fi
-for jcmd in $JAVA9_CMDS; do
- if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
- JAVACMD="$jcmd"
- fi
-done
+if [ -z "${JAVACMD}" ]; then
+ for jcmd in $JAVA_CMDS; do
+ if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
+ JAVACMD="$jcmd"
+ break
+ fi
+ done
+fi
if [ "$JAVACMD" ]; then
echo "Using $JAVACMD to execute josm-latest." || true
diff --git a/linux/tested/usr/bin/josm b/linux/tested/usr/bin/josm
index 3819de7..ef903f9 100755
--- a/linux/tested/usr/bin/josm
+++ b/linux/tested/usr/bin/josm
@@ -11,52 +11,36 @@ ARCH="`dpkg --print-architecture 2> /dev/null || true`"
# If OpenJDK is only available headless, do not try it
if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
- JAVA9_CMDS="/usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java"
- JAVA8_CMDS="/usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
- JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-oracle/bin/java"
+ JAVA_CMDS="$JAVA_HOME/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-oracle/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java"
else
- JAVA9_CMDS="/usr/lib/jvm/java-9-oracle/bin/java"
- JAVA8_CMDS="/usr/lib/jvm/java-8-oracle/bin/java"
- JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/bin/java"
+ JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-oracle/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-7-oracle/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
fi
JAVA_OPTS="-Djosm.restart=true -Djava.net.useSystemProxies=true $JAVA_OPTS"
-for jcmd in $JAVA8_CMDS; do
- if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
- JAVACMD="$jcmd"
- fi
-done
-
-for jcmd in $JAVA8_CMDS; do
- if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
- JAVACMD="$jcmd"
- fi
-done
-
-for jcmd in $JAVA7_CMDS; do
- if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
- JAVACMD="$jcmd"
- fi
-done
-
-for jcmd in $JAVA7_CMDS; do
- if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
- JAVACMD="$jcmd"
- fi
-done
-
-for jcmd in $JAVA9_CMDS; do
- if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
- JAVACMD="$jcmd"
- fi
-done
+if [ -z "${JAVACMD}" ]; then
+ for jcmd in $JAVA_CMDS; do
+ if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
+ JAVACMD="$jcmd"
+ break
+ fi
+ done
+fi
-for jcmd in $JAVA9_CMDS; do
- if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
- JAVACMD="$jcmd"
- fi
-done
+if [ -z "${JAVACMD}" ]; then
+ for jcmd in $JAVA_CMDS; do
+ if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
+ JAVACMD="$jcmd"
+ break
+ fi
+ done
+fi
if [ "$JAVACMD" ]; then
echo "Using $JAVACMD to execute josm." || true
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheFactory.java b/src/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheFactory.java
index 62252b1..0b35d2b 100644
--- a/src/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheFactory.java
+++ b/src/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheFactory.java
@@ -57,9 +57,8 @@ public class BlockDiskCacheFactory
log.debug( "Creating DiskCache for attributes = " + idca );
}
- BlockDiskCache<K, V> cache = new BlockDiskCache<K, V>( idca );
+ BlockDiskCache<K, V> cache = new BlockDiskCache<K, V>( idca, elementSerializer );
cache.setCacheEventLogger( cacheEventLogger );
- cache.setElementSerializer( elementSerializer );
return cache;
}
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheFactory.java b/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheFactory.java
index 6c5888e..03f2f10 100644
--- a/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheFactory.java
+++ b/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheFactory.java
@@ -57,9 +57,8 @@ public class IndexedDiskCacheFactory
log.debug( "Creating DiskCache for attributes = " + idca );
}
- IndexedDiskCache<K, V> cache = new IndexedDiskCache<K, V>( idca );
+ IndexedDiskCache<K, V> cache = new IndexedDiskCache<K, V>( idca, elementSerializer );
cache.setCacheEventLogger( cacheEventLogger );
- cache.setElementSerializer(elementSerializer);
return cache;
}
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java
index efc5197..ffa92b9 100644
--- a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java
+++ b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java
@@ -29,9 +29,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.sql.DataSource;
import org.apache.commons.jcs.auxiliary.AuxiliaryCacheAttributes;
import org.apache.commons.jcs.auxiliary.disk.AbstractDiskCache;
+import org.apache.commons.jcs.auxiliary.disk.jdbc.dsfactory.DataSourceFactory;
import org.apache.commons.jcs.engine.CacheConstants;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
@@ -88,19 +92,19 @@ public class JDBCDiskCache<K, V>
private JDBCDiskCacheAttributes jdbcDiskCacheAttributes;
/** # of times update was called */
- private int updateCount = 0;
+ private AtomicInteger updateCount = new AtomicInteger(0);
/** # of times get was called */
- private int getCount = 0;
+ private AtomicInteger getCount = new AtomicInteger(0);
/** # of times getMatching was called */
- private int getMatchingCount = 0;
+ private AtomicInteger getMatchingCount = new AtomicInteger(0);
/** if count % interval == 0 then log */
private static final int LOG_INTERVAL = 100;
/** db connection pool */
- private JDBCDiskCachePoolAccess poolAccess = null;
+ private DataSourceFactory dsFactory = null;
/** tracks optimization */
private TableState tableState;
@@ -109,13 +113,13 @@ public class JDBCDiskCache<K, V>
* Constructs a JDBC Disk Cache for the provided cache attributes. The table state object is
* used to mark deletions.
* <p>
- * @param cattr
- * @param tableState
- * @param compositeCacheManager
- * @throws SQLException if the pool access could not be set up
+ * @param cattr the configuration object for this cache
+ * @param dsFactory the DataSourceFactory for this cache
+ * @param tableState an object to track table operations
+ * @param compositeCacheManager the global cache manager
*/
- public JDBCDiskCache( JDBCDiskCacheAttributes cattr, TableState tableState,
- ICompositeCacheManager compositeCacheManager ) throws SQLException
+ public JDBCDiskCache( JDBCDiskCacheAttributes cattr, DataSourceFactory dsFactory, TableState tableState,
+ ICompositeCacheManager compositeCacheManager )
{
super( cattr );
@@ -128,39 +132,13 @@ public class JDBCDiskCache<K, V>
}
// This initializes the pool access.
- this.poolAccess = initializePoolAccess( cattr, compositeCacheManager );
+ this.dsFactory = dsFactory;
// Initialization finished successfully, so set alive to true.
alive = true;
}
/**
- * Registers the driver and creates a poolAccess class.
- * <p>
- * @param cattr
- * @param compositeCacheManager
- * @return JDBCDiskCachePoolAccess for testing
- * @throws SQLException if a database access error occurs
- */
- protected JDBCDiskCachePoolAccess initializePoolAccess( JDBCDiskCacheAttributes cattr,
- ICompositeCacheManager compositeCacheManager ) throws SQLException
- {
- JDBCDiskCachePoolAccess poolAccess1 = null;
- if ( cattr.getConnectionPoolName() != null )
- {
- JDBCDiskCachePoolAccessManager manager = JDBCDiskCachePoolAccessManager.getInstance();
- poolAccess1 = manager.getJDBCDiskCachePoolAccess(
- cattr.getConnectionPoolName(),
- compositeCacheManager.getConfigurationProperties() );
- }
- else
- {
- poolAccess1 = JDBCDiskCachePoolAccessManager.createPoolAccess( cattr );
- }
- return poolAccess1;
- }
-
- /**
* Inserts or updates. By default it will try to insert. If the item exists we will get an
* error. It will then update. This behavior is configurable. The cache can be configured to
* check before inserting.
@@ -170,7 +148,7 @@ public class JDBCDiskCache<K, V>
@Override
protected void processUpdate( ICacheElement<K, V> ce )
{
- incrementUpdateCount();
+ updateCount.incrementAndGet();
if ( log.isDebugEnabled() )
{
@@ -180,7 +158,7 @@ public class JDBCDiskCache<K, V>
Connection con;
try
{
- con = getPoolAccess().getConnection();
+ con = getDataSource().getConnection();
}
catch ( SQLException e )
{
@@ -223,7 +201,7 @@ public class JDBCDiskCache<K, V>
if ( log.isInfoEnabled() )
{
- if ( updateCount % LOG_INTERVAL == 0 )
+ if ( updateCount.get() % LOG_INTERVAL == 0 )
{
// TODO make a log stats method
log.info( "Update Count [" + updateCount + "]" );
@@ -247,7 +225,7 @@ public class JDBCDiskCache<K, V>
// First do a query to determine if the element already exists
if ( this.getJdbcDiskCacheAttributes().isTestBeforeInsert() )
{
- exists = doesElementExist( ce );
+ exists = doesElementExist( ce, con );
}
// If it doesn't exist, insert it, otherwise update
@@ -320,7 +298,7 @@ public class JDBCDiskCache<K, V>
// see if it exists, if we didn't already
if ( !exists && !this.getJdbcDiskCacheAttributes().isTestBeforeInsert() )
{
- exists = doesElementExist( ce );
+ exists = doesElementExist( ce, con );
}
}
return exists;
@@ -372,24 +350,13 @@ public class JDBCDiskCache<K, V>
/**
* Does an element exist for this key?
* <p>
- * @param ce
+ * @param ce the cache element
+ * @param con a database connection
* @return boolean
*/
- protected boolean doesElementExist( ICacheElement<K, V> ce )
+ protected boolean doesElementExist( ICacheElement<K, V> ce, Connection con )
{
boolean exists = false;
-
- Connection con;
- try
- {
- con = getPoolAccess().getConnection();
- }
- catch ( SQLException e )
- {
- log.error( "Problem getting connection.", e );
- return exists;
- }
-
PreparedStatement psSelect = null;
try
{
@@ -432,15 +399,6 @@ public class JDBCDiskCache<K, V>
{
log.error( "Problem closing statement.", e1 );
}
-
- try
- {
- con.close();
- }
- catch ( SQLException e )
- {
- log.error( "Problem closing connection.", e );
- }
}
return exists;
@@ -456,7 +414,7 @@ public class JDBCDiskCache<K, V>
@Override
protected ICacheElement<K, V> processGet( K key )
{
- incrementGetCount();
+ getCount.incrementAndGet();
if ( log.isDebugEnabled() )
{
@@ -477,7 +435,7 @@ public class JDBCDiskCache<K, V>
String selectString = "select ELEMENT from " + getJdbcDiskCacheAttributes().getTableName()
+ " where REGION = ? and CACHE_KEY = ?";
- Connection con = getPoolAccess().getConnection();
+ Connection con = getDataSource().getConnection();
try
{
PreparedStatement psSelect = null;
@@ -542,7 +500,7 @@ public class JDBCDiskCache<K, V>
if ( log.isInfoEnabled() )
{
- if ( getCount % LOG_INTERVAL == 0 )
+ if ( getCount.get() % LOG_INTERVAL == 0 )
{
// TODO make a log stats method
log.info( "Get Count [" + getCount + "]" );
@@ -561,7 +519,7 @@ public class JDBCDiskCache<K, V>
@Override
protected Map<K, ICacheElement<K, V>> processGetMatching( String pattern )
{
- incrementGetMatchingCount();
+ getMatchingCount.incrementAndGet();
if ( log.isDebugEnabled() )
{
@@ -581,7 +539,7 @@ public class JDBCDiskCache<K, V>
String selectString = "select CACHE_KEY, ELEMENT from " + getJdbcDiskCacheAttributes().getTableName()
+ " where REGION = ? and CACHE_KEY like ?";
- Connection con = getPoolAccess().getConnection();
+ Connection con = getDataSource().getConnection();
try
{
PreparedStatement psSelect = null;
@@ -648,7 +606,7 @@ public class JDBCDiskCache<K, V>
if ( log.isInfoEnabled() )
{
- if ( getMatchingCount % LOG_INTERVAL == 0 )
+ if ( getMatchingCount.get() % LOG_INTERVAL == 0 )
{
// TODO make a log stats method
log.info( "Get Matching Count [" + getMatchingCount + "]" );
@@ -698,7 +656,7 @@ public class JDBCDiskCache<K, V>
+ " where REGION = ? and CACHE_KEY like ?";
partial = true;
}
- Connection con = getPoolAccess().getConnection();
+ Connection con = getDataSource().getConnection();
PreparedStatement psSelect = null;
try
{
@@ -759,7 +717,7 @@ public class JDBCDiskCache<K, V>
try
{
String sql = "delete from " + getJdbcDiskCacheAttributes().getTableName() + " where REGION = ?";
- Connection con = getPoolAccess().getConnection();
+ Connection con = getDataSource().getConnection();
PreparedStatement psDelete = null;
try
{
@@ -828,7 +786,7 @@ public class JDBCDiskCache<K, V>
String sql = "delete from " + getJdbcDiskCacheAttributes().getTableName()
+ " where IS_ETERNAL = ? and REGION = ? and ? > SYSTEM_EXPIRE_TIME_SECONDS";
- Connection con = getPoolAccess().getConnection();
+ Connection con = getDataSource().getConnection();
PreparedStatement psDelete = null;
try
{
@@ -896,9 +854,9 @@ public class JDBCDiskCache<K, V>
{
try
{
- getPoolAccess().shutdownDriver();
+ dsFactory.close();
}
- catch ( Exception e )
+ catch ( SQLException e )
{
log.error( "Problem shutting down.", e );
}
@@ -923,20 +881,17 @@ public class JDBCDiskCache<K, V>
String selectString = "select count(*) from " + getJdbcDiskCacheAttributes().getTableName()
+ " where REGION = ?";
- final JDBCDiskCachePoolAccess pool = getPoolAccess();
- if (pool == null) {
- return size;
- }
Connection con;
try
{
- con = pool.getConnection();
+ con = getDataSource().getConnection();
}
- catch ( SQLException e1 )
+ catch ( SQLException e )
{
- log.error( "Problem getting connection.", e1 );
+ log.error( "Problem getting connection.", e );
return size;
}
+
try
{
PreparedStatement psSelect = null;
@@ -1018,24 +973,6 @@ public class JDBCDiskCache<K, V>
return elementSerializer;
}
- /** safely increment */
- private synchronized void incrementUpdateCount()
- {
- updateCount++;
- }
-
- /** safely increment */
- private synchronized void incrementGetCount()
- {
- getCount++;
- }
-
- /** safely increment */
- private synchronized void incrementGetMatchingCount()
- {
- getMatchingCount++;
- }
-
/**
* @param jdbcDiskCacheAttributes The jdbcDiskCacheAttributes to set.
*/
@@ -1074,20 +1011,10 @@ public class JDBCDiskCache<K, V>
List<IStatElement<?>> elems = stats.getStatElements();
- elems.add(new StatElement<Integer>( "Update Count", Integer.valueOf(updateCount) ) );
- elems.add(new StatElement<Integer>( "Get Count", Integer.valueOf(getCount) ) );
- elems.add(new StatElement<Integer>( "Get Matching Count", Integer.valueOf(getMatchingCount) ) );
-
- final JDBCDiskCachePoolAccess pool = getPoolAccess();
-
- elems.add(new StatElement<Integer>( "Size",
- Integer.valueOf(pool != null ? getSize() : -1) ) );
- elems.add(new StatElement<Integer>( "Active DB Connections",
- Integer.valueOf(pool != null ? pool.getNumActiveInPool() : -1) ) );
- elems.add(new StatElement<Integer>( "Idle DB Connections",
- Integer.valueOf(pool != null ? pool.getNumIdleInPool() : -1) ) );
- elems.add(new StatElement<String>( "DB URL",
- pool != null ? pool.getPoolUrl() : getJdbcDiskCacheAttributes().getUrl()) );
+ elems.add(new StatElement<AtomicInteger>( "Update Count", updateCount ) );
+ elems.add(new StatElement<AtomicInteger>( "Get Count", getCount ) );
+ elems.add(new StatElement<AtomicInteger>( "Get Matching Count", getMatchingCount ) );
+ elems.add(new StatElement<String>( "DB URL", getJdbcDiskCacheAttributes().getUrl()) );
stats.setStatElements( elems );
@@ -1138,11 +1065,12 @@ public class JDBCDiskCache<K, V>
/**
* Public so managers can access it.
- * @return the poolAccess
+ * @return the dsFactory
+ * @throws SQLException if getting a data source fails
*/
- public JDBCDiskCachePoolAccess getPoolAccess()
+ public DataSource getDataSource() throws SQLException
{
- return poolAccess;
+ return dsFactory.getDataSource();
}
/**
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheAttributes.java b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheAttributes.java
index a00622e..8eeba42 100644
--- a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheAttributes.java
+++ b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheAttributes.java
@@ -50,6 +50,12 @@ public class JDBCDiskCacheAttributes
/** The driver */
private String driverClassName;
+ /** The JNDI path. */
+ private String jndiPath;
+
+ /** The time between two JNDI lookups */
+ private long jndiTTL = 0L;
+
/** The table name */
private String tableName = DEFAULT_TABLE_NAME;
@@ -69,7 +75,10 @@ public class JDBCDiskCacheAttributes
private int shrinkerIntervalSeconds = DEFAULT_SHRINKER_INTERVAL_SECONDS;
/** Should we remove expired in the background. */
- private boolean UseDiskShrinker = true;
+ private boolean useDiskShrinker = true;
+
+ /** The default Pool Name to which the connection pool will be keyed. */
+ public static final String DEFAULT_POOL_NAME = "jcs";
/**
* If a pool name is supplied, the manager will attempt to load it. It should be configured in a
@@ -167,6 +176,38 @@ public class JDBCDiskCacheAttributes
}
/**
+ * @return the jndiPath
+ */
+ public String getJndiPath()
+ {
+ return jndiPath;
+ }
+
+ /**
+ * @param jndiPath the jndiPath to set
+ */
+ public void setJndiPath(String jndiPath)
+ {
+ this.jndiPath = jndiPath;
+ }
+
+ /**
+ * @return the jndiTTL
+ */
+ public long getJndiTTL()
+ {
+ return jndiTTL;
+ }
+
+ /**
+ * @param jndiTTL the jndiTTL to set
+ */
+ public void setJndiTTL(long jndiTTL)
+ {
+ this.jndiTTL = jndiTTL;
+ }
+
+ /**
* @param tableName The tableName to set.
*/
public void setTableName( String tableName )
@@ -238,7 +279,7 @@ public class JDBCDiskCacheAttributes
*/
public void setUseDiskShrinker( boolean useDiskShrinker )
{
- UseDiskShrinker = useDiskShrinker;
+ this.useDiskShrinker = useDiskShrinker;
}
/**
@@ -246,7 +287,7 @@ public class JDBCDiskCacheAttributes
*/
public boolean isUseDiskShrinker()
{
- return UseDiskShrinker;
+ return useDiskShrinker;
}
/**
@@ -284,7 +325,7 @@ public class JDBCDiskCacheAttributes
buf.append( "\n MaxActive [" + getMaxActive() + "]" );
buf.append( "\n AllowRemoveAll [" + isAllowRemoveAll() + "]" );
buf.append( "\n ShrinkerIntervalSeconds [" + getShrinkerIntervalSeconds() + "]" );
- buf.append( "\n UseDiskShrinker [" + isUseDiskShrinker() + "]" );
+ buf.append( "\n useDiskShrinker [" + isUseDiskShrinker() + "]" );
return buf.toString();
}
}
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java
index 70cd813..852c516 100644
--- a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java
+++ b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java
@@ -20,28 +20,33 @@ package org.apache.commons.jcs.auxiliary.disk.jdbc;
*/
import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.Executors;
+import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.apache.commons.jcs.auxiliary.AbstractAuxiliaryCacheFactory;
import org.apache.commons.jcs.auxiliary.AuxiliaryCacheAttributes;
+import org.apache.commons.jcs.auxiliary.disk.jdbc.dsfactory.DataSourceFactory;
+import org.apache.commons.jcs.auxiliary.disk.jdbc.dsfactory.JndiDataSourceFactory;
+import org.apache.commons.jcs.auxiliary.disk.jdbc.dsfactory.SharedPoolDataSourceFactory;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs.engine.behavior.IElementSerializer;
+import org.apache.commons.jcs.engine.behavior.IRequireScheduler;
import org.apache.commons.jcs.engine.logging.behavior.ICacheEventLogger;
-import org.apache.commons.jcs.utils.threadpool.DaemonThreadFactory;
+import org.apache.commons.jcs.utils.config.PropertySetter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
- * This factory should create mysql disk caches.
+ * This factory should create JDBC auxiliary caches.
* <p>
* @author Aaron Smuts
*/
public class JDBCDiskCacheFactory
extends AbstractAuxiliaryCacheFactory
+ implements IRequireScheduler
{
/** The logger */
private static final Log log = LogFactory.getLog( JDBCDiskCacheFactory.class );
@@ -50,25 +55,34 @@ public class JDBCDiskCacheFactory
* A map of TableState objects to table names. Each cache has a table state object, which is
* used to determine if any long processes such as deletes or optimizations are running.
*/
- private Map<String, TableState> tableStates;
+ private ConcurrentMap<String, TableState> tableStates;
- /** The background scheduler, one for all regions. */
- protected ScheduledExecutorService scheduler; // TODO this is not accessed in a threadsafe way. Perhaps use IODH idiom?
+ /** The background scheduler, one for all regions. Injected by the configurator */
+ protected ScheduledExecutorService scheduler;
/**
* A map of table name to shrinker threads. This allows each table to have a different setting.
* It assumes that there is only one jdbc disk cache auxiliary defined per table.
*/
- private Map<String, ShrinkerThread> shrinkerThreadMap;
+ private ConcurrentMap<String, ShrinkerThread> shrinkerThreadMap;
+
+ /** Pool name to DataSourceFactories */
+ private ConcurrentMap<String, DataSourceFactory> dsFactories;
+
+ /** props prefix */
+ protected static final String POOL_CONFIGURATION_PREFIX = "jcs.jdbcconnectionpool.";
+
+ /** .attributes */
+ protected static final String ATTRIBUTE_PREFIX = ".attributes";
/**
* This factory method should create an instance of the jdbc cache.
* <p>
- * @param rawAttr
- * @param compositeCacheManager
- * @param cacheEventLogger
- * @param elementSerializer
- * @return JDBCDiskCache
+ * @param rawAttr specific cache configuration attributes
+ * @param compositeCacheManager the global cache manager
+ * @param cacheEventLogger a specific logger for cache events
+ * @param elementSerializer a serializer for cache elements
+ * @return JDBCDiskCache the cache instance
* @throws SQLException if the cache instance could not be created
*/
@Override
@@ -79,8 +93,9 @@ public class JDBCDiskCacheFactory
{
JDBCDiskCacheAttributes cattr = (JDBCDiskCacheAttributes) rawAttr;
TableState tableState = getTableState( cattr.getTableName() );
+ DataSourceFactory dsFactory = getDataSourceFactory(cattr, compositeCacheManager.getConfigurationProperties());
- JDBCDiskCache<K, V> cache = new JDBCDiskCache<K, V>( cattr, tableState, compositeCacheManager );
+ JDBCDiskCache<K, V> cache = new JDBCDiskCache<K, V>( cattr, dsFactory, tableState, compositeCacheManager );
cache.setCacheEventLogger( cacheEventLogger );
cache.setElementSerializer( elementSerializer );
@@ -97,8 +112,9 @@ public class JDBCDiskCacheFactory
public void initialize()
{
super.initialize();
- this.tableStates = new HashMap<String, TableState>();
- this.shrinkerThreadMap = new HashMap<String, ShrinkerThread>();
+ this.tableStates = new ConcurrentHashMap<String, TableState>();
+ this.shrinkerThreadMap = new ConcurrentHashMap<String, ShrinkerThread>();
+ this.dsFactories = new ConcurrentHashMap<String, DataSourceFactory>();
}
/**
@@ -107,11 +123,22 @@ public class JDBCDiskCacheFactory
@Override
public void dispose()
{
- if (this.scheduler != null)
+ this.tableStates.clear();
+
+ for (DataSourceFactory dsFactory : this.dsFactories.values())
{
- this.scheduler.shutdownNow();
- this.scheduler = null;
+ try
+ {
+ dsFactory.close();
+ }
+ catch (SQLException e)
+ {
+ log.error("Could not close data source factory " + dsFactory.getName(), e);
+ }
}
+
+ this.dsFactories.clear();
+ this.shrinkerThreadMap.clear();
super.dispose();
}
@@ -123,30 +150,33 @@ public class JDBCDiskCacheFactory
*/
protected TableState getTableState(String tableName)
{
- TableState tableState = tableStates.get( tableName );
+ TableState newTableState = new TableState( tableName );
+ TableState tableState = tableStates.putIfAbsent( tableName, newTableState );
if ( tableState == null )
{
- tableState = new TableState( tableName );
- tableStates.put(tableName, tableState);
+ tableState = newTableState;
}
return tableState;
}
/**
- * Get the scheduler service (lazily loaded)
+ * @see org.apache.commons.jcs.engine.behavior.IRequireScheduler#setScheduledExecutorService(java.util.concurrent.ScheduledExecutorService)
+ */
+ @Override
+ public void setScheduledExecutorService(ScheduledExecutorService scheduledExecutor)
+ {
+ this.scheduler = scheduledExecutor;
+ }
+
+ /**
+ * Get the scheduler service
*
* @return the scheduler
*/
protected ScheduledExecutorService getScheduledExecutorService()
{
- if ( scheduler == null )
- {
- scheduler = Executors.newScheduledThreadPool(2,
- new DaemonThreadFactory("JCS-JDBCDiskCacheManager-", Thread.MIN_PRIORITY));
- }
-
return scheduler;
}
@@ -162,11 +192,12 @@ public class JDBCDiskCacheFactory
if ( cattr.isUseDiskShrinker() )
{
ScheduledExecutorService shrinkerService = getScheduledExecutorService();
- ShrinkerThread shrinkerThread = shrinkerThreadMap.get( cattr.getTableName() );
+ ShrinkerThread newShrinkerThread = new ShrinkerThread();
+ ShrinkerThread shrinkerThread = shrinkerThreadMap.putIfAbsent( cattr.getTableName(), newShrinkerThread );
+
if ( shrinkerThread == null )
{
- shrinkerThread = new ShrinkerThread();
- shrinkerThreadMap.put( cattr.getTableName(), shrinkerThread );
+ shrinkerThread = newShrinkerThread;
long intervalMillis = Math.max( 999, cattr.getShrinkerIntervalSeconds() * 1000 );
if ( log.isInfoEnabled() )
@@ -176,7 +207,70 @@ public class JDBCDiskCacheFactory
}
shrinkerService.scheduleAtFixedRate(shrinkerThread, 0, intervalMillis, TimeUnit.MILLISECONDS);
}
+
shrinkerThread.addDiskCacheToShrinkList( raf );
}
}
+
+ /**
+ * manages the DataSourceFactories.
+ * <p>
+ * @param cattr the cache configuration
+ * @param configProps the configuration properties object
+ * @return a DataSourceFactory
+ * @throws SQLException if a database access error occurs
+ */
+ protected DataSourceFactory getDataSourceFactory( JDBCDiskCacheAttributes cattr,
+ Properties configProps ) throws SQLException
+ {
+ String poolName = null;
+
+ if (cattr.getConnectionPoolName() == null)
+ {
+ poolName = cattr.getCacheName() + "." + JDBCDiskCacheAttributes.DEFAULT_POOL_NAME;
+ }
+ else
+ {
+ poolName = cattr.getConnectionPoolName();
+ }
+
+ synchronized (this.dsFactories)
+ {
+ DataSourceFactory dsFactory = this.dsFactories.get(poolName);
+
+ if (dsFactory == null)
+ {
+ JDBCDiskCacheAttributes dsConfig = null;
+
+ if (cattr.getConnectionPoolName() == null)
+ {
+ dsConfig = cattr;
+ }
+ else
+ {
+ dsConfig = new JDBCDiskCacheAttributes();
+ String dsConfigAttributePrefix = POOL_CONFIGURATION_PREFIX + poolName + ATTRIBUTE_PREFIX;
+ PropertySetter.setProperties( dsConfig,
+ configProps,
+ dsConfigAttributePrefix + "." );
+
+ dsConfig.setConnectionPoolName(poolName);
+ }
+
+ if ( dsConfig.getJndiPath() != null )
+ {
+ dsFactory = new JndiDataSourceFactory();
+ }
+ else
+ {
+ dsFactory = new SharedPoolDataSourceFactory();
+ }
+
+ dsFactory.initialize(dsConfig);
+ this.dsFactories.put(poolName, dsFactory);
+ }
+
+ return dsFactory;
+ }
+ }
}
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccess.java b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccess.java
deleted file mode 100644
index 52d1b5b..0000000
--- a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccess.java
+++ /dev/null
@@ -1,271 +0,0 @@
-package org.apache.commons.jcs.auxiliary.disk.jdbc;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.commons.dbcp.ConnectionFactory;
-import org.apache.commons.dbcp.DriverManagerConnectionFactory;
-import org.apache.commons.dbcp.PoolableConnectionFactory;
-import org.apache.commons.dbcp.PoolingDriver;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.pool.ObjectPool;
-import org.apache.commons.pool.impl.GenericObjectPool;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-/**
- * This class provides access to the connection pool. It ensures that the various resources that
- * need to access the tables will be able to use the same pool.
- * <p>
- * @author Aaron Smuts
- */
-public class JDBCDiskCachePoolAccess
-{
- /** The logger. */
- private static final Log log = LogFactory.getLog( JDBCDiskCachePoolAccess.class );
-
- /** The default Pool Name to which the connection pool will be keyed. */
- public static final String DEFAULT_POOL_NAME = "jcs";
-
- /** The name of the pool. */
- private String poolName = DEFAULT_POOL_NAME;
-
- /** default jdbc driver. */
- private static final String DRIVER_NAME = "jdbc:apache:commons:dbcp:";
-
- /**
- * Configures the pool name to use for the pool access.
- * <p>
- * This pool name should be unique to the database. It is used as part of the URL each time we
- * lookup a connection from the driver manager.
- * <p>
- * @param poolName
- */
- public JDBCDiskCachePoolAccess( String poolName )
- {
- // we can default to jcs if there is only one database in use.
- if ( poolName != null )
- {
- setPoolName( poolName );
- }
- else
- {
- if ( log.isInfoEnabled() )
- {
- log.info( "The pool name supplied was null. Using default instead." );
- }
- }
- }
-
- /**
- * Gets a connection from the pool.
- * <p>
- * @return Connection
- * @throws SQLException
- */
- public Connection getConnection()
- throws SQLException
- {
- Connection con;
- try
- {
- con = DriverManager.getConnection( getPoolUrl() );
- }
- catch ( SQLException e )
- {
- log.error( "Problem getting connection.", e );
- throw e;
- }
-
- return con;
- }
-
- /**
- * How many are idle in the pool.
- * <p>
- * @return number idle
- */
- public int getNumIdleInPool()
- {
- int numIdle = 0;
- try
- {
- PoolingDriver driver = (PoolingDriver) DriverManager.getDriver( DRIVER_NAME );
- ObjectPool connectionPool = driver.getConnectionPool( this.getPoolName() );
-
- if ( log.isDebugEnabled() )
- {
- log.debug( connectionPool );
- }
- numIdle = connectionPool.getNumIdle();
- }
- catch ( SQLException e )
- {
- log.error( e );
- }
- return numIdle;
- }
-
- /**
- * How many are active in the pool.
- * <p>
- * @return number active
- */
- public int getNumActiveInPool()
- {
- int numActive = 0;
- try
- {
- PoolingDriver driver = (PoolingDriver) DriverManager.getDriver( DRIVER_NAME );
- ObjectPool connectionPool = driver.getConnectionPool( this.getPoolName() );
-
- if ( log.isDebugEnabled() )
- {
- log.debug( connectionPool );
- }
- numActive = connectionPool.getNumActive();
- }
- catch ( SQLException e )
- {
- log.error( e );
- }
- return numActive;
- }
-
- /**
- * @throws Exception
- */
- public void shutdownDriver()
- throws SQLException
- {
- PoolingDriver driver = (PoolingDriver) DriverManager.getDriver( DRIVER_NAME );
- driver.closePool( this.getPoolName() );
- }
-
- /**
- * @return Returns the poolUrl.
- */
- public String getPoolUrl()
- {
- return DRIVER_NAME + this.getPoolName();
- }
-
- /**
- * @param poolName The poolName to set.
- */
- public void setPoolName( String poolName ) // TODO does it make sense to change the pool name after construction?
- {
- this.poolName = poolName;
- }
-
- /**
- * @return Returns the poolName.
- */
- public String getPoolName()
- {
- return poolName;
- }
-
- /**
- * @param connectURI
- * @param userName
- * @param password
- * @param maxActive max connections
- * @throws SQLException if a database access error occurs
- */
- public void setupDriver( String connectURI, String userName, String password, int maxActive )
- throws SQLException
- {
- // First, we'll need a ObjectPool that serves as the
- // actual pool of connections.
- // We'll use a GenericObjectPool instance, although
- // any ObjectPool implementation will suffice.
- ObjectPool connectionPool = new GenericObjectPool( null, maxActive );
-
- // TODO make configurable
- // By default the size is 8!!!!!!!
- ( (GenericObjectPool) connectionPool ).setMaxIdle( -1 );
-
- // Next, we'll create a ConnectionFactory that the
- // pool will use to create Connections.
- // We'll use the DriverManagerConnectionFactory,
- // using the connect string passed in the command line
- // arguments.
- // Properties props = new Properties();
- // props.setProperty( "user", userName );
- // props.setProperty( "password", password );
- ConnectionFactory connectionFactory = new DriverManagerConnectionFactory( connectURI, userName, password );
-
- // Now we'll create the PoolableConnectionFactory, which wraps
- // the "real" Connections created by the ConnectionFactory with
- // the classes that implement the pooling functionality.
- // PoolableConnectionFactory poolableConnectionFactory =
- new PoolableConnectionFactory( connectionFactory, connectionPool, null, null, false, true );
-
- // Finally, we create the PoolingDriver itself...
- try
- {
- // com.mysql.jdbc.Driver
- Class.forName( "org.apache.commons.dbcp.PoolingDriver" );
- }
- catch ( ClassNotFoundException e )
- {
- throw new SQLException("Couldn't find class for driver [org.apache.commons.dbcp.PoolingDriver]", e );
- }
- PoolingDriver driver = (PoolingDriver) DriverManager.getDriver( DRIVER_NAME );
-
- // ...and register our pool with it.
- driver.registerPool( this.getPoolName(), connectionPool );
-
- // Now we can just use the connect string
- // "jdbc:apache:commons:dbcp:jcs"
- // to access our pool of Connections.
- }
-
- /**
- * @throws Exception
- */
- public void logDriverStats()
- throws SQLException
- {
- PoolingDriver driver = (PoolingDriver) DriverManager.getDriver( DRIVER_NAME );
- ObjectPool connectionPool = driver.getConnectionPool( this.getPoolName() );
-
- if ( connectionPool != null )
- {
- if ( log.isDebugEnabled() )
- {
- log.debug( connectionPool );
- }
-
- if ( log.isInfoEnabled() )
- {
- log.info( "NumActive: " + getNumActiveInPool() );
- log.info( "NumIdle: " + getNumIdleInPool() );
- }
- }
- else
- {
- log.warn( "Could not find pool." );
- }
- }
-}
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccessAttributes.java b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccessAttributes.java
deleted file mode 100644
index 251bd21..0000000
--- a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccessAttributes.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package org.apache.commons.jcs.auxiliary.disk.jdbc;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/** These are used to configure the JDBCDiskCachePoolAccess class. */
-public class JDBCDiskCachePoolAccessAttributes
-{
- /** The name of the pool. */
- private String poolName;
-
- /** URI to the db. */
- private String url;
-
- /** username for the db */
- private String userName;
-
- /** password for the database */
- private String password;
-
- /** This is the default limit on the maximum number of active connections. */
- public static final int DEFAULT_MAX_ACTIVE = 10;
-
- /** Max connections allowed */
- private int maxActive = DEFAULT_MAX_ACTIVE;
-
- /** The name of the database. */
- private String database = "";
-
- /** The driver */
- private String driverClassName;
-
- /**
- * @param poolName the poolName to set
- */
- public void setPoolName( String poolName )
- {
- this.poolName = poolName;
- }
-
- /**
- * @return the poolName
- */
- public String getPoolName()
- {
- return poolName;
- }
-
- /**
- * @param connectURI the connectURI to set
- */
- public void setUrl( String connectURI )
- {
- this.url = connectURI;
- }
-
- /**
- * @return the connectURI
- */
- public String getUrl()
- {
- return url;
- }
-
- /**
- * @param userName the userName to set
- */
- public void setUserName( String userName )
- {
- this.userName = userName;
- }
-
- /**
- * @return the userName
- */
- public String getUserName()
- {
- return userName;
- }
-
- /**
- * @param password the password to set
- */
- public void setPassword( String password )
- {
- this.password = password;
- }
-
- /**
- * @return the password
- */
- public String getPassword()
- {
- return password;
- }
-
- /**
- * @param maxActive the maxActive to set
- */
- public void setMaxActive( int maxActive )
- {
- this.maxActive = maxActive;
- }
-
- /**
- * @return the maxActive
- */
- public int getMaxActive()
- {
- return maxActive;
- }
-
- /**
- * @param database the database to set
- */
- public void setDatabase( String database )
- {
- this.database = database;
- }
-
- /**
- * @return the database
- */
- public String getDatabase()
- {
- return database;
- }
-
- /**
- * @param driverClassName the driverClassName to set
- */
- public void setDriverClassName( String driverClassName )
- {
- this.driverClassName = driverClassName;
- }
-
- /**
- * @return the driverClassName
- */
- public String getDriverClassName()
- {
- return driverClassName;
- }
-
- /**
- * For debugging.
- * <p>
- * @return debug string with most of the properties.
- */
- @Override
- public String toString()
- {
- StringBuilder buf = new StringBuilder();
- buf.append( "\nJDBCDiskCachePoolAccessAttributes" );
- buf.append( "\n UserName [" + getUserName() + "]" );
- buf.append( "\n Url [" + getUrl() + "]" );
- buf.append( "\n PoolName [" + getPoolName() + "]" );
- buf.append( "\n Database [" + getDatabase() + "]" );
- buf.append( "\n DriverClassName [" + getDriverClassName() + "]" );
- buf.append( "\n MaxActive [" + getMaxActive() + "]" );
- return buf.toString();
- }
-}
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccessManager.java b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccessManager.java
deleted file mode 100644
index f010cc3..0000000
--- a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccessManager.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package org.apache.commons.jcs.auxiliary.disk.jdbc;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.sql.SQLException;
-import org.apache.commons.jcs.utils.config.PropertySetter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * Manages JDBCDiskCachePoolAccess instances. If a connectionPoolName value is supplied, the JDBC
- * disk cache will try to use this manager to create a pool. Assuming the name is "MyPool":
- *
- * <pre>
- * jcs.jdbcconnectionpool.MyPool.attributes.userName=MyUserName
- * jcs.jdbcconnectionpool.MyPool.attributes.password=MyPassword
- * jcs.jdbcconnectionpool.MyPool.attributes.url=MyUrl
- * jcs.jdbcconnectionpool.MyPool.attributes.maxActive=MyMaxActive
- * jcs.jdbcconnectionpool.MyPool.attributes.driverClassName=MyDriverClassName
- * </pre>
- */
-public class JDBCDiskCachePoolAccessManager
-{
- /** Singleton instance */
- private static JDBCDiskCachePoolAccessManager instance;
-
- /** Pool name to JDBCDiskCachePoolAccess */
- private final Map<String, JDBCDiskCachePoolAccess> pools = new HashMap<String, JDBCDiskCachePoolAccess>();
-
- /** props prefix */
- public static final String POOL_CONFIGURATION_PREFIX = "jcs.jdbcconnectionpool.";
-
- /** .attributes */
- public static final String ATTRIBUTE_PREFIX = ".attributes";
-
- /** The logger. */
- private static final Log log = LogFactory.getLog( JDBCDiskCachePoolAccessManager.class );
-
- /**
- * Singleton, private
- */
- private JDBCDiskCachePoolAccessManager()
- {
- // empty
- }
-
- /**
- * returns a singleton instance
- * <p>
- * @return JDBCDiskCachePoolAccessManager
- */
- public static synchronized JDBCDiskCachePoolAccessManager getInstance()
- {
- if ( instance == null )
- {
- instance = new JDBCDiskCachePoolAccessManager();
- }
- return instance;
- }
-
- /**
- * Returns a pool for the name if one has been created. Otherwise it creates a pool.
- * <p>
- * @param poolName the name of the pool
- * @param props the configuration properties for the pool
- * @return JDBCDiskCachePoolAccess
- * @throws SQLException if a database access error occurs
- */
- public synchronized JDBCDiskCachePoolAccess getJDBCDiskCachePoolAccess( String poolName, Properties props )
- throws SQLException
- {
- JDBCDiskCachePoolAccess poolAccess = pools.get( poolName );
-
- if ( poolAccess == null )
- {
- JDBCDiskCachePoolAccessAttributes poolAttributes = configurePoolAccessAttributes( poolName, props );
- poolAccess = JDBCDiskCachePoolAccessManager.createPoolAccess( poolAttributes );
-
- if ( log.isInfoEnabled() )
- {
- log.info( "Created shared pooled access for pool name [" + poolName + "]." );
- }
- pools.put( poolName, poolAccess );
- }
-
- return poolAccess;
- }
-
-
-
- /**
- * Configures the attributes using the properties.
- * <p>
- * @param poolName the name of the pool
- * @param props the configuration properties for the pool
- * @return JDBCDiskCachePoolAccessAttributes
- */
- protected JDBCDiskCachePoolAccessAttributes configurePoolAccessAttributes( String poolName, Properties props )
- {
- JDBCDiskCachePoolAccessAttributes poolAttributes = new JDBCDiskCachePoolAccessAttributes();
-
- String poolAccessAttributePrefix = POOL_CONFIGURATION_PREFIX + poolName + ATTRIBUTE_PREFIX;
- PropertySetter.setProperties( poolAttributes, props, poolAccessAttributePrefix + "." );
-
- poolAttributes.setPoolName( poolName );
-
- if ( log.isInfoEnabled() )
- {
- log.info( "Configured attributes " + poolAttributes );
- }
- return poolAttributes;
- }
-
- /**
- * Creates a pool access object and registers the driver.
- * <p>
- * @param driverClassName
- * @param poolName
- * @param fullURL = (url + database)
- * @param userName
- * @param password
- * @param maxActive
- * @return JDBCDiskCachePoolAccess
- * @throws SQLException if a database access error occurs
- */
- public static JDBCDiskCachePoolAccess createPoolAccess( String driverClassName, String poolName, String fullURL,
- String userName, String password, int maxActive )
- throws SQLException
- {
- JDBCDiskCachePoolAccess poolAccess = null;
-
- if (driverClassName == null)
- {
- throw new SQLException("Driver class name is null");
- }
-
- try
- {
- // com.mysql.jdbc.Driver
- Class.forName( driverClassName );
- }
- catch ( ClassNotFoundException e )
- {
- throw new SQLException("Couldn't find class for driver [" + driverClassName + "]", e );
- }
-
- poolAccess = new JDBCDiskCachePoolAccess( poolName );
- poolAccess.setupDriver( fullURL, userName, password, maxActive );
- poolAccess.logDriverStats();
-
- if ( log.isInfoEnabled() )
- {
- log.info( "Created: " + poolAccess );
- }
-
- return poolAccess;
- }
-
- /**
- * Creates a JDBCDiskCachePoolAccess object from the JDBCDiskCacheAttributes. Use this when not
- * using the connection pool manager.
- * <p>
- * @param cattr
- * @return JDBCDiskCachePoolAccess
- * @throws SQLException if a database access error occurs
- */
- public static JDBCDiskCachePoolAccess createPoolAccess( JDBCDiskCacheAttributes cattr )
- throws SQLException
- {
- return JDBCDiskCachePoolAccessManager.createPoolAccess( cattr.getDriverClassName(), cattr.getName(), cattr.getUrl() + cattr.getDatabase(),
- cattr.getUserName(), cattr.getPassword(), cattr.getMaxActive() );
- }
-
- /**
- * Creates a JDBCDiskCachePoolAccess object from the JDBCDiskCachePoolAccessAttributes. This is
- * used by the connection pool manager.
- * <p>
- * @param poolAttributes
- * @return JDBCDiskCachePoolAccess
- * @throws SQLException if a database access error occurs
- */
- public static JDBCDiskCachePoolAccess createPoolAccess( JDBCDiskCachePoolAccessAttributes poolAttributes )
- throws SQLException
- {
- return JDBCDiskCachePoolAccessManager.createPoolAccess( poolAttributes.getDriverClassName(), poolAttributes.getPoolName(), poolAttributes
- .getUrl()
- + poolAttributes.getDatabase(), poolAttributes.getUserName(), poolAttributes.getPassword(), poolAttributes
- .getMaxActive() );
- }
-}
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/DataSourceFactory.java b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/DataSourceFactory.java
new file mode 100644
index 0000000..73b57e1
--- /dev/null
+++ b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/DataSourceFactory.java
@@ -0,0 +1,85 @@
+package org.apache.commons.jcs.auxiliary.disk.jdbc.dsfactory;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.sql.SQLException;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCacheAttributes;
+
+
+/**
+ * A factory that returns a DataSource.
+ * Borrowed from Apache DB Torque
+ *
+ * @author <a href="mailto:jmcnally at apache.org">John McNally</a>
+ * @author <a href="mailto:fischer at seitenbau.de">Thomas Fischer</a>
+ * @version $Id: DataSourceFactory.java 1336091 2012-05-09 11:09:40Z tfischer $
+ */
+public interface DataSourceFactory
+{
+ /**
+ * Key for the configuration which contains DataSourceFactories
+ */
+ String DSFACTORY_KEY = "dsfactory";
+
+ /**
+ * Key for the configuration which contains the fully qualified name
+ * of the factory implementation class
+ */
+ String FACTORY_KEY = "factory";
+
+ /**
+ * @return the name of the factory.
+ */
+ String getName();
+
+ /**
+ * @return the <code>DataSource</code> configured by the factory.
+ * @throws SQLException if the source can't be returned
+ */
+ DataSource getDataSource() throws SQLException;
+
+ /**
+ * Initialize the factory.
+ *
+ * @param config the factory settings
+ * @throws SQLException Any exceptions caught during processing will be
+ * rethrown wrapped into a SQLException.
+ */
+ void initialize(JDBCDiskCacheAttributes config)
+ throws SQLException;
+
+ /**
+ * A hook which is called when the resources of the associated DataSource
+ * can be released.
+ * After close() is called, the other methods may not work any more
+ * (e.g. getDataSource() might return null).
+ * It is not guaranteed that this method does anything. For example,
+ * we do not want to close connections retrieved via JNDI, so the
+ * JndiDataSouurceFactory does not close these connections
+ *
+ * @throws SQLException Any exceptions caught during processing will be
+ * rethrown wrapped into a SQLException.
+ */
+ void close()
+ throws SQLException;
+}
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/JndiDataSourceFactory.java b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/JndiDataSourceFactory.java
new file mode 100644
index 0000000..3aab0ac
--- /dev/null
+++ b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/JndiDataSourceFactory.java
@@ -0,0 +1,185 @@
+package org.apache.commons.jcs.auxiliary.disk.jdbc.dsfactory;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.sql.SQLException;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
+import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCacheAttributes;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A factory that looks up the DataSource from JNDI. It is also able
+ * to deploy the DataSource based on properties found in the
+ * configuration.
+ *
+ * This factory tries to avoid excessive context lookups to improve speed.
+ * The time between two lookups can be configured. The default is 0 (no cache).
+ *
+ * Borrowed and adapted from Apache DB Torque
+ *
+ * @author <a href="mailto:jmcnally at apache.org">John McNally</a>
+ * @author <a href="mailto:thomas at vandahl.org">Thomas Vandahl</a>
+ */
+public class JndiDataSourceFactory implements DataSourceFactory
+{
+ /** The log. */
+ private static Log log = LogFactory.getLog(JndiDataSourceFactory.class);
+
+ /** The name of the factory. */
+ private String name;
+
+ /** The path to get the resource from. */
+ private String path;
+
+ /** The context to get the resource from. */
+ private Context ctx;
+
+ /** A locally cached copy of the DataSource */
+ private DataSource ds = null;
+
+ /** Time of last actual lookup action */
+ private long lastLookup = 0;
+
+ /** Time between two lookups */
+ private long ttl = 0; // ms
+
+ /**
+ * @return the name of the factory.
+ */
+ @Override
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * @see org.apache.torque.dsfactory.DataSourceFactory#getDataSource
+ */
+ @Override
+ public DataSource getDataSource() throws SQLException
+ {
+ long time = System.currentTimeMillis();
+
+ if (ds == null || time - lastLookup > ttl)
+ {
+ try
+ {
+ synchronized (ctx)
+ {
+ ds = ((DataSource) ctx.lookup(path));
+ }
+ lastLookup = time;
+ }
+ catch (NamingException e)
+ {
+ throw new SQLException(e);
+ }
+ }
+
+ return ds;
+ }
+
+ /**
+ * @see org.apache.torque.dsfactory.DataSourceFactory#initialize
+ */
+ @Override
+ public void initialize(JDBCDiskCacheAttributes config) throws SQLException
+ {
+ this.name = config.getConnectionPoolName();
+ initJNDI(config);
+ }
+
+ /**
+ * Initializes JNDI.
+ *
+ * @param config where to read the settings from
+ * @throws SQLException if a property set fails
+ */
+ private void initJNDI(JDBCDiskCacheAttributes config) throws SQLException
+ {
+ log.debug("Starting initJNDI");
+
+ try
+ {
+ this.path = config.getJndiPath();
+ if (log.isDebugEnabled())
+ {
+ log.debug("JNDI path: " + path);
+ }
+
+ this.ttl = config.getJndiTTL();
+ if (log.isDebugEnabled())
+ {
+ log.debug("Time between context lookups: " + ttl);
+ }
+
+ Hashtable<String, Object> env = new Hashtable<String, Object>();
+ ctx = new InitialContext(env);
+
+ if (log.isDebugEnabled())
+ {
+ log.debug("Created new InitialContext");
+ debugCtx(ctx);
+ }
+ }
+ catch (NamingException e)
+ {
+ throw new SQLException(e);
+ }
+ }
+
+ /**
+ * Does nothing. We do not want to close a dataSource retrieved from Jndi,
+ * because other applications might use it as well.
+ */
+ @Override
+ public void close()
+ {
+ // do nothing
+ }
+
+ /**
+ *
+ * @param ctx the context
+ * @throws NamingException
+ */
+ private void debugCtx(Context ctx) throws NamingException
+ {
+ log.debug("InitialContext -------------------------------");
+ Map<?, ?> env = ctx.getEnvironment();
+ Iterator<?> qw = env.entrySet().iterator();
+ log.debug("Environment properties:" + env.size());
+ while (qw.hasNext())
+ {
+ Map.Entry<?, ?> entry = (Map.Entry<?, ?>) qw.next();
+ log.debug(" " + entry.getKey() + ": " + entry.getValue());
+ }
+ log.debug("----------------------------------------------");
+ }
+}
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java
new file mode 100644
index 0000000..7e2db65
--- /dev/null
+++ b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java
@@ -0,0 +1,150 @@
+package org.apache.commons.jcs.auxiliary.disk.jdbc.dsfactory;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.sql.SQLException;
+
+import javax.sql.ConnectionPoolDataSource;
+import javax.sql.DataSource;
+
+import org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS;
+import org.apache.commons.dbcp.datasources.InstanceKeyDataSource;
+import org.apache.commons.dbcp.datasources.SharedPoolDataSource;
+import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCacheAttributes;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A factory that looks up the DataSource using the JDBC2 pool methods.
+ *
+ * Borrowed and adapted from Apache DB Torque
+ *
+ * @author <a href="mailto:jmcnally at apache.org">John McNally</a>
+ * @author <a href="mailto:hps at intermeta.de">Henning P. Schmiedehausen</a>
+ */
+public class SharedPoolDataSourceFactory implements DataSourceFactory
+{
+ /** The log. */
+ private static Log log = LogFactory.getLog(SharedPoolDataSourceFactory.class);
+
+ /** The name of the factory. */
+ private String name;
+
+ /** The wrapped <code>DataSource</code>. */
+ private SharedPoolDataSource ds = null;
+
+ /**
+ * @return the name of the factory.
+ */
+ @Override
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * @see org.apache.torque.dsfactory.DataSourceFactory#getDataSource
+ */
+ @Override
+ public DataSource getDataSource()
+ {
+ return ds;
+ }
+
+ /**
+ * @see org.apache.torque.dsfactory.DataSourceFactory#initialize
+ */
+ @Override
+ public void initialize(JDBCDiskCacheAttributes config) throws SQLException
+ {
+ this.name = config.getConnectionPoolName();
+ ConnectionPoolDataSource cpds = initCPDS(config);
+ SharedPoolDataSource dataSource = new SharedPoolDataSource();
+ initJdbc2Pool(dataSource, config);
+ dataSource.setConnectionPoolDataSource(cpds);
+ dataSource.setMaxActive(config.getMaxActive());
+ this.ds = dataSource;
+ }
+
+ /**
+ * Closes the pool associated with this factory and releases it.
+ * @throws SQLException if the pool cannot be closed properly
+ */
+ @Override
+ public void close() throws SQLException
+ {
+ try
+ {
+ ds.close();
+ }
+ catch (Exception e)
+ {
+ throw new SQLException("Exception caught closing data source", e);
+ }
+ ds = null;
+ }
+
+ /**
+ * Initializes the ConnectionPoolDataSource.
+ *
+ * @param config where to read the settings from
+ * @throws SQLException if a property set fails
+ * @return a configured <code>ConnectionPoolDataSource</code>
+ */
+ private ConnectionPoolDataSource initCPDS(final JDBCDiskCacheAttributes config)
+ throws SQLException
+ {
+ log.debug("Starting initCPDS");
+
+ DriverAdapterCPDS cpds = new DriverAdapterCPDS();
+
+ try
+ {
+ cpds.setDriver(config.getDriverClassName());
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new SQLException("Driver class not found " + config.getDriverClassName(), e);
+ }
+
+ cpds.setUrl(config.getUrl());
+ cpds.setUser(config.getUserName());
+ cpds.setPassword(config.getPassword());
+ cpds.setMaxActive(config.getMaxActive());
+
+ return cpds;
+ }
+
+ /**
+ * Initializes the Jdbc2PoolDataSource.
+ *
+ * @param dataSource the dataSource to initialize, not null.
+ * @param config where to read the settings from, not null.
+ *
+ * @throws SQLException if a property set fails.
+ */
+ private void initJdbc2Pool(final InstanceKeyDataSource dataSource, final JDBCDiskCacheAttributes config)
+ throws SQLException
+ {
+ log.debug("Starting initJdbc2Pool");
+
+ dataSource.setDescription(config.getConnectionPoolName());
+ }
+}
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java
index 81e5c4e..c81ea96 100644
--- a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java
+++ b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCache;
import org.apache.commons.jcs.auxiliary.disk.jdbc.TableState;
+import org.apache.commons.jcs.auxiliary.disk.jdbc.dsfactory.DataSourceFactory;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
import org.apache.commons.logging.Log;
@@ -50,14 +51,16 @@ public class MySQLDiskCache<K, V>
* Delegates to the super and makes use of the MySQL specific parameters used for scheduled
* optimization.
* <p>
- * @param attributes
- * @param tableState
- * @param compositeCacheManager
+ * @param attributes the configuration object for this cache
+ * @param dsFactory the DataSourceFactory for this cache
+ * @param tableState an object to track table operations
+ * @param compositeCacheManager the global cache manager
* @throws SQLException if the pool access could not be set up
*/
- public MySQLDiskCache( MySQLDiskCacheAttributes attributes, TableState tableState, ICompositeCacheManager compositeCacheManager ) throws SQLException
+ public MySQLDiskCache( MySQLDiskCacheAttributes attributes, DataSourceFactory dsFactory,
+ TableState tableState, ICompositeCacheManager compositeCacheManager ) throws SQLException
{
- super( attributes, tableState, compositeCacheManager );
+ super( attributes, dsFactory, tableState, compositeCacheManager );
mySQLDiskCacheAttributes = attributes;
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java
index a73d70c..147948a 100644
--- a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java
+++ b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java
@@ -24,10 +24,12 @@ import java.text.ParseException;
import java.util.Date;
import java.util.concurrent.TimeUnit;
+import javax.sql.DataSource;
+
import org.apache.commons.jcs.auxiliary.AuxiliaryCacheAttributes;
import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCacheFactory;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCachePoolAccess;
import org.apache.commons.jcs.auxiliary.disk.jdbc.TableState;
+import org.apache.commons.jcs.auxiliary.disk.jdbc.dsfactory.DataSourceFactory;
import org.apache.commons.jcs.auxiliary.disk.jdbc.mysql.util.ScheduleParser;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs.engine.behavior.IElementSerializer;
@@ -49,12 +51,12 @@ public class MySQLDiskCacheFactory
/**
* This factory method should create an instance of the mysqlcache.
* <p>
- * @param rawAttr
- * @param compositeCacheManager
- * @param cacheEventLogger
- * @param elementSerializer
- * @return MySQLDiskCache
- * @throws SQLException if the creation of the cache instance fails
+ * @param rawAttr specific cache configuration attributes
+ * @param compositeCacheManager the global cache manager
+ * @param cacheEventLogger a specific logger for cache events
+ * @param elementSerializer a serializer for cache elements
+ * @return MySQLDiskCache the cache instance
+ * @throws SQLException if the cache instance could not be created
*/
@Override
public <K, V> MySQLDiskCache<K, V> createCache( AuxiliaryCacheAttributes rawAttr,
@@ -64,14 +66,15 @@ public class MySQLDiskCacheFactory
{
MySQLDiskCacheAttributes cattr = (MySQLDiskCacheAttributes) rawAttr;
TableState tableState = getTableState( cattr.getTableName() );
+ DataSourceFactory dsFactory = getDataSourceFactory(cattr, compositeCacheManager.getConfigurationProperties());
- MySQLDiskCache<K, V> cache = new MySQLDiskCache<K, V>( cattr, tableState, compositeCacheManager );
+ MySQLDiskCache<K, V> cache = new MySQLDiskCache<K, V>( cattr, dsFactory, tableState, compositeCacheManager );
cache.setCacheEventLogger( cacheEventLogger );
cache.setElementSerializer( elementSerializer );
// create a shrinker if we need it.
createShrinkerWhenNeeded( cattr, cache );
- scheduleOptimizations( cattr, tableState, cache.getPoolAccess() );
+ scheduleOptimizations( cattr, tableState, cache.getDataSource() );
return cache;
@@ -82,9 +85,9 @@ public class MySQLDiskCacheFactory
* <p>
* @param attributes configuration properties.
* @param tableState for noting optimization in progress, etc.
- * @param poolAccess access to the pool
+ * @param ds the DataSource
*/
- protected void scheduleOptimizations( MySQLDiskCacheAttributes attributes, TableState tableState, JDBCDiskCachePoolAccess poolAccess )
+ protected void scheduleOptimizations( MySQLDiskCacheAttributes attributes, TableState tableState, DataSource ds )
{
if ( attributes != null )
{
@@ -96,7 +99,7 @@ public class MySQLDiskCacheFactory
+ "] on schedule [" + attributes.getOptimizationSchedule() + "]" );
}
- MySQLTableOptimizer optimizer = new MySQLTableOptimizer( attributes, tableState, poolAccess );
+ MySQLTableOptimizer optimizer = new MySQLTableOptimizer( attributes, tableState, ds );
// loop through the dates.
try
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLTableOptimizer.java b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLTableOptimizer.java
index 02260c8..23f9101 100644
--- a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLTableOptimizer.java
+++ b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLTableOptimizer.java
@@ -19,18 +19,19 @@ package org.apache.commons.jcs.auxiliary.disk.jdbc.mysql;
* under the License.
*/
-import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCachePoolAccess;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.TableState;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
+import javax.sql.DataSource;
+
+import org.apache.commons.jcs.auxiliary.disk.jdbc.TableState;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
- * The MySQL Table Optimizer can optimize MySQL tables. It knows how to optimize for MySQL datbases
+ * The MySQL Table Optimizer can optimize MySQL tables. It knows how to optimize for MySQL databases
* in particular and how to repair the table if it is corrupted in the process.
* <p>
* We will probably be able to abstract out a generic optimizer interface from this class in the
@@ -43,8 +44,8 @@ public class MySQLTableOptimizer
/** The logger */
private static final Log log = LogFactory.getLog( MySQLTableOptimizer.class );
- /** The pool */
- private JDBCDiskCachePoolAccess poolAccess = null;
+ /** The data source */
+ private DataSource dataSource = null;
/** The name of the table. */
private String tableName = null;
@@ -57,16 +58,14 @@ public class MySQLTableOptimizer
* <p>
* @param attributes
* @param tableState We mark the table status as optimizing when this is happening.
- * @param poolAccess access to the database
+ * @param dataSource access to the database
*/
- public MySQLTableOptimizer( MySQLDiskCacheAttributes attributes, TableState tableState,
- JDBCDiskCachePoolAccess poolAccess )
+ public MySQLTableOptimizer( MySQLDiskCacheAttributes attributes, TableState tableState, DataSource dataSource )
{
setTableName( attributes.getTableName() );
this.tableState = tableState;
-
- this.poolAccess = poolAccess;
+ this.dataSource = dataSource;
}
/**
@@ -137,7 +136,7 @@ public class MySQLTableOptimizer
Connection con;
try
{
- con = poolAccess.getConnection();
+ con = dataSource.getConnection();
}
catch ( SQLException e )
{
@@ -172,7 +171,7 @@ public class MySQLTableOptimizer
if ( "error".equals( status ) )
{
- log.warn( "Optimization was in erorr. Will attempt to repair the table. Message: "
+ log.warn( "Optimization was in error. Will attempt to repair the table. Message: "
+ message );
// try to repair the table.
@@ -263,7 +262,7 @@ public class MySQLTableOptimizer
}
/**
- * This is called if the optimizatio is in error.
+ * This is called if the optimization is in error.
* <p>
* It looks for "OK" in response. If it find "OK" as a message in any result set row, it returns
* true. Otherwise we assume that the repair failed.
diff --git a/src/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java b/src/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java
index 7e3530c..02fa03e 100644
--- a/src/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java
+++ b/src/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java
@@ -19,6 +19,14 @@ package org.apache.commons.jcs.engine.control;
* under the License.
*/
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
import org.apache.commons.jcs.auxiliary.AuxiliaryCache;
import org.apache.commons.jcs.auxiliary.AuxiliaryCacheAttributes;
import org.apache.commons.jcs.auxiliary.AuxiliaryCacheConfigurator;
@@ -36,14 +44,6 @@ import org.apache.commons.jcs.utils.config.PropertySetter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Properties;
-import java.util.StringTokenizer;
-
/**
* This class configures JCS based on a properties object.
* <p>
@@ -135,7 +135,7 @@ public class CompositeCacheConfigurator
}
}
- // If we reach here, then the config file is alright.
+ // If we reach here, then the config file is all right.
doConfigure( props );
}
@@ -555,6 +555,12 @@ public class CompositeCacheConfigurator
}
auxFac.setName( auxName );
+
+ if ( auxFac instanceof IRequireScheduler)
+ {
+ ((IRequireScheduler)auxFac).setScheduledExecutorService(compositeCacheManager.getScheduledExecutorService());
+ }
+
auxFac.initialize();
compositeCacheManager.registryFacPut( auxFac );
diff --git a/src/org/apache/commons/jcs/engine/logging/behavior/ICacheEventLogger.java b/src/org/apache/commons/jcs/engine/logging/behavior/ICacheEventLogger.java
index 986247b..7b08c67 100644
--- a/src/org/apache/commons/jcs/engine/logging/behavior/ICacheEventLogger.java
+++ b/src/org/apache/commons/jcs/engine/logging/behavior/ICacheEventLogger.java
@@ -28,6 +28,7 @@ package org.apache.commons.jcs.engine.logging.behavior;
*/
public interface ICacheEventLogger
{
+ // TODO: Use enum
/** ICache update */
String UPDATE_EVENT = "update";
diff --git a/src/org/apache/commons/jcs/engine/stats/StatElement.java b/src/org/apache/commons/jcs/engine/stats/StatElement.java
index 29e7b26..fd2b345 100644
--- a/src/org/apache/commons/jcs/engine/stats/StatElement.java
+++ b/src/org/apache/commons/jcs/engine/stats/StatElement.java
@@ -98,7 +98,7 @@ public class StatElement<V>
public String toString()
{
StringBuilder buf = new StringBuilder();
- buf.append( name + " = " + data );
+ buf.append( name ).append(" = ").append( data );
return buf.toString();
}
}
diff --git a/src/org/openstreetmap/josm/Main.java b/src/org/openstreetmap/josm/Main.java
index 428280d..6986466 100644
--- a/src/org/openstreetmap/josm/Main.java
+++ b/src/org/openstreetmap/josm/Main.java
@@ -1451,9 +1451,9 @@ public abstract class Main {
* Called when the user activates a window of another application.
*/
void toOtherApplication();
+
/**
- * Called when the user comes from a window of another application
- * back to JOSM.
+ * Called when the user comes from a window of another application back to JOSM.
*/
void fromOtherApplication();
}
diff --git a/src/org/openstreetmap/josm/actions/AboutAction.java b/src/org/openstreetmap/josm/actions/AboutAction.java
index 064b101..d5aaed0 100644
--- a/src/org/openstreetmap/josm/actions/AboutAction.java
+++ b/src/org/openstreetmap/josm/actions/AboutAction.java
@@ -3,11 +3,16 @@ package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.Color;
import java.awt.Dimension;
import java.awt.GridBagLayout;
import java.awt.Image;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
@@ -16,6 +21,7 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
+import javax.swing.JTextArea;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Version;
@@ -56,7 +62,7 @@ public class AboutAction extends JosmAction {
JosmTextArea readme = new JosmTextArea();
readme.setEditable(false);
- readme.setText(Version.loadResourceFile(Main.class.getResource("/README")));
+ setTextFromResourceFile(readme, "/README");
readme.setCaretPosition(0);
JosmTextArea revision = new JosmTextArea();
@@ -66,12 +72,12 @@ public class AboutAction extends JosmAction {
JosmTextArea contribution = new JosmTextArea();
contribution.setEditable(false);
- contribution.setText(Version.loadResourceFile(Main.class.getResource("/CONTRIBUTION")));
+ setTextFromResourceFile(contribution, "/CONTRIBUTION");
contribution.setCaretPosition(0);
JosmTextArea license = new JosmTextArea();
license.setEditable(false);
- license.setText(Version.loadResourceFile(Main.class.getResource("/LICENSE")));
+ setTextFromResourceFile(license, "/LICENSE");
license.setCaretPosition(0);
JPanel info = new JPanel(new GridBagLayout());
@@ -110,6 +116,37 @@ public class AboutAction extends JosmAction {
new ImageIcon(ImageProvider.get("logo.svg").getImage().getScaledInstance(256, 258, Image.SCALE_SMOOTH)));
}
+ /**
+ * Reads the contents of the resource file that is described by the {@code filePath}-attribute and puts that text
+ * into the {@link JTextArea} given by the {@code ta}-attribute.
+ * @param ta the {@link JTextArea} to put the files contents into
+ * @param filePath the path where the resource file to read resides
+ */
+ private void setTextFromResourceFile(JTextArea ta, String filePath) {
+ InputStream is = getClass().getResourceAsStream(filePath);
+ if (is == null) {
+ displayErrorMessage(ta, tr("Failed to locate resource ''{0}''.", filePath));
+ } else {
+ try {
+ BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+ String line;
+ while ((line = br.readLine()) != null) {
+ ta.append(line+'\n');
+ }
+ br.close();
+ } catch (IOException e) {
+ Main.warn(e);
+ displayErrorMessage(ta, tr("Failed to load resource ''{0}'', error is {1}.", filePath, e.toString()));
+ }
+ }
+ }
+
+ private static void displayErrorMessage(JTextArea ta, String msg) {
+ Main.warn(msg);
+ ta.setForeground(new Color(200, 0, 0));
+ ta.setText(msg);
+ }
+
private static JScrollPane createScrollPane(JosmTextArea area) {
area.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
area.setOpaque(false);
diff --git a/src/org/openstreetmap/josm/actions/DialogsToggleAction.java b/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
index 5eaa1eb..9067c42 100644
--- a/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
+++ b/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
@@ -56,9 +56,11 @@ public class DialogsToggleAction extends ToggleAction {
boolean selected = isSelected();
Main.map.setDialogsPanelVisible(selected);
Main.map.statusLine.setVisible(selected || Main.pref.getBoolean("statusbar.always-visible", true));
- Main.toolbar.control.setVisible(selected || Main.pref.getBoolean("toolbar.always-visible", true));
Main.main.menu.setVisible(selected || Main.pref.getBoolean("menu.always-visible", true));
- // sideToolBar listens to preference changes, use it here
+ // Toolbars listen to preference changes, use it here
+ if (!Main.pref.getBoolean("toolbar.always-visible", true)) {
+ Main.pref.put("toolbar.visible", selected);
+ }
if (!Main.pref.getBoolean("sidetoolbar.always-visible", true)) {
Main.pref.put("sidetoolbar.visible", selected);
}
diff --git a/src/org/openstreetmap/josm/actions/DuplicateAction.java b/src/org/openstreetmap/josm/actions/DuplicateAction.java
index 27b8305..6c0d1d9 100644
--- a/src/org/openstreetmap/josm/actions/DuplicateAction.java
+++ b/src/org/openstreetmap/josm/actions/DuplicateAction.java
@@ -2,20 +2,23 @@
// Author: David Earl
package org.openstreetmap.josm.actions;
-import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.util.Collection;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy;
import org.openstreetmap.josm.tools.Shortcut;
-public final class DuplicateAction extends JosmAction{
+public final class DuplicateAction extends JosmAction {
+ /**
+ * Constructs a new {@code DuplicateAction}.
+ */
public DuplicateAction() {
super(tr("Duplicate"), "duplicate",
tr("Duplicate selection by copy and immediate paste."),
diff --git a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
index b2f52bd..422ba8a 100644
--- a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
+++ b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
@@ -39,7 +39,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
* Adjust the position of an imagery layer.
* @since 3715
*/
-public class ImageryAdjustAction extends MapMode implements MouseListener, MouseMotionListener, AWTEventListener{
+public class ImageryAdjustAction extends MapMode implements MouseListener, MouseMotionListener, AWTEventListener {
private static volatile ImageryOffsetDialog offsetDialog;
private static Cursor cursor = ImageProvider.getCursor("normal", "move");
diff --git a/src/org/openstreetmap/josm/actions/PasteTagsAction.java b/src/org/openstreetmap/josm/actions/PasteTagsAction.java
index 27507b2..0e83829 100644
--- a/src/org/openstreetmap/josm/actions/PasteTagsAction.java
+++ b/src/org/openstreetmap/josm/actions/PasteTagsAction.java
@@ -24,6 +24,7 @@ import org.openstreetmap.josm.data.osm.PrimitiveData;
import org.openstreetmap.josm.data.osm.Tag;
import org.openstreetmap.josm.data.osm.TagCollection;
import org.openstreetmap.josm.gui.conflict.tags.PasteTagsConflictResolverDialog;
+import org.openstreetmap.josm.tools.I18n;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.TextTagParser;
import org.openstreetmap.josm.tools.Utils;
@@ -301,9 +302,11 @@ public final class PasteTagsAction extends JosmAction {
if (!commands.isEmpty()) {
String title1 = trn("Pasting {0} tag", "Pasting {0} tags", commands.size(), commands.size());
String title2 = trn("to {0} object", "to {0} objects", selection.size(), selection.size());
+ @I18n.QuirkyPluralString
+ final String title = title1 + ' ' + title2;
Main.main.undoRedo.add(
new SequenceCommand(
- title1 + ' ' + title2,
+ title,
commands
));
}
diff --git a/src/org/openstreetmap/josm/actions/PurgeAction.java b/src/org/openstreetmap/josm/actions/PurgeAction.java
index 60bd82f..3572064 100644
--- a/src/org/openstreetmap/josm/actions/PurgeAction.java
+++ b/src/org/openstreetmap/josm/actions/PurgeAction.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
import java.awt.Dimension;
+import java.awt.GraphicsEnvironment;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
@@ -180,8 +181,8 @@ public class PurgeAction extends JosmAction {
* Add higher level relations (list gets extended while looping over it)
*/
List<Relation> relLst = new ArrayList<>(relSet);
- for (Relation r : relLst) {
- for (OsmPrimitive parent : r.getReferrers()) {
+ for (int i = 0; i < relLst.size(); ++i) { // foreach loop not applicable since list gets extended while looping over it
+ for (OsmPrimitive parent : relLst.get(i).getReferrers()) {
if (!(toPurgeChecked.contains(parent))
&& hasOnlyIncompleteMembers((Relation) parent, toPurgeChecked, relLst)) {
relLst.add((Relation) parent);
@@ -201,19 +202,25 @@ public class PurgeAction extends JosmAction {
}
}
- ExtendedDialog confirmDlg = new ExtendedDialog(Main.parent, tr("Confirm Purging"), new String[] {tr("Purge"), tr("Cancel")});
- confirmDlg.setContent(buildPanel(modified), false);
- confirmDlg.setButtonIcons(new String[] {"ok", "cancel"});
+ boolean clearUndoRedo = false;
- int answer = confirmDlg.showDialog().getValue();
- if (answer != 1)
- return;
+ if (!GraphicsEnvironment.isHeadless()) {
+ ExtendedDialog confirmDlg = new ExtendedDialog(Main.parent, tr("Confirm Purging"),
+ new String[] {tr("Purge"), tr("Cancel")});
+ confirmDlg.setContent(buildPanel(modified), false);
+ confirmDlg.setButtonIcons(new String[] {"ok", "cancel"});
+
+ int answer = confirmDlg.showDialog().getValue();
+ if (answer != 1)
+ return;
- Main.pref.put("purge.clear_undo_redo", cbClearUndoRedo.isSelected());
+ clearUndoRedo = cbClearUndoRedo.isSelected();
+ Main.pref.put("purge.clear_undo_redo", clearUndoRedo);
+ }
Main.main.undoRedo.add(new PurgeCommand(Main.main.getEditLayer(), toPurgeChecked, makeIncomplete));
- if (cbClearUndoRedo.isSelected()) {
+ if (clearUndoRedo) {
Main.main.undoRedo.clean();
getCurrentDataSet().clearSelectionHistory();
}
diff --git a/src/org/openstreetmap/josm/actions/SplitWayAction.java b/src/org/openstreetmap/josm/actions/SplitWayAction.java
index 8dafc19..6919cec 100644
--- a/src/org/openstreetmap/josm/actions/SplitWayAction.java
+++ b/src/org/openstreetmap/josm/actions/SplitWayAction.java
@@ -47,7 +47,6 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.Utils;
/**
* Splits a way into multiple ways (all identical except for their node list).
@@ -198,15 +197,18 @@ public class SplitWayAction extends JosmAction {
final List<Way> newWays = createNewWaysFromChunks(selectedWay, wayChunks);
final Way wayToKeep = Strategy.keepLongestChunk().determineWayToKeep(newWays);
- if (ExpertToggleAction.isExpert() && !selectedWay.isNew() && Main.pref.getBoolean("splitway.segment-selection-dialog", true)) {
+ if (ExpertToggleAction.isExpert() && !selectedWay.isNew()) {
final ExtendedDialog dialog = new SegmentToKeepSelectionDialog(selectedWay, newWays, wayToKeep, sel);
- dialog.setModal(false);
- dialog.showDialog();
- } else {
- final SplitWayResult result = doSplitWay(getEditLayer(), selectedWay, wayToKeep, newWays, sel);
- Main.main.undoRedo.add(result.getCommand());
- getCurrentDataSet().setSelected(result.getNewSelection());
+ dialog.toggleEnable("way.split.segment-selection-dialog");
+ if (!dialog.toggleCheckState()) {
+ dialog.setModal(false);
+ dialog.showDialog();
+ return; // splitting is performed in SegmentToKeepSelectionDialog.buttonAction()
+ }
}
+ final SplitWayResult result = doSplitWay(getEditLayer(), selectedWay, wayToKeep, newWays, sel);
+ Main.main.undoRedo.add(result.getCommand());
+ getCurrentDataSet().setSelected(result.getNewSelection());
}
}
@@ -218,6 +220,7 @@ public class SplitWayAction extends JosmAction {
final List<Way> newWays;
final JList<Way> list;
final List<OsmPrimitive> selection;
+ final Way wayToKeep;
SegmentToKeepSelectionDialog(Way selectedWay, List<Way> newWays, Way wayToKeep, List<OsmPrimitive> selection) {
super(Main.parent, tr("Which way segment should reuse the history of {0}?", selectedWay.getId()),
@@ -226,9 +229,9 @@ public class SplitWayAction extends JosmAction {
this.selectedWay = selectedWay;
this.newWays = newWays;
this.selection = selection;
+ this.wayToKeep = wayToKeep;
this.list = new JList<>(newWays.toArray(new Way[newWays.size()]));
- buildList();
- this.list.setSelectedValue(wayToKeep, true);
+ configureList();
setButtonIcons(new String[]{"ok", "cancel"});
final JPanel pane = new JPanel(new GridBagLayout());
@@ -237,20 +240,21 @@ public class SplitWayAction extends JosmAction {
setContent(pane);
}
- private void buildList() {
+ private void configureList() {
list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
list.addListSelectionListener(new ListSelectionListener() {
@Override
public void valueChanged(ListSelectionEvent e) {
final Way selected = list.getSelectedValue();
- if (Main.isDisplayingMapView() && selected != null) {
- final List<WaySegment> segments = Utils.transform(selected.getNodes().subList(0, selected.getNodesCount() - 1),
- new Utils.Function<Node, WaySegment>() {
- @Override
- public WaySegment apply(Node x) {
- return new WaySegment(selectedWay, selectedWay.getNodes().indexOf(x));
- }
- });
+ if (Main.isDisplayingMapView() && selected != null && selected.getNodesCount() > 1) {
+ final Collection<WaySegment> segments = new ArrayList<>(selected.getNodesCount() - 1);
+ final Iterator<Node> it = selected.getNodes().iterator();
+ Node previousNode = it.next();
+ while (it.hasNext()) {
+ final Node node = it.next();
+ segments.add(WaySegment.forNodePair(selectedWay, previousNode, node));
+ previousNode = node;
+ }
setHighlightedWaySegments(segments);
}
}
@@ -279,7 +283,7 @@ public class SplitWayAction extends JosmAction {
public void setVisible(boolean visible) {
super.setVisible(visible);
if (visible) {
- list.setSelectedIndex(list.getSelectedIndex()); // highlight way segments
+ list.setSelectedValue(wayToKeep, true);
} else {
setHighlightedWaySegments(Collections.<WaySegment>emptyList());
}
@@ -288,6 +292,7 @@ public class SplitWayAction extends JosmAction {
@Override
protected void buttonAction(int buttonIndex, ActionEvent evt) {
super.buttonAction(buttonIndex, evt);
+ toggleSaveState(); // necessary since #showDialog() does not handle it due to the non-modal dialog
if (getValue() == 1) {
final Way wayToKeep = list.getSelectedValue();
final SplitWayResult result = doSplitWay(getEditLayer(), selectedWay, wayToKeep, newWays, selection);
diff --git a/src/org/openstreetmap/josm/actions/UnselectAllAction.java b/src/org/openstreetmap/josm/actions/UnselectAllAction.java
index 50a3a7a..f75ab29 100644
--- a/src/org/openstreetmap/josm/actions/UnselectAllAction.java
+++ b/src/org/openstreetmap/josm/actions/UnselectAllAction.java
@@ -11,6 +11,9 @@ import org.openstreetmap.josm.tools.Shortcut;
public class UnselectAllAction extends JosmAction {
+ /**
+ * Constructs a new {@code UnselectAllAction}.
+ */
public UnselectAllAction() {
super(tr("Unselect All"), "unselectall", tr("Unselect all objects."),
Shortcut.registerShortcut("edit:unselectall", tr("Edit: {0}",
@@ -25,9 +28,9 @@ public class UnselectAllAction extends JosmAction {
return;
getCurrentDataSet().setSelected();
}
+
/**
* Refreshes the enabled state
- *
*/
@Override
protected void updateEnabledState() {
diff --git a/src/org/openstreetmap/josm/actions/UploadAction.java b/src/org/openstreetmap/josm/actions/UploadAction.java
index 382cf43..222e769 100644
--- a/src/org/openstreetmap/josm/actions/UploadAction.java
+++ b/src/org/openstreetmap/josm/actions/UploadAction.java
@@ -43,7 +43,7 @@ import org.openstreetmap.josm.tools.Shortcut;
*
* @author imi
*/
-public class UploadAction extends JosmAction{
+public class UploadAction extends JosmAction {
/**
* The list of upload hooks. These hooks will be called one after the other
* when the user wants to upload data. Plugins can insert their own hooks here
diff --git a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
index 4586258..07205ef 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
@@ -1055,6 +1055,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
}
}
}
+
/**
* Takes the data from computeHelperLine to determine which ways/nodes should be highlighted
* (if feature enabled). Also sets the target cursor if appropriate. It adds the to-be-
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
index f983425..ab9a89f 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
@@ -356,6 +356,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
toggleDualAlign();
}
}
+
/**
* Toggles dual alignment mode.
*/
diff --git a/src/org/openstreetmap/josm/actions/mapmode/MapMode.java b/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
index 45b635a..77141fe 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
@@ -74,6 +74,7 @@ public abstract class MapMode extends JosmAction implements MouseListener, Mouse
public String getModeHelpText() {
return "";
}
+
/**
* Call selectMapMode(this) on the parent mapFrame.
*/
diff --git a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
index c20dedb..770952d 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
@@ -53,6 +53,7 @@ import org.openstreetmap.josm.gui.util.ModifierListener;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Pair;
import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
/**
* Move is an action that can move all kind of OsmPrimitives (except keys for now).
@@ -809,12 +810,23 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
}
/**
- * Present warning in case of large and possibly unwanted movements and undo
- * unwanted movements.
+ * Present warning in the following cases and undo unwanted movements: <ul>
+ * <li>large and possibly unwanted movements</li>
+ * <li>movement of node with attached ways that are hidden by filters</li>
+ * </ul>
*
* @param e the mouse event causing the action (mouse released)
*/
private void confirmOrUndoMovement(MouseEvent e) {
+ if (movesHiddenWay()) {
+ final ExtendedDialog ed = new ConfirmMoveDialog();
+ ed.setContent(tr("Are you sure that you want to move elements with attached ways that are hidden by filters?"));
+ ed.toggleEnable("movedHiddenElements");
+ ed.showDialog();
+ if (ed.getValue() != 1) {
+ Main.main.undoRedo.undo();
+ }
+ }
int max = Main.pref.getInteger("warn.move.maxelements", 20), limit = max;
for (OsmPrimitive osm : getCurrentDataSet().getSelected()) {
if (osm instanceof Way) {
@@ -825,17 +837,12 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
}
}
if (limit < 0) {
- ExtendedDialog ed = new ExtendedDialog(
- Main.parent,
- tr("Move elements"),
- new String[]{tr("Move them"), tr("Undo move")});
- ed.setButtonIcons(new String[]{"reorder", "cancel"});
+ final ExtendedDialog ed = new ConfirmMoveDialog();
ed.setContent(
/* for correct i18n of plural forms - see #9110 */
trn("You moved more than {0} element. " + "Moving a large number of elements is often an error.\n" + "Really move them?",
"You moved more than {0} elements. " + "Moving a large number of elements is often an error.\n" + "Really move them?",
max, max));
- ed.setCancelButton(2);
ed.toggleEnable("movedManyElements");
ed.showDialog();
@@ -850,6 +857,31 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
getCurrentDataSet().fireSelectionChanged();
}
+ static class ConfirmMoveDialog extends ExtendedDialog {
+ ConfirmMoveDialog() {
+ super(Main.parent,
+ tr("Move elements"),
+ new String[]{tr("Move them"), tr("Undo move")});
+ setButtonIcons(new String[]{"reorder", "cancel"});
+ setCancelButton(2);
+ }
+ }
+
+ private boolean movesHiddenWay() {
+ final Collection<OsmPrimitive> elementsToTest = new HashSet<>(getCurrentDataSet().getSelected());
+ for (Way osm : Utils.filteredCollection(getCurrentDataSet().getSelected(), Way.class)) {
+ elementsToTest.addAll(osm.getNodes());
+ }
+ for (OsmPrimitive node : Utils.filteredCollection(elementsToTest, Node.class)) {
+ for (Way ref : Utils.filteredCollection(node.getReferrers(), Way.class)) {
+ if (ref.isDisabledAndHidden()) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
/**
* Merges the selected nodes to the one closest to the given mouse position if the control
* key is pressed. If there is no such node, no action will be done and no error will be
diff --git a/src/org/openstreetmap/josm/actions/relation/DownloadMembersAction.java b/src/org/openstreetmap/josm/actions/relation/DownloadMembersAction.java
index ad3ea12..3696580 100644
--- a/src/org/openstreetmap/josm/actions/relation/DownloadMembersAction.java
+++ b/src/org/openstreetmap/josm/actions/relation/DownloadMembersAction.java
@@ -42,9 +42,11 @@ public class DownloadMembersAction extends AbstractRelationAction {
public void setPrimitives(Collection<? extends OsmPrimitive> primitives) {
// selected non-new relations
this.relations = Utils.filter(getRelations(primitives), new Predicate<Relation>() {
- @Override public boolean evaluate(Relation r) {
+ @Override
+ public boolean evaluate(Relation r) {
return !r.isNew();
- }});
+ }
+ });
updateEnabledState();
}
diff --git a/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java b/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java
index 5a86555..d4edb0f 100644
--- a/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java
+++ b/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java
@@ -68,7 +68,8 @@ public class DownloadSelectedIncompleteMembersAction extends AbstractRelationAct
@Override
public boolean evaluate(Relation r) {
return r.hasIncompleteMembers();
- }});
+ }
+ });
this.incompleteMembers = buildSetOfIncompleteMembers(relations);
updateEnabledState();
}
diff --git a/src/org/openstreetmap/josm/actions/search/SearchAction.java b/src/org/openstreetmap/josm/actions/search/SearchAction.java
index 3b9a269..3851917 100644
--- a/src/org/openstreetmap/josm/actions/search/SearchAction.java
+++ b/src/org/openstreetmap/josm/actions/search/SearchAction.java
@@ -48,6 +48,7 @@ import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
import org.openstreetmap.josm.gui.preferences.ToolbarPreferences.ActionParser;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.Predicate;
@@ -227,8 +228,9 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
//
JLabel label = new JLabel(initialValues instanceof Filter ? tr("Filter string:") : tr("Search string:"));
final HistoryComboBox hcbSearchString = new HistoryComboBox();
+ final String tooltip = tr("Enter the search expression");
hcbSearchString.setText(initialValues.text);
- hcbSearchString.setToolTipText(tr("Enter the search expression"));
+ hcbSearchString.setToolTipText(tooltip);
// we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
//
List<String> searchExpressionHistory = getSearchExpressionHistory();
@@ -280,6 +282,34 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
right = new JPanel(new GridBagLayout());
buildHints(right, hcbSearchString);
+ final JTextComponent editorComponent = (JTextComponent) hcbSearchString.getEditor().getEditorComponent();
+ editorComponent.getDocument().addDocumentListener(new AbstractTextComponentValidator(editorComponent) {
+
+ @Override
+ public void validate() {
+ if (!isValid()) {
+ feedbackInvalid(tr("Invalid search expression"));
+ } else {
+ feedbackValid(tooltip);
+ }
+ }
+
+ @Override
+ public boolean isValid() {
+ try {
+ SearchSetting ss = new SearchSetting();
+ ss.text = hcbSearchString.getText();
+ ss.caseSensitive = caseSensitive.isSelected();
+ ss.regexSearch = regexSearch.isSelected();
+ ss.mapCSSSearch = mapCSSSearch.isSelected();
+ SearchCompiler.compile(ss);
+ return true;
+ } catch (ParseError e) {
+ return false;
+ }
+ }
+ });
+
final JPanel p = new JPanel(new GridBagLayout());
p.add(top, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 5, 5, 0));
p.add(left, GBC.std().anchor(GBC.NORTH).insets(5, 10, 10, 0));
@@ -618,6 +648,10 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
public SearchSetting() {
}
+ /**
+ * Constructs a new {@code SearchSetting} from an existing one.
+ * @param original original search settings
+ */
public SearchSetting(SearchSetting original) {
text = original.text;
mode = original.mode;
diff --git a/src/org/openstreetmap/josm/actions/search/SearchCompiler.java b/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
index af235a0..3139b78 100644
--- a/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
+++ b/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
@@ -9,6 +9,7 @@ import java.io.StringReader;
import java.text.Normalizer;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
@@ -21,12 +22,14 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.search.PushbackTokenizer.Range;
import org.openstreetmap.josm.actions.search.PushbackTokenizer.Token;
import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.OsmUtils;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Tagged;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.mappaint.Environment;
import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
@@ -232,13 +235,28 @@ public class SearchCompiler {
}
/**
- * Base class for all search operators.
+ * Base class for all search criteria. If the criterion only depends on an object's tags,
+ * inherit from {@link org.openstreetmap.josm.actions.search.SearchCompiler.TaggedMatch}.
*/
public abstract static class Match implements Predicate<OsmPrimitive> {
+ /**
+ * Tests whether the primitive matches this criterion.
+ * @param osm the primitive to test
+ * @return true if the primitive matches this criterion
+ */
public abstract boolean match(OsmPrimitive osm);
/**
+ * Tests whether the tagged object matches this criterion.
+ * @param tagged the tagged object to test
+ * @return true if the tagged object matches this criterion
+ */
+ public boolean match(Tagged tagged) {
+ return false;
+ }
+
+ /**
* Tests whether one of the primitives matches.
* @param primitives primitives
* @return {@code true} if one of the primitives matches, {@code false} otherwise
@@ -270,6 +288,17 @@ public class SearchCompiler {
}
}
+ public abstract static class TaggedMatch extends Match {
+
+ @Override
+ public abstract boolean match(Tagged tags);
+
+ @Override
+ public final boolean match(OsmPrimitive osm) {
+ return match((Tagged) osm);
+ }
+ }
+
/**
* A unary search operator which may take data parameters.
*/
@@ -317,11 +346,11 @@ public class SearchCompiler {
/**
* Matches every OsmPrimitive.
*/
- public static class Always extends Match {
+ public static class Always extends TaggedMatch {
/** The unique instance/ */
public static final Always INSTANCE = new Always();
@Override
- public boolean match(OsmPrimitive osm) {
+ public boolean match(Tagged osm) {
return true;
}
}
@@ -329,9 +358,9 @@ public class SearchCompiler {
/**
* Never matches any OsmPrimitive.
*/
- public static class Never extends Match {
+ public static class Never extends TaggedMatch {
@Override
- public boolean match(OsmPrimitive osm) {
+ public boolean match(Tagged osm) {
return false;
}
}
@@ -350,6 +379,11 @@ public class SearchCompiler {
}
@Override
+ public boolean match(Tagged osm) {
+ return !match.match(osm);
+ }
+
+ @Override
public String toString() {
return "!" + match;
}
@@ -362,7 +396,7 @@ public class SearchCompiler {
/**
* Matches if the value of the corresponding key is ''yes'', ''true'', ''1'' or ''on''.
*/
- private static class BooleanMatch extends Match {
+ private static class BooleanMatch extends TaggedMatch {
private final String key;
private final boolean defaultValue;
@@ -372,7 +406,7 @@ public class SearchCompiler {
}
@Override
- public boolean match(OsmPrimitive osm) {
+ public boolean match(Tagged osm) {
Boolean ret = OsmUtils.getOsmBoolean(osm.get(key));
if (ret == null)
return defaultValue;
@@ -400,6 +434,11 @@ public class SearchCompiler {
}
@Override
+ public boolean match(Tagged osm) {
+ return lhs.match(osm) && rhs.match(osm);
+ }
+
+ @Override
public String toString() {
return lhs + " && " + rhs;
}
@@ -419,6 +458,11 @@ public class SearchCompiler {
}
@Override
+ public boolean match(Tagged osm) {
+ return lhs.match(osm) || rhs.match(osm);
+ }
+
+ @Override
public String toString() {
return lhs + " || " + rhs;
}
@@ -438,6 +482,11 @@ public class SearchCompiler {
}
@Override
+ public boolean match(Tagged osm) {
+ return lhs.match(osm) ^ rhs.match(osm);
+ }
+
+ @Override
public String toString() {
return lhs + " ^ " + rhs;
}
@@ -515,7 +564,7 @@ public class SearchCompiler {
/**
* Matches objects with the given key-value pair.
*/
- private static class KeyValue extends Match {
+ private static class KeyValue extends TaggedMatch {
private final String key;
private final Pattern keyPattern;
private final String value;
@@ -558,7 +607,7 @@ public class SearchCompiler {
}
@Override
- public boolean match(OsmPrimitive osm) {
+ public boolean match(Tagged osm) {
if (keyPattern != null) {
if (!osm.hasKeys())
@@ -588,8 +637,8 @@ public class SearchCompiler {
} else {
String mv = null;
- if ("timestamp".equals(key)) {
- mv = DateUtils.fromTimestamp(osm.getRawTimestamp());
+ if ("timestamp".equals(key) && osm instanceof OsmPrimitive) {
+ mv = DateUtils.fromTimestamp(((OsmPrimitive) osm).getRawTimestamp());
} else {
mv = osm.get(key);
if (!caseSensitive && mv == null) {
@@ -622,7 +671,7 @@ public class SearchCompiler {
}
}
- public static class ValueComparison extends Match {
+ public static class ValueComparison extends TaggedMatch {
private final String key;
private final String referenceValue;
private final Double referenceNumber;
@@ -634,7 +683,9 @@ public class SearchCompiler {
this.referenceValue = referenceValue;
Double v = null;
try {
- v = Double.valueOf(referenceValue);
+ if (referenceValue != null) {
+ v = Double.valueOf(referenceValue);
+ }
} catch (NumberFormatException ignore) {
if (Main.isTraceEnabled()) {
Main.trace(ignore.getMessage());
@@ -645,7 +696,7 @@ public class SearchCompiler {
}
@Override
- public boolean match(OsmPrimitive osm) {
+ public boolean match(Tagged osm) {
final String currentValue = osm.get(key);
final int compareResult;
if (currentValue == null) {
@@ -673,7 +724,7 @@ public class SearchCompiler {
/**
* Matches objects with the exact given key-value pair.
*/
- public static class ExactKeyValue extends Match {
+ public static class ExactKeyValue extends TaggedMatch {
private enum Mode {
ANY, ANY_KEY, ANY_VALUE, EXACT, NONE, MISSING_KEY,
@@ -746,7 +797,7 @@ public class SearchCompiler {
}
@Override
- public boolean match(OsmPrimitive osm) {
+ public boolean match(Tagged osm) {
if (!osm.hasKeys())
return mode == Mode.NONE;
@@ -803,7 +854,7 @@ public class SearchCompiler {
/**
* Match a string in any tags (key or value), with optional regex and case insensitivity.
*/
- private static class Any extends Match {
+ private static class Any extends TaggedMatch {
private final String search;
private final Pattern searchRegex;
private final boolean caseSensitive;
@@ -830,8 +881,8 @@ public class SearchCompiler {
}
@Override
- public boolean match(OsmPrimitive osm) {
- if (!osm.hasKeys() && osm.getUser() == null)
+ public boolean match(Tagged osm) {
+ if (!osm.hasKeys())
return search.isEmpty();
for (String key: osm.keySet()) {
@@ -1372,15 +1423,23 @@ public class SearchCompiler {
this.all = all;
}
- protected abstract Bounds getBounds();
+ protected abstract Collection<Bounds> getBounds();
@Override
public boolean match(OsmPrimitive osm) {
if (!osm.isUsable())
return false;
else if (osm instanceof Node) {
- Bounds bounds = getBounds();
- return bounds != null && bounds.contains(((Node) osm).getCoor());
+ Collection<Bounds> allBounds = getBounds();
+ if (allBounds != null) {
+ LatLon coor = ((Node) osm).getCoor();
+ for (Bounds bounds: allBounds) {
+ if (bounds.contains(coor)) {
+ return true;
+ }
+ }
+ }
+ return false;
} else if (osm instanceof Way) {
Collection<Node> nodes = ((Way) osm).getNodes();
return all ? forallMatch(nodes) : existsMatch(nodes);
@@ -1397,14 +1456,18 @@ public class SearchCompiler {
*/
public static class InDataSourceArea extends InArea {
+ /**
+ * Constructs a new {@code InDataSourceArea}.
+ * @param all if true, all way nodes or relation members have to be within source area; if false, one suffices.
+ */
public InDataSourceArea(boolean all) {
super(all);
}
@Override
- protected Bounds getBounds() {
+ protected Collection<Bounds> getBounds() {
return Main.main.getCurrentDataSet() == null || Main.main.getCurrentDataSet().getDataSourceArea() == null
- ? null : new Bounds(Main.main.getCurrentDataSet().getDataSourceArea().getBounds2D());
+ ? null : Main.main.getCurrentDataSet().getDataSourceBounds();
}
@Override
@@ -1423,11 +1486,11 @@ public class SearchCompiler {
}
@Override
- protected Bounds getBounds() {
+ protected Collection<Bounds> getBounds() {
if (!Main.isDisplayingMapView()) {
return null;
}
- return Main.map.mapView.getRealBounds();
+ return Collections.singleton(Main.map.mapView.getRealBounds());
}
@Override
diff --git a/src/org/openstreetmap/josm/command/ChangePropertyCommand.java b/src/org/openstreetmap/josm/command/ChangePropertyCommand.java
index 3200d84..a6b4888 100644
--- a/src/org/openstreetmap/josm/command/ChangePropertyCommand.java
+++ b/src/org/openstreetmap/josm/command/ChangePropertyCommand.java
@@ -20,6 +20,7 @@ import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.tools.I18n;
import org.openstreetmap.josm.tools.ImageProvider;
/**
@@ -147,7 +148,8 @@ public class ChangePropertyCommand extends Command {
@Override
public String getDescriptionText() {
- String text;
+ @I18n.QuirkyPluralString
+ final String text;
if (objects.size() == 1 && tags.size() == 1) {
OsmPrimitive primitive = objects.get(0);
String msg = "";
diff --git a/src/org/openstreetmap/josm/data/Version.java b/src/org/openstreetmap/josm/data/Version.java
index 252a554..6ae0c29 100644
--- a/src/org/openstreetmap/josm/data/Version.java
+++ b/src/org/openstreetmap/josm/data/Version.java
@@ -3,18 +3,13 @@ package org.openstreetmap.josm.data;
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.io.BufferedReader;
import java.io.IOException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
+import java.io.InputStream;
import java.util.Map.Entry;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.Properties;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.tools.LanguageInfo;
-import org.openstreetmap.josm.tools.Utils;
/**
* Provides basic information about the currently used JOSM build.
@@ -28,30 +23,6 @@ public class Version {
private static Version instance;
/**
- * Load the specified resource as string.
- *
- * @param resource the resource url to load
- * @return the content of the resource file; null, if an error occurred
- */
- public static String loadResourceFile(URL resource) {
- if (resource == null) return null;
- String s = null;
- try {
- StringBuilder sb = new StringBuilder();
- try (BufferedReader in = Utils.openURLReader(resource)) {
- for (String line = in.readLine(); line != null; line = in.readLine()) {
- sb.append(line).append('\n');
- }
- }
- s = sb.toString();
- } catch (IOException e) {
- Main.error(tr("Failed to load resource ''{0}'', error is {1}.", resource.toString(), e.toString()));
- Main.error(e);
- }
- return s;
- }
-
- /**
* Replies the unique instance of the version information
*
* @return the unique instance of the version information
@@ -70,31 +41,12 @@ public class Version {
private String buildName;
private boolean isLocalBuild;
- protected Map<String, String> parseManifestStyleFormattedString(String content) {
- Map<String, String> properties = new HashMap<>();
- if (content == null) return properties;
- Pattern p = Pattern.compile("^([^:]+):(.*)$");
- for (String line: content.split("\n")) {
- if (line == null || line.trim().isEmpty()) {
- continue;
- }
- if (line.matches("^\\s*#.*$")) {
- continue;
- }
- Matcher m = p.matcher(line);
- if (m.matches()) {
- properties.put(m.group(1), m.group(2));
- }
- }
- return properties;
- }
-
/**
* Initializes the version infos from the revision resource file
*
- * @param revisionInfo the revision info loaded from a revision resource file
+ * @param revisionInfo the revision info from a revision resource file as InputStream
*/
- protected void initFromRevisionInfo(String revisionInfo) {
+ protected void initFromRevisionInfo(InputStream revisionInfo) {
if (revisionInfo == null) {
this.releaseDescription = tr("UNKNOWN");
this.version = JOSM_UNKNOWN_VERSION;
@@ -102,8 +54,14 @@ public class Version {
return;
}
- Map<String, String> properties = parseManifestStyleFormattedString(revisionInfo);
- String value = properties.get("Revision");
+ Properties properties = new Properties();
+ try {
+ properties.load(revisionInfo);
+ revisionInfo.close();
+ } catch (IOException e) {
+ Main.warn(tr("Error reading revision info from revision file: {0}", e.getMessage()));
+ }
+ String value = properties.getProperty("Revision");
if (value != null) {
value = value.trim();
try {
@@ -118,15 +76,15 @@ public class Version {
// the last changed data
//
- time = properties.get("Last Changed Date");
+ time = properties.getProperty("Last Changed Date");
if (time == null) {
- time = properties.get("Build-Date");
+ time = properties.getProperty("Build-Date");
}
// is this a local build ?
//
isLocalBuild = false;
- value = properties.get("Is-Local-Build");
+ value = properties.getProperty("Is-Local-Build");
if (value != null && "true".equalsIgnoreCase(value.trim())) {
isLocalBuild = true;
}
@@ -134,7 +92,7 @@ public class Version {
// is this a specific build ?
//
buildName = null;
- value = properties.get("Build-Name");
+ value = properties.getProperty("Build-Name");
if (value != null && !value.trim().isEmpty()) {
buildName = value.trim();
}
@@ -142,7 +100,7 @@ public class Version {
// the revision info
//
StringBuilder sb = new StringBuilder();
- for (Entry<String, String> property: properties.entrySet()) {
+ for (Entry<Object, Object> property: properties.entrySet()) {
sb.append(property.getKey()).append(':').append(property.getValue()).append('\n');
}
releaseDescription = sb.toString();
@@ -152,14 +110,14 @@ public class Version {
* Initializes version info
*/
public void init() {
- URL u = Main.class.getResource("/REVISION");
- if (u == null) {
+ InputStream stream = Main.class.getResourceAsStream("/REVISION");
+ if (stream == null) {
Main.warn(tr("The revision file ''/REVISION'' is missing."));
version = 0;
releaseDescription = "";
return;
}
- initFromRevisionInfo(loadResourceFile(u));
+ initFromRevisionInfo(stream);
}
/**
diff --git a/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java b/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java
index 2be6489..ff5b30a 100644
--- a/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java
+++ b/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java
@@ -53,7 +53,7 @@ public class HostLimitQueue extends LinkedBlockingDeque<Runnable> {
if (remove(job)) {
return job;
} else {
- // we have acquired the semaphore, but we didn't manage to remove it, as someone else did
+ // we have acquired the semaphore, but we didn't manage to remove job, as someone else did
// release the semaphore and look for another candidate
releaseSemaphore(job);
}
@@ -66,7 +66,7 @@ public class HostLimitQueue extends LinkedBlockingDeque<Runnable> {
Main.debug(e.getMessage());
}
}
- Main.debug("TMS - Queuing job {0} because host limit reached", url);
+ Main.debug("TMS - Skipping job {0} because host limit reached", url);
}
}
}
diff --git a/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java b/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
index d83a8d8..ab1105b 100644
--- a/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
+++ b/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
@@ -5,12 +5,12 @@ 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 java.util.logging.SimpleFormatter;
import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.jcs.auxiliary.AuxiliaryCache;
@@ -75,9 +75,11 @@ public final class JCSCacheManager {
jcsLog.setUseParentHandlers(false);
// we need a separate handler from Main's, as we downgrade LEVEL.INFO to DEBUG level
jcsLog.addHandler(new Handler() {
+ final SimpleFormatter formatter = new SimpleFormatter();
+
@Override
public void publish(LogRecord record) {
- String msg = MessageFormat.format(record.getMessage(), record.getParameters());
+ String msg = formatter.formatMessage(record);
if (record.getLevel().intValue() >= Level.SEVERE.intValue()) {
Main.error(msg);
} else if (record.getLevel().intValue() >= Level.WARNING.intValue()) {
diff --git a/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java b/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
index 28b0c97..02ed7f4 100644
--- a/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
+++ b/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
@@ -173,6 +173,7 @@ public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements
if (first || force) {
// submit all jobs to separate thread, so calling thread is not blocked with IO when loading from disk
+ log.log(Level.FINE, "JCS - Submitting job for execution for url: {0}", getUrlNoException());
downloadJobExecutor.execute(this);
}
}
@@ -220,6 +221,7 @@ public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements
final Thread currentThread = Thread.currentThread();
final String oldName = currentThread.getName();
currentThread.setName("JCS Downloading: " + getUrlNoException());
+ log.log(Level.FINE, "JCS - starting fetch of url: {0} ", getUrlNoException());
ensureCacheElement();
try {
// try to fetch from cache
diff --git a/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java b/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
index 3f2ed90..d4f3bae 100644
--- a/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
+++ b/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
@@ -189,6 +189,7 @@ public class ConflictCollection implements Iterable<Conflict<? extends OsmPrimit
}
return null;
}
+
/**
* Replies the conflict for the {@link OsmPrimitive} <code>their</code>, null
* if no such conflict exists.
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
index edfa249..ff0ed6b 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
@@ -860,7 +860,7 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
*/
public String getExtendedUrl() {
return imageryType.getTypeString() + (defaultMaxZoom != 0
- ? "["+(defaultMinZoom != 0 ? defaultMinZoom+',' : "")+defaultMaxZoom+"]" : "") + ':' + url;
+ ? "["+(defaultMinZoom != 0 ? Integer.toString(defaultMinZoom) + ',' : "")+defaultMaxZoom+"]" : "") + ':' + url;
}
public String getToolbarName() {
diff --git a/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java b/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java
index e9b8c91..434421f 100644
--- a/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java
+++ b/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java
@@ -9,7 +9,6 @@ import java.util.concurrent.TimeUnit;
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;
@@ -25,7 +24,7 @@ import org.openstreetmap.josm.tools.Utils;
* Wrapper class that bridges between JCS cache and Tile Loaders
*
*/
-public class TMSCachedTileLoader implements TileLoader, CachedTileLoader, TileCache {
+public class TMSCachedTileLoader implements TileLoader, CachedTileLoader {
protected final ICacheAccess<String, BufferedImageCacheEntry> cache;
protected final int connectTimeout;
@@ -107,26 +106,6 @@ public class TMSCachedTileLoader implements TileLoader, CachedTileLoader, TileCa
this.cache.remove(source.getName() + ':');
}
- @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();
- }
-
/**
* @return cache statistics as string
*/
diff --git a/src/org/openstreetmap/josm/data/notes/NoteComment.java b/src/org/openstreetmap/josm/data/notes/NoteComment.java
index 9846c91..56c20c7 100644
--- a/src/org/openstreetmap/josm/data/notes/NoteComment.java
+++ b/src/org/openstreetmap/josm/data/notes/NoteComment.java
@@ -23,7 +23,12 @@ public class NoteComment {
* Every comment has an associated action. Some comments are just comments
* while others indicate the note being opened, closed or reopened
*/
- public enum Action {opened, closed, reopened, commented}
+ public enum Action {
+ opened,
+ closed,
+ reopened,
+ commented
+ }
/**
* @param createDate The time at which this comment was added
diff --git a/src/org/openstreetmap/josm/data/osm/ChangesetCache.java b/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
index 54f69f0..e3a178f 100644
--- a/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
+++ b/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
@@ -31,7 +31,7 @@ import org.openstreetmap.josm.gui.util.GuiHelper;
* {@link ChangesetCacheEvent}s are delivered on the EDT.
*
*/
-public final class ChangesetCache implements PreferenceChangedListener{
+public final class ChangesetCache implements PreferenceChangedListener {
/** the unique instance */
private static final ChangesetCache instance = new ChangesetCache();
diff --git a/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java b/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java
index fd78d0e..be1f32d 100644
--- a/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java
@@ -6,7 +6,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-public class DefaultChangesetCacheEvent implements ChangesetCacheEvent{
+public class DefaultChangesetCacheEvent implements ChangesetCacheEvent {
private final Set<Changeset> added;
private final Set<Changeset> modified;
diff --git a/src/org/openstreetmap/josm/data/osm/Node.java b/src/org/openstreetmap/josm/data/osm/Node.java
index 7afd51a..58955b0 100644
--- a/src/org/openstreetmap/josm/data/osm/Node.java
+++ b/src/org/openstreetmap/josm/data/osm/Node.java
@@ -386,6 +386,6 @@ public final class Node extends OsmPrimitive implements INode {
@Override
public boolean isOutsideDownloadArea() {
return !isNewOrUndeleted() && getDataSet() != null && getDataSet().getDataSourceArea() != null
- && !getCoor().isIn(getDataSet().getDataSourceArea());
+ && getCoor() != null && !getCoor().isIn(getDataSet().getDataSourceArea());
}
}
diff --git a/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java b/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java
index 7962678..03db280 100644
--- a/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java
+++ b/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java
@@ -86,7 +86,7 @@ public class PrimitiveDeepCopy {
}
}
- public final void visitAll() {
+ public void visitAll() {
for (OsmPrimitive osm : primitives) {
firstIteration = true;
osm.accept(this);
diff --git a/src/org/openstreetmap/josm/data/osm/Storage.java b/src/org/openstreetmap/josm/data/osm/Storage.java
index 510febc..1a9102c 100644
--- a/src/org/openstreetmap/josm/data/osm/Storage.java
+++ b/src/org/openstreetmap/josm/data/osm/Storage.java
@@ -127,6 +127,7 @@ public class Storage<T> extends AbstractSet<T> {
public Storage(Hash<? super T, ? super T> ha, int capacity) {
this(ha, capacity, false);
}
+
/**
* constructor
* @param ha hash
diff --git a/src/org/openstreetmap/josm/data/osm/WaySegment.java b/src/org/openstreetmap/josm/data/osm/WaySegment.java
index f28c1d7..c395b28 100644
--- a/src/org/openstreetmap/josm/data/osm/WaySegment.java
+++ b/src/org/openstreetmap/josm/data/osm/WaySegment.java
@@ -46,6 +46,22 @@ public final class WaySegment implements Comparable<WaySegment> {
}
/**
+ * Determines and returns the way segment for the given way and node pair.
+ * @throws IllegalArgumentException if the node pair is not part of way
+ */
+ public static WaySegment forNodePair(Way way, Node first, Node second) {
+ int endIndex = way.getNodesCount() - 1;
+ while (endIndex > 0) {
+ final int indexOfFirst = way.getNodes().subList(0, endIndex).lastIndexOf(first);
+ if (second.equals(way.getNode(indexOfFirst + 1))) {
+ return new WaySegment(way, indexOfFirst);
+ }
+ endIndex--;
+ }
+ throw new IllegalArgumentException("Node pair is not part of way!");
+ }
+
+ /**
* Returns this way segment as complete way.
* @return the way segment as {@code Way}
*/
diff --git a/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java b/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java
index 2ccad8f..99f84c2 100644
--- a/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java
@@ -8,8 +8,16 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
public abstract class AbstractDatasetChangedEvent {
- public enum DatasetEventType {DATA_CHANGED, NODE_MOVED, PRIMITIVES_ADDED, PRIMITIVES_REMOVED,
- RELATION_MEMBERS_CHANGED, TAGS_CHANGED, WAY_NODES_CHANGED, CHANGESET_ID_CHANGED}
+ public enum DatasetEventType {
+ DATA_CHANGED,
+ NODE_MOVED,
+ PRIMITIVES_ADDED,
+ PRIMITIVES_REMOVED,
+ RELATION_MEMBERS_CHANGED,
+ TAGS_CHANGED,
+ WAY_NODES_CHANGED,
+ CHANGESET_ID_CHANGED
+ }
protected final DataSet dataSet;
diff --git a/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java b/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
index 6b0b185..ea7c0f8 100644
--- a/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
+++ b/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
@@ -98,10 +98,10 @@ public class DatasetEventManager implements MapView.EditLayerChangeListener, Lis
*/
IN_EDT,
/**
- * Fire in event dispatch thread. If more than one event arrived when event queue is checked, merged them to
- * one event
+ * Fire in event dispatch thread. If more than one event arrived when event queue is checked, merged them to one event
*/
- IN_EDT_CONSOLIDATED}
+ IN_EDT_CONSOLIDATED
+ }
private static class ListenerInfo {
private final DataSetListener listener;
diff --git a/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java b/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
index 1570a9c..c7919e5 100644
--- a/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
@@ -26,7 +26,7 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
* A data set holding histories of OSM primitives.
* @since 1670
*/
-public class HistoryDataSet implements LayerChangeListener{
+public class HistoryDataSet implements LayerChangeListener {
/** the unique instance */
private static HistoryDataSet historyDataSet;
diff --git a/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java b/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java
index 8f87c16..554d56b 100644
--- a/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java
+++ b/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java
@@ -18,7 +18,7 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
* OSM data.
*
*/
-public class HistoryRelation extends HistoryOsmPrimitive{
+public class HistoryRelation extends HistoryOsmPrimitive {
private List<RelationMemberData> members = new ArrayList<>();
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java b/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java
index 0b24e3b..3ac427a 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java
@@ -17,18 +17,21 @@ public interface Visitor {
* @param n The node to inspect.
*/
void visit(Node n);
+
/**
* Visiting call for lines.
* @param w The way to inspect.
* @since 64
*/
void visit(Way w);
+
/**
* Visiting call for relations.
* @param r The relation to inspect.
* @since 343
*/
void visit(Relation r);
+
/**
* Visiting call for changesets.
* @param cs The changeset to inspect.
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 bd5f9a8..320c194 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
@@ -25,7 +25,6 @@ import java.awt.geom.GeneralPath;
import java.awt.geom.Path2D;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
-import java.text.Bidi;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -451,7 +450,8 @@ public class StyledMapRenderer extends AbstractMapRenderer {
}
}
- protected void drawArea(OsmPrimitive osm, Path2D.Double path, Color color, MapImage fillImage, boolean disabled, TextElement text) {
+ protected void drawArea(OsmPrimitive osm, Path2D.Double path, Color color, MapImage fillImage, Float extent,
+ boolean disabled, TextElement text) {
Shape area = path.createTransformedShape(nc.getAffineTransform());
@@ -462,7 +462,15 @@ public class StyledMapRenderer extends AbstractMapRenderer {
g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.33f));
}
g.setColor(color);
- g.fill(area);
+ if (extent == null) {
+ g.fill(area);
+ } else {
+ Shape clip = g.getClip();
+ g.clip(area);
+ g.setStroke(new BasicStroke(2 * extent, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER));
+ g.draw(area);
+ g.setClip(clip);
+ }
} else {
TexturePaint texture = new TexturePaint(fillImage.getImage(disabled),
new Rectangle(0, 0, fillImage.getWidth(), fillImage.getHeight()));
@@ -471,7 +479,15 @@ public class StyledMapRenderer extends AbstractMapRenderer {
if (!Utils.equalsEpsilon(alpha, 1f)) {
g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha));
}
- g.fill(area);
+ if (extent == null) {
+ g.fill(area);
+ } else {
+ Shape clip = g.getClip();
+ BasicStroke stroke = new BasicStroke(2 * extent, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER);
+ g.clip(stroke.createStrokedShape(area));
+ g.fill(area);
+ g.setClip(clip);
+ }
g.setPaintMode();
}
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, antialiasing);
@@ -559,10 +575,13 @@ public class StyledMapRenderer extends AbstractMapRenderer {
* @param r The multipolygon relation
* @param color The color to fill the area with.
* @param fillImage The image to fill the area with. Overrides color.
+ * @param extent if not null, area will be filled partially; specifies, how
+ * far to fill from the boundary towards the center of the area;
+ * if null, area will be filled completely
* @param disabled If this should be drawn with a special disabled style.
* @param text The text to write on the area.
*/
- public void drawArea(Relation r, Color color, MapImage fillImage, boolean disabled, TextElement text) {
+ public void drawArea(Relation r, Color color, MapImage fillImage, Float extent, boolean disabled, TextElement text) {
Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, r);
if (!r.isDisabled() && !multipolygon.getOuterWays().isEmpty()) {
for (PolyData pd : multipolygon.getCombinedPolygons()) {
@@ -572,7 +591,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
}
drawArea(r, p,
pd.selected ? paintSettings.getRelationSelectedColor(color.getAlpha()) : color,
- fillImage, disabled, text);
+ fillImage, extent, disabled, text);
}
}
}
@@ -582,11 +601,14 @@ public class StyledMapRenderer extends AbstractMapRenderer {
* @param w The way.
* @param color The color to fill the area with.
* @param fillImage The image to fill the area with. Overrides color.
+ * @param extent if not null, area will be filled partially; specifies, how
+ * far to fill from the boundary towards the center of the area;
+ * if null, area will be filled completely
* @param disabled If this should be drawn with a special disabled style.
* @param text The text to write on the area.
*/
- public void drawArea(Way w, Color color, MapImage fillImage, boolean disabled, TextElement text) {
- drawArea(w, getPath(w), color, fillImage, disabled, text);
+ public void drawArea(Way w, Color color, MapImage fillImage, Float extent, boolean disabled, TextElement text) {
+ drawArea(w, getPath(w), color, fillImage, extent, disabled, text);
}
public void drawBoxText(Node n, BoxTextElemStyle bs) {
@@ -911,6 +933,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
w -= highlightStep;
}
}
+
/**
* highlights a given point by drawing a rounded rectangle around it. Give the
* size of the object you want to be highlighted, width is added automatically.
@@ -1247,37 +1270,31 @@ public class StyledMapRenderer extends AbstractMapRenderer {
tStart = t2;
}
- FontRenderContext frc = g.getFontRenderContext();
- char[] chars = name.toCharArray();
- int dirFlag = Bidi.DIRECTION_LEFT_TO_RIGHT;
- if (Bidi.requiresBidi(chars, 0, chars.length)) {
- Bidi bd = new Bidi(name, Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT);
- if (bd.isRightToLeft()) {
- dirFlag = Bidi.DIRECTION_RIGHT_TO_LEFT;
- }
- }
- // only works for text that is completely left-to-right or completely right-to-left, not bi-directional text
- GlyphVector gv = text.font.layoutGlyphVector(frc, chars, 0, chars.length, dirFlag);
-
- for (int i = 0; i < gv.getNumGlyphs(); ++i) {
- Rectangle2D rect = gv.getGlyphLogicalBounds(i).getBounds2D();
- double t = tStart + offsetSign * (rect.getX() + rect.getWidth()/2) / pathLength;
- double[] p = pointAt(t, poly, pathLength);
- if (p != null) {
- AffineTransform trfm = AffineTransform.getTranslateInstance(p[0] - rect.getX(), p[1]);
- trfm.rotate(p[2]+angleOffset);
- double off = -rect.getY() - rect.getHeight()/2 + text.yOffset;
- trfm.translate(-rect.getWidth()/2, off);
- if (isGlyphVectorDoubleTranslationBug(text.font)) {
- // scale the translation components by one half
- AffineTransform tmp = AffineTransform.getTranslateInstance(-0.5 * trfm.getTranslateX(), -0.5 * trfm.getTranslateY());
- tmp.concatenate(trfm);
- trfm = tmp;
+ List<GlyphVector> gvs = Utils.getGlyphVectorsBidi(name, text.font, g.getFontRenderContext());
+ double gvOffset = 0;
+ for (GlyphVector gv : gvs) {
+ double gvWidth = gv.getLogicalBounds().getBounds2D().getWidth();
+ for (int i = 0; i < gv.getNumGlyphs(); ++i) {
+ Rectangle2D rect = gv.getGlyphLogicalBounds(i).getBounds2D();
+ double t = tStart + offsetSign * (gvOffset + rect.getX() + rect.getWidth()/2) / pathLength;
+ double[] p = pointAt(t, poly, pathLength);
+ if (p != null) {
+ AffineTransform trfm = AffineTransform.getTranslateInstance(p[0] - rect.getX(), p[1]);
+ trfm.rotate(p[2]+angleOffset);
+ double off = -rect.getY() - rect.getHeight()/2 + text.yOffset;
+ trfm.translate(-rect.getWidth()/2, off);
+ if (isGlyphVectorDoubleTranslationBug(text.font)) {
+ // scale the translation components by one half
+ AffineTransform tmp = AffineTransform.getTranslateInstance(-0.5 * trfm.getTranslateX(), -0.5 * trfm.getTranslateY());
+ tmp.concatenate(trfm);
+ trfm = tmp;
+ }
+ gv.setGlyphTransform(i, trfm);
}
- gv.setGlyphTransform(i, trfm);
}
+ displayText(gv, null, 0, 0, way.isDisabled(), text);
+ gvOffset += gvWidth;
}
- displayText(gv, null, 0, 0, way.isDisabled(), text);
}
/**
@@ -1452,6 +1469,34 @@ public class StyledMapRenderer extends AbstractMapRenderer {
RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF;
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, antialiasing);
+ Object textAntialiasing;
+ switch (Main.pref.get("mappaint.text-antialiasing", "default")) {
+ case "on":
+ textAntialiasing = RenderingHints.VALUE_TEXT_ANTIALIAS_ON;
+ break;
+ case "off":
+ textAntialiasing = RenderingHints.VALUE_TEXT_ANTIALIAS_OFF;
+ break;
+ case "gasp":
+ textAntialiasing = RenderingHints.VALUE_TEXT_ANTIALIAS_GASP;
+ break;
+ case "lcd-hrgb":
+ textAntialiasing = RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB;
+ break;
+ case "lcd-hbgr":
+ textAntialiasing = RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HBGR;
+ break;
+ case "lcd-vrgb":
+ textAntialiasing = RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_VRGB;
+ break;
+ case "lcd-vbgr":
+ textAntialiasing = RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_VBGR;
+ break;
+ default:
+ textAntialiasing = RenderingHints.VALUE_TEXT_ANTIALIAS_DEFAULT;
+ }
+ g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, textAntialiasing);
+
highlightLineWidth = Main.pref.getInteger("mappaint.highlight.width", 4);
highlightPointRadius = Main.pref.getInteger("mappaint.highlight.radius", 7);
widerHighlight = Main.pref.getInteger("mappaint.highlight.bigger-increment", 5);
@@ -1472,6 +1517,9 @@ public class StyledMapRenderer extends AbstractMapRenderer {
}
}
}
+ if (w.isClosed()) {
+ path.closePath();
+ }
return path;
}
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 f3337f2..8434a81 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
@@ -189,7 +189,11 @@ public class Multipolygon {
}
public static class PolyData {
- public enum Intersection {INSIDE, OUTSIDE, CROSSING}
+ public enum Intersection {
+ INSIDE,
+ OUTSIDE,
+ CROSSING
+ }
private final Path2D.Double poly;
public boolean selected;
@@ -229,7 +233,7 @@ public class Multipolygon {
}
}
}
- if (!initial) { // fix #7593
+ if (nodes.size() >= 3 && nodes.get(0) == nodes.get(nodes.size() - 1)) {
poly.closePath();
}
for (PolyData inner : inners) {
diff --git a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
index 98deef5..70a81d7 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
@@ -79,7 +79,7 @@ public class TagChecker extends TagTest {
private static final List<String> ignoreDataStartsWith = new ArrayList<>();
private static final List<String> ignoreDataEquals = new ArrayList<>();
private static final List<String> ignoreDataEndsWith = new ArrayList<>();
- private static final List<IgnoreKeyPair> ignoreDataKeyPair = new ArrayList<>();
+ private static final List<Tag> ignoreDataTag = new ArrayList<>();
/** The preferences prefix */
protected static final String PREFIX = ValidatorPreference.PREFIX + "." + TagChecker.class.getSimpleName();
@@ -158,7 +158,7 @@ public class TagChecker extends TagTest {
ignoreDataStartsWith.clear();
ignoreDataEquals.clear();
ignoreDataEndsWith.clear();
- ignoreDataKeyPair.clear();
+ ignoreDataTag.clear();
harmonizedKeys.clear();
StringBuilder errorSources = new StringBuilder();
@@ -206,11 +206,7 @@ public class TagChecker extends TagTest {
ignoreDataEndsWith.add(line);
break;
case "K:":
- IgnoreKeyPair tmp = new IgnoreKeyPair();
- int mid = line.indexOf('=');
- tmp.key = line.substring(0, mid);
- tmp.value = line.substring(mid+1);
- ignoreDataKeyPair.add(tmp);
+ ignoreDataTag.add(Tag.ofString(line));
}
} else if (tagcheckerfile) {
if (!line.isEmpty()) {
@@ -308,6 +304,74 @@ public class TagChecker extends TagTest {
}
/**
+ * Determines if the given key is in internal presets.
+ * @param key key
+ * @return {@code true} if the given key is in internal presets
+ * @since 9023
+ */
+ public static boolean isKeyInPresets(String key) {
+ return presetsValueData.get(key) != null;
+ }
+
+ /**
+ * Determines if the given tag is in internal presets.
+ * @param key key
+ * @param value value
+ * @return {@code true} if the given tag is in internal presets
+ * @since 9023
+ */
+ public static boolean isTagInPresets(String key, String value) {
+ final Set<String> values = presetsValueData.get(key);
+ return values != null && (values.isEmpty() || values.contains(value));
+ }
+
+ /**
+ * Returns the list of ignored tags.
+ * @return the list of ignored tags
+ * @since 9023
+ */
+ public static List<Tag> getIgnoredTags() {
+ return new ArrayList<>(ignoreDataTag);
+ }
+
+ /**
+ * Determines if the given tag is ignored for checks "key/tag not in presets".
+ * @param key key
+ * @param value value
+ * @return {@code true} if the given tag is ignored
+ * @since 9023
+ */
+ public static boolean isTagIgnored(String key, String value) {
+ boolean tagInPresets = isTagInPresets(key, value);
+ boolean ignore = false;
+
+ for (String a : ignoreDataStartsWith) {
+ if (key.startsWith(a)) {
+ ignore = true;
+ }
+ }
+ for (String a : ignoreDataEquals) {
+ if (key.equals(a)) {
+ ignore = true;
+ }
+ }
+ for (String a : ignoreDataEndsWith) {
+ if (key.endsWith(a)) {
+ ignore = true;
+ }
+ }
+
+ if (!tagInPresets) {
+ for (Tag a : ignoreDataTag) {
+ if (key.equals(a.getKey()) && value.equals(a.getValue())) {
+ ignore = true;
+ }
+ }
+ }
+ return ignore;
+ }
+
+ /**
* Checks the primitive tags
* @param p The primitive to check
*/
@@ -372,37 +436,8 @@ public class TagChecker extends TagTest {
withErrors.put(p, "HTML");
}
if (checkValues && key != null && value != null && !value.isEmpty() && presetsValueData != null) {
- final Set<String> values = presetsValueData.get(key);
- final boolean keyInPresets = values != null;
- final boolean tagInPresets = values != null && (values.isEmpty() || values.contains(prop.getValue()));
-
- boolean ignore = false;
- for (String a : ignoreDataStartsWith) {
- if (key.startsWith(a)) {
- ignore = true;
- }
- }
- for (String a : ignoreDataEquals) {
- if (key.equals(a)) {
- ignore = true;
- }
- }
- for (String a : ignoreDataEndsWith) {
- if (key.endsWith(a)) {
- ignore = true;
- }
- }
-
- if (!tagInPresets) {
- for (IgnoreKeyPair a : ignoreDataKeyPair) {
- if (key.equals(a.key) && value.equals(a.value)) {
- ignore = true;
- }
- }
- }
-
- if (!ignore) {
- if (!keyInPresets) {
+ if (!isTagIgnored(key, value)) {
+ if (!isKeyInPresets(key)) {
String prettifiedKey = harmonizeKey(key);
String fixedKey = harmonizedKeys.get(prettifiedKey);
if (fixedKey != null && !"".equals(fixedKey) && !fixedKey.equals(key)) {
@@ -419,10 +454,10 @@ public class TagChecker extends TagTest {
tr(i, key), MessageFormat.format(i, key), INVALID_VALUE, p));
withErrors.put(p, "UPK");
}
- } else if (!tagInPresets) {
+ } else if (!isTagInPresets(key, value)) {
// try to fix common typos and check again if value is still unknown
String fixedValue = harmonizeValue(prop.getValue());
- Map<String, String> possibleValues = getPossibleValues(values);
+ Map<String, String> possibleValues = getPossibleValues(presetsValueData.get(key));
if (possibleValues.containsKey(fixedValue)) {
fixedValue = possibleValues.get(fixedValue);
// misspelled preset value
@@ -643,11 +678,6 @@ public class TagChecker extends TagTest {
return false;
}
- protected static class IgnoreKeyPair {
- public String key;
- public String value;
- }
-
protected static class CheckerData {
private String description;
protected List<CheckerElement> data = new ArrayList<>();
diff --git a/src/org/openstreetmap/josm/gui/ExtendedDialog.java b/src/org/openstreetmap/josm/gui/ExtendedDialog.java
index 366219a..e63ff8c 100644
--- a/src/org/openstreetmap/josm/gui/ExtendedDialog.java
+++ b/src/org/openstreetmap/josm/gui/ExtendedDialog.java
@@ -608,7 +608,7 @@ public class ExtendedDialog extends JDialog {
* This function checks the state of the "Do not show again" checkbox and
* writes the corresponding pref.
*/
- private void toggleSaveState() {
+ protected void toggleSaveState() {
if (!toggleable ||
togglePanel == null ||
cancelButtonIdx.contains(result) ||
diff --git a/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java b/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
index 9c3bdb7..265d2af 100644
--- a/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
+++ b/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
@@ -281,8 +281,8 @@ public final class HelpAwareOptionPane {
public void actionPerformed(ActionEvent e) {
pane.setValue(JOptionPane.CLOSED_OPTION);
dialog.setVisible(false);
- }}
- );
+ }
+ });
if (options != null) {
for (int i = 0; i < options.length; i++) {
diff --git a/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java b/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
index 27fc39a..89fed3a 100644
--- a/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
+++ b/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
@@ -48,7 +48,7 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
* </ul>
*
*/
-public final class JosmUserIdentityManager implements PreferenceChangedListener{
+public final class JosmUserIdentityManager implements PreferenceChangedListener {
private static JosmUserIdentityManager instance;
diff --git a/src/org/openstreetmap/josm/gui/MainMenu.java b/src/org/openstreetmap/josm/gui/MainMenu.java
index 0573b46..242e782 100644
--- a/src/org/openstreetmap/josm/gui/MainMenu.java
+++ b/src/org/openstreetmap/josm/gui/MainMenu.java
@@ -740,6 +740,9 @@ public class MainMenu extends JMenuBar {
add(viewMenu, historyinfo);
add(viewMenu, historyinfoweb);
viewMenu.addSeparator();
+ viewMenu.add(new PreferenceToggleAction(tr("Main toolbar"),
+ tr("Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"),
+ "toolbar.visible", true).getCheckbox());
viewMenu.add(new PreferenceToggleAction(tr("Edit toolbar"),
tr("Toggles the visibility of the edit toolbar (i.e., the vertical tool)"),
"sidetoolbar.visible", true).getCheckbox());
@@ -943,6 +946,7 @@ public class MainMenu extends JMenuBar {
MapView.addLayerChangeListener(this);
this.presetsMenu = presetsMenu;
}
+
/**
* Refreshes the enabled state
*/
diff --git a/src/org/openstreetmap/josm/gui/MapFrame.java b/src/org/openstreetmap/josm/gui/MapFrame.java
index 2bbce98..5534620 100644
--- a/src/org/openstreetmap/josm/gui/MapFrame.java
+++ b/src/org/openstreetmap/josm/gui/MapFrame.java
@@ -688,6 +688,7 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
mapModeChangeListeners.addIfAbsent(listener);
}
}
+
/**
* Removes a mapMode change listener
*
diff --git a/src/org/openstreetmap/josm/gui/MapStatus.java b/src/org/openstreetmap/josm/gui/MapStatus.java
index 53ba33e..ec96ed5 100644
--- a/src/org/openstreetmap/josm/gui/MapStatus.java
+++ b/src/org/openstreetmap/josm/gui/MapStatus.java
@@ -494,7 +494,8 @@ public class MapStatus extends JPanel implements Helpful, Destroyable, Preferenc
@Override
public void run() {
staticPopup.hide();
- }});
+ }
+ });
}
/**
@@ -518,10 +519,11 @@ public class MapStatus extends JPanel implements Helpful, Destroyable, Preferenc
} else {
// There is no old popup
EventQueue.invokeLater(new Runnable() {
- @Override
- public void run() {
- staticPopup.show();
- }});
+ @Override
+ public void run() {
+ staticPopup.show();
+ }
+ });
}
this.popupLabels = lbls;
this.popup = newPopup;
diff --git a/src/org/openstreetmap/josm/gui/SelectionManager.java b/src/org/openstreetmap/josm/gui/SelectionManager.java
index b1f7d08..126d55e 100644
--- a/src/org/openstreetmap/josm/gui/SelectionManager.java
+++ b/src/org/openstreetmap/josm/gui/SelectionManager.java
@@ -180,6 +180,7 @@ public class SelectionManager implements MouseListener, MouseMotionListener, Pro
});
eventSource.addTemporaryLayer(selectionHintLayer);
}
+
/**
* Unregister itself from the given event source and hide the selection hint layer.
*
diff --git a/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
index a180274..495e290 100644
--- a/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
+++ b/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
@@ -79,7 +79,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
* f.setVisible(true);
* </pre>
*/
-public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
+public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser {
/** the current bounding box */
private transient Bounds bbox;
@@ -216,7 +216,7 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
* when the user successfully enters a valid tile grid specification.
*
*/
- private static class TileGridInputPanel extends JPanel implements PropertyChangeListener{
+ private static class TileGridInputPanel extends JPanel implements PropertyChangeListener {
public static final String TILE_BOUNDS_PROP = TileGridInputPanel.class.getName() + ".tileBounds";
private JosmTextField tfMaxY;
@@ -448,7 +448,7 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
JPanel pnl = new JPanel(new BorderLayout());
HtmlPanel msg = new HtmlPanel();
msg.setText(tr("<html>Alternatively you may enter a <strong>tile address</strong> for a single tile "
- + "in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile addresses "
+ + "in the format <i>zoomlevel/x/y</i>, e.g. <i>15/256/223</i>. Tile addresses "
+ "in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</html>"));
pnl.add(msg);
return pnl;
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java
index a274705..830f764 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java
@@ -6,7 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import javax.swing.table.DefaultTableColumnModel;
import javax.swing.table.TableColumn;
-public class RelationMemberListColumnModel extends DefaultTableColumnModel{
+public class RelationMemberListColumnModel extends DefaultTableColumnModel {
protected final void createColumns() {
TableColumn col = null;
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java b/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
index 7247e85..937f7c3 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
@@ -78,8 +78,8 @@ import org.openstreetmap.josm.tools.WindowGeometry;
* You should also set the target primitive which other primitives (ways or nodes) are
* merged to, see {@link #setTargetPrimitive(OsmPrimitive)}.
*
- * After the dialog is closed use {@link #isCanceled()} to check whether the user canceled
- * the dialog. If it wasn't canceled you may build a collection of {@link Command} objects
+ * After the dialog is closed use {@link #isApplied()} to check whether the dialog has been
+ * applied. If it was applied you may build a collection of {@link Command} objects
* which reflect the conflict resolution decisions the user made in the dialog:
* see {@link #buildResolutionCommands()}
*/
@@ -109,7 +109,7 @@ public class CombinePrimitiveResolverDialog extends JDialog {
private AutoAdjustingSplitPane spTagConflictTypes;
private TagConflictResolver pnlTagConflictResolver;
protected RelationMemberConflictResolver pnlRelationMemberConflictResolver;
- private boolean canceled;
+ private boolean applied;
private JPanel pnlButtons;
protected transient OsmPrimitive targetPrimitive;
@@ -337,16 +337,16 @@ public class CombinePrimitiveResolverDialog extends JDialog {
pnlRelationMemberConflictResolver.prepareForEditing();
}
- protected void setCanceled(boolean canceled) {
- this.canceled = canceled;
+ protected void setApplied(boolean applied) {
+ this.applied = applied;
}
/**
- * Determines if this dialog has been cancelled.
- * @return true if this dialog has been cancelled, false otherwise.
+ * Determines if this dialog has been closed with "Apply".
+ * @return true if this dialog has been closed with "Apply", false otherwise.
*/
- public boolean isCanceled() {
- return canceled;
+ public boolean isApplied() {
+ return applied;
}
@Override
@@ -355,7 +355,7 @@ public class CombinePrimitiveResolverDialog extends JDialog {
prepareGUIBeforeConflictResolutionStarts();
new WindowGeometry(getClass().getName() + ".geometry", WindowGeometry.centerInWindow(Main.parent,
new Dimension(600, 400))).applySafe(this);
- setCanceled(false);
+ setApplied(false);
btnApply.requestFocusInWindow();
} else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
new WindowGeometry(this).remember(getClass().getName() + ".geometry");
@@ -374,7 +374,6 @@ public class CombinePrimitiveResolverDialog extends JDialog {
@Override
public void actionPerformed(ActionEvent arg0) {
- setCanceled(true);
setVisible(false);
}
}
@@ -390,6 +389,7 @@ public class CombinePrimitiveResolverDialog extends JDialog {
@Override
public void actionPerformed(ActionEvent arg0) {
+ setApplied(true);
setVisible(false);
pnlTagConflictResolver.rememberPreferences();
}
@@ -514,7 +514,7 @@ public class CombinePrimitiveResolverDialog extends JDialog {
// Resolve tag conflicts if necessary
if (!dialog.isResolvedCompletely()) {
dialog.setVisible(true);
- if (dialog.isCanceled()) {
+ if (!dialog.isApplied()) {
throw new UserCancelException();
}
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java b/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java
index 1559dd0..0c97b5c 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java
@@ -43,6 +43,7 @@ public class MultiValueCellEditor extends AbstractCellEditor implements TableCel
public interface NavigationListener {
/** Call when need to go to next row */
void gotoNextDecision();
+
/** Call when need to go to previous row */
void gotoPreviousDecision();
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java
index 3a1984d..f05572b 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java
@@ -6,7 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import javax.swing.table.DefaultTableColumnModel;
import javax.swing.table.TableColumn;
-public class TagConflictResolverColumnModel extends DefaultTableColumnModel{
+public class TagConflictResolverColumnModel extends DefaultTableColumnModel {
protected final void createColumns() {
TableColumn col = null;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
index e0e9bfe..3e2bbcb 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
@@ -72,7 +72,7 @@ import org.openstreetmap.josm.tools.OpenBrowser;
* the current data layer being assigned to a specific changeset.
*
*/
-public class ChangesetDialog extends ToggleDialog{
+public class ChangesetDialog extends ToggleDialog {
private ChangesetInSelectionListModel inSelectionModel;
private ChangesetsInActiveDataLayerListModel inActiveDataLayerModel;
private JList<Changeset> lstInSelection;
@@ -290,7 +290,7 @@ public class ChangesetDialog extends ToggleDialog{
/**
* Selects objects for the currently selected changesets.
*/
- class SelectObjectsAction extends AbstractAction implements ListSelectionListener, ItemListener{
+ class SelectObjectsAction extends AbstractAction implements ListSelectionListener, ItemListener {
SelectObjectsAction() {
putValue(NAME, tr("Select"));
@@ -344,7 +344,7 @@ public class ChangesetDialog extends ToggleDialog{
* Downloads selected changesets
*
*/
- class ReadChangesetsAction extends AbstractAction implements ListSelectionListener, ItemListener{
+ class ReadChangesetsAction extends AbstractAction implements ListSelectionListener, ItemListener {
ReadChangesetsAction() {
putValue(NAME, tr("Download"));
putValue(SHORT_DESCRIPTION, tr("Download information about the selected changesets from the OSM server"));
diff --git a/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java b/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
index 57279cf..d983ab6 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
@@ -421,7 +421,10 @@ public class CommandStackDialog extends ToggleDialog implements CommandQueueList
/**
* undo / redo switch to reduce duplicate code
*/
- protected enum UndoRedoType {UNDO, REDO}
+ protected enum UndoRedoType {
+ UNDO,
+ REDO
+ }
/**
* Action to undo or redo all commands up to (and including) the seleced item.
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
index 5dc4304..e15a532 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
@@ -62,7 +62,7 @@ import org.openstreetmap.josm.tools.Shortcut;
* dialog on the right of the main frame.
*
*/
-public final class ConflictDialog extends ToggleDialog implements MapView.EditLayerChangeListener, IConflictListener, SelectionChangedListener{
+public final class ConflictDialog extends ToggleDialog implements MapView.EditLayerChangeListener, IConflictListener, SelectionChangedListener {
/**
* Replies the color used to paint conflicts.
diff --git a/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java b/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java
index 44d6784..fb6cf7c 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java
@@ -41,6 +41,7 @@ import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.widgets.HtmlPanel;
+import org.openstreetmap.josm.tools.I18n;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.WindowGeometry;
@@ -105,19 +106,16 @@ public class DeleteFromRelationConfirmationDialog extends JDialog implements Tab
protected void updateMessage() {
int numObjectsToDelete = model.getNumObjectsToDelete();
int numParentRelations = model.getNumParentRelations();
- String msg;
- if (numObjectsToDelete == 1 && numParentRelations == 1) {
- msg = tr("<html>Please confirm to remove <strong>1 object</strong> from <strong>1 relation</strong>.</html>");
- } else if (numObjectsToDelete == 1 && numParentRelations > 1) {
- msg = tr("<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} relations</strong>.</html>",
- numParentRelations);
- } else if (numObjectsToDelete > 1 && numParentRelations == 1) {
- msg = tr("<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} relations</strong>.</html>",
- numParentRelations);
- } else {
- msg = tr("<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} relations</strong>.</html>",
- numObjectsToDelete, numParentRelations);
- }
+ final String msg1 = trn(
+ "Please confirm to remove <strong>{0} object</strong>.",
+ "Please confirm to remove <strong>{0} objects</strong>.",
+ numObjectsToDelete, numObjectsToDelete);
+ final String msg2 = trn(
+ "{0} relation is affected.",
+ "{0} relations are affected.",
+ numParentRelations, numParentRelations);
+ @I18n.QuirkyPluralString
+ final String msg = "<html>" + msg1 + " " + msg2 + "</html>";
htmlPanel.getEditorPane().setText(msg);
invalidate();
}
@@ -275,7 +273,7 @@ public class DeleteFromRelationConfirmationDialog extends JDialog implements Tab
}
}
- private static class RelationMemberTableColumnModel extends DefaultTableColumnModel{
+ private static class RelationMemberTableColumnModel extends DefaultTableColumnModel {
protected final void createColumns() {
TableColumn col = null;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java b/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
index dacda2c..b7c8a7d 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
@@ -98,6 +98,7 @@ public class DialogsPanel extends JPanel implements Destroyable {
/* INVISIBLE_TO_COLLAPSED, does not happen */
ELEMENT_SHRINKS /* else. (Remaining elements have more space.) */
}
+
/**
* Reconstruct the view, if the configurations of dialogs has changed.
* @param action what happened, so the reconstruction is necessary
diff --git a/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java b/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
index 1242ffa..c630d1c 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
@@ -149,7 +149,8 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
if (filter != null) {
filterModel.addFilter(filter);
}
- }});
+ }
+ });
SideButton editButton = new SideButton(new AbstractAction() {
{
putValue(NAME, tr("Edit"));
diff --git a/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
index 4543e47..ab72c83 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
@@ -692,7 +692,7 @@ public class LayerListDialog extends ToggleDialog {
*/
public final class ActivateLayerAction extends AbstractAction
- implements IEnabledStateUpdating, MapView.LayerChangeListener, MultikeyShortcutAction{
+ implements IEnabledStateUpdating, MapView.LayerChangeListener, MultikeyShortcutAction {
private transient Layer layer;
private transient Shortcut multikeyShortcut;
@@ -1149,7 +1149,7 @@ public class LayerListDialog extends ToggleDialog {
/**
* The action to move up the currently selected entries in the list.
*/
- class MoveUpAction extends AbstractAction implements IEnabledStateUpdating{
+ class MoveUpAction extends AbstractAction implements IEnabledStateUpdating {
MoveUpAction() {
putValue(NAME, tr("Move up"));
putValue(SMALL_ICON, ImageProvider.get("dialogs", "up"));
diff --git a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
index 667a18e..1f2183d 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
@@ -114,7 +114,8 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
noteData.setSelectedNote(displayList.getSelectedValue());
}
updateButtonStates();
- }});
+ }
+ });
displayList.addMouseListener(new MouseAdapter() {
//center view on selected note on double click
@Override
diff --git a/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
index a299979..55a80fd 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
@@ -4,11 +4,12 @@ package org.openstreetmap.josm.gui.dialogs;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.BorderLayout;
-import java.awt.Color;
import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -28,9 +29,6 @@ import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import javax.swing.KeyStroke;
import javax.swing.ListSelectionModel;
-import javax.swing.UIManager;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
@@ -69,6 +67,7 @@ import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.util.HighlightHelper;
+import org.openstreetmap.josm.gui.widgets.CompileSearchTextDecorator;
import org.openstreetmap.josm.gui.widgets.DisableShortcutsOnFocusGainedTextField;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
@@ -282,33 +281,11 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
private JosmTextField setupFilter() {
final JosmTextField f = new DisableShortcutsOnFocusGainedTextField();
f.setToolTipText(tr("Relation list filter"));
- f.getDocument().addDocumentListener(new DocumentListener() {
-
- private void setFilter() {
- try {
- f.setBackground(UIManager.getColor("TextField.background"));
- f.setToolTipText(tr("Relation list filter"));
- model.setFilter(SearchCompiler.compile(filter.getText()));
- } catch (SearchCompiler.ParseError ex) {
- f.setBackground(new Color(255, 224, 224));
- f.setToolTipText(ex.getMessage());
- model.setFilter(new SearchCompiler.Always());
- }
- }
-
- @Override
- public void insertUpdate(DocumentEvent e) {
- setFilter();
- }
-
- @Override
- public void removeUpdate(DocumentEvent e) {
- setFilter();
- }
-
+ final CompileSearchTextDecorator decorator = CompileSearchTextDecorator.decorate(f);
+ f.addPropertyChangeListener("filter", new PropertyChangeListener() {
@Override
- public void changedUpdate(DocumentEvent e) {
- setFilter();
+ public void propertyChange(PropertyChangeEvent evt) {
+ model.setFilter(decorator.getMatch());
}
});
return f;
@@ -350,7 +327,7 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
* The action for creating a new relation
*
*/
- static class NewAction extends AbstractAction implements LayerChangeListener{
+ static class NewAction extends AbstractAction implements LayerChangeListener {
NewAction() {
putValue(SHORT_DESCRIPTION, tr("Create a new relation"));
putValue(NAME, tr("New"));
diff --git a/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
index 6948a4d..532cb89 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
@@ -154,7 +154,7 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
}
- class SelectUsersPrimitivesAction extends AbstractAction implements ListSelectionListener{
+ class SelectUsersPrimitivesAction extends AbstractAction implements ListSelectionListener {
/**
* Constructs a new {@code SelectUsersPrimitivesAction}.
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
index 79d2b19..427056a 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
@@ -398,7 +398,7 @@ public class ChangesetCacheManager extends JFrame {
* Removes the selected changesets from the local changeset cache
*
*/
- class RemoveFromCacheAction extends AbstractAction implements ListSelectionListener{
+ class RemoveFromCacheAction extends AbstractAction implements ListSelectionListener {
RemoveFromCacheAction() {
putValue(NAME, tr("Remove from cache"));
putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
@@ -426,7 +426,7 @@ public class ChangesetCacheManager extends JFrame {
* Closes the selected changesets
*
*/
- class CloseSelectedChangesetsAction extends AbstractAction implements ListSelectionListener{
+ class CloseSelectedChangesetsAction extends AbstractAction implements ListSelectionListener {
CloseSelectedChangesetsAction() {
putValue(NAME, tr("Close"));
putValue(SMALL_ICON, ImageProvider.get("closechangeset"));
@@ -468,7 +468,7 @@ public class ChangesetCacheManager extends JFrame {
* Downloads the selected changesets
*
*/
- class DownloadSelectedChangesetsAction extends AbstractAction implements ListSelectionListener{
+ class DownloadSelectedChangesetsAction extends AbstractAction implements ListSelectionListener {
DownloadSelectedChangesetsAction() {
putValue(NAME, tr("Update changeset"));
putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "updatechangeset"));
@@ -497,7 +497,7 @@ public class ChangesetCacheManager extends JFrame {
* Downloads the content of selected changesets from the OSM server
*
*/
- class DownloadSelectedChangesetContentAction extends AbstractAction implements ListSelectionListener{
+ class DownloadSelectedChangesetContentAction extends AbstractAction implements ListSelectionListener {
DownloadSelectedChangesetContentAction() {
putValue(NAME, tr("Download changeset content"));
putValue(SMALL_ICON, DOWNLOAD_CONTENT_ICON);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
index ae835f4..d22ad9c 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
@@ -24,7 +24,7 @@ import org.openstreetmap.josm.gui.util.GuiHelper;
* This is the model for the changeset cache manager dialog.
*
*/
-public class ChangesetCacheManagerModel extends AbstractTableModel implements ChangesetCacheListener{
+public class ChangesetCacheManagerModel extends AbstractTableModel implements ChangesetCacheListener {
/** the name of the property for the currently selected changeset in the detail view */
public static final String CHANGESET_IN_DETAIL_VIEW_PROP = ChangesetCacheManagerModel.class.getName() + ".changesetInDetailView";
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java
index 8911b0d..0e9a8dc 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java
@@ -28,7 +28,7 @@ import org.xml.sax.SAXException;
* changesets.
*
*/
-public class ChangesetContentDownloadTask extends PleaseWaitRunnable implements ChangesetDownloadTask{
+public class ChangesetContentDownloadTask extends PleaseWaitRunnable implements ChangesetDownloadTask {
/** the list of changeset ids to download */
private final List<Integer> toDownload = new ArrayList<>();
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
index 5917a77..b62529a 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
@@ -190,7 +190,7 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
* Downloads/Updates the content of the changeset
*
*/
- class DownloadChangesetContentAction extends AbstractAction{
+ class DownloadChangesetContentAction extends AbstractAction {
DownloadChangesetContentAction() {
putValue(NAME, tr("Download content"));
putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
@@ -316,7 +316,7 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
}
}
- class SelectInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener{
+ class SelectInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener {
SelectInCurrentLayerAction() {
putValue(NAME, tr("Select in layer"));
@@ -366,7 +366,7 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
}
}
- class ZoomInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener{
+ class ZoomInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener {
ZoomInCurrentLayerAction() {
putValue(NAME, tr("Zoom to in layer"));
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
index 6255305..9d75f13 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
@@ -138,7 +138,7 @@ public class ChangesetContentTableModel extends AbstractTableModel {
* with their {@link ChangesetModificationType}.
*
*/
- private static class ChangesetContentEntry implements ChangesetDataSetEntry{
+ private static class ChangesetContentEntry implements ChangesetDataSetEntry {
private final ChangesetModificationType modificationType;
private final HistoryOsmPrimitive primitive;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
index 8e59764..e52c2fc 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
@@ -325,7 +325,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
* Updates the current changeset from the OSM server
*
*/
- class UpdateChangesetAction extends AbstractAction{
+ class UpdateChangesetAction extends AbstractAction {
UpdateChangesetAction() {
putValue(NAME, tr("Update changeset"));
putValue(SMALL_ICON, ChangesetCacheManager.UPDATE_CONTENT_ICON);
@@ -353,7 +353,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
* data layer.
*
*/
- class SelectInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener{
+ class SelectInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener {
SelectInCurrentLayerAction() {
putValue(NAME, tr("Select in layer"));
@@ -414,7 +414,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
* data layer.
*
*/
- class ZoomInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener{
+ class ZoomInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener {
ZoomInCurrentLayerAction() {
putValue(NAME, tr("Zoom to in layer"));
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDownloadTask.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDownloadTask.java
index b42e415..e863aeb 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDownloadTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDownloadTask.java
@@ -5,7 +5,7 @@ import java.util.Set;
import org.openstreetmap.josm.data.osm.Changeset;
-public interface ChangesetDownloadTask extends Runnable{
+public interface ChangesetDownloadTask extends Runnable {
Set<Changeset> getDownloadedChangesets();
boolean isCanceled();
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
index 23c3649..4612a88 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
@@ -33,7 +33,7 @@ import org.xml.sax.SAXException;
* updates the global {@link ChangesetCache}.
*
*/
-public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements ChangesetDownloadTask{
+public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements ChangesetDownloadTask {
/**
* Builds a download task from for a collection of changesets.
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java
index 701d206..6f9c22e 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java
@@ -10,11 +10,12 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-public class ChangesetInSelectionListModel extends ChangesetListModel implements SelectionChangedListener, EditLayerChangeListener{
+public class ChangesetInSelectionListModel extends ChangesetListModel implements SelectionChangedListener, EditLayerChangeListener {
public ChangesetInSelectionListModel(DefaultListSelectionModel selectionModel) {
super(selectionModel);
}
+
/* ---------------------------------------------------------------------------- */
/* Interface SelectionChangeListener */
/* ---------------------------------------------------------------------------- */
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java
index cd3faa1..4733912 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java
@@ -17,7 +17,7 @@ import org.openstreetmap.josm.gui.tagging.TagTable;
* This panel displays the tags of the currently selected changeset in the {@link ChangesetCacheManager}
*
*/
-public class ChangesetTagsPanel extends JPanel implements PropertyChangeListener{
+public class ChangesetTagsPanel extends JPanel implements PropertyChangeListener {
private TagEditorModel model;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java
index 34ce6d9..15dd835 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java
@@ -75,7 +75,7 @@ public class SingleChangesetDownloadPanel extends JPanel {
/**
* Downloads the single changeset from the OSM API
*/
- class DownloadAction extends AbstractAction implements DocumentListener{
+ class DownloadAction extends AbstractAction implements DocumentListener {
DownloadAction() {
putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java
index 4021805..e771ef7 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java
@@ -34,7 +34,7 @@ import org.xml.sax.SAXException;
* Asynchronous task to send a changeset query to the OSM API.
* @since 2689
*/
-public class ChangesetQueryTask extends PleaseWaitRunnable implements ChangesetDownloadTask{
+public class ChangesetQueryTask extends PleaseWaitRunnable implements ChangesetDownloadTask {
/** the changeset query */
private ChangesetQuery query;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
index 6142c9f..3c47fb1 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
@@ -13,6 +13,8 @@ import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import java.net.HttpURLConnection;
import java.net.URI;
import java.net.URISyntaxException;
@@ -47,6 +49,7 @@ import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel;
+import javax.swing.table.TableRowSorter;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.JosmAction;
@@ -56,6 +59,7 @@ import org.openstreetmap.josm.actions.relation.SelectInRelationListAction;
import org.openstreetmap.josm.actions.relation.SelectMembersAction;
import org.openstreetmap.josm.actions.relation.SelectRelationAction;
import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
+import org.openstreetmap.josm.actions.search.SearchCompiler;
import org.openstreetmap.josm.command.ChangeCommand;
import org.openstreetmap.josm.command.ChangePropertyCommand;
import org.openstreetmap.josm.command.Command;
@@ -84,12 +88,16 @@ import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.util.HighlightHelper;
+import org.openstreetmap.josm.gui.widgets.CompileSearchTextDecorator;
+import org.openstreetmap.josm.gui.widgets.DisableShortcutsOnFocusGainedTextField;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
+import org.openstreetmap.josm.tools.AlphanumComparator;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.InputMapUtils;
@@ -127,7 +135,9 @@ implements SelectionChangedListener, MapView.EditLayerChangeListener, DataSetLis
/**
* The tag data of selected objects.
*/
- private final DefaultTableModel tagData = new ReadOnlyTableModel();
+ private final ReadOnlyTableModel tagData = new ReadOnlyTableModel();
+ private final TableRowSorter<ReadOnlyTableModel> tagRowSorter = new TableRowSorter<>(tagData);
+ private final JosmTextField tagTableFilter;
/**
* The membership data of selected objects.
@@ -242,6 +252,8 @@ implements SelectionChangedListener, MapView.EditLayerChangeListener, DataSetLis
setupMembershipMenu();
buildMembershipTable();
+ tagTableFilter = setupFilter();
+
// combine both tables and wrap them in a scrollPane
boolean top = Main.pref.getBoolean("properties.presets.top", true);
bothTables.setLayout(new GridBagLayout());
@@ -251,6 +263,7 @@ implements SelectionChangedListener, MapView.EditLayerChangeListener, DataSetLis
bothTables.add(pluginHook, GBC.eol().insets(0, 1, 1, 1).anchor(GBC.NORTHEAST).weight(epsilon, epsilon));
}
bothTables.add(selectSth, GBC.eol().fill().insets(10, 10, 10, 10));
+ bothTables.add(tagTableFilter, GBC.eol().fill(GBC.HORIZONTAL));
bothTables.add(tagTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL));
bothTables.add(tagTable, GBC.eol().fill(GBC.BOTH));
bothTables.add(membershipTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL));
@@ -293,6 +306,21 @@ implements SelectionChangedListener, MapView.EditLayerChangeListener, DataSetLis
PropertiesCellRenderer cellRenderer = new PropertiesCellRenderer();
tagTable.getColumnModel().getColumn(0).setCellRenderer(cellRenderer);
tagTable.getColumnModel().getColumn(1).setCellRenderer(cellRenderer);
+ tagTable.setRowSorter(tagRowSorter);
+
+ tagRowSorter.setComparator(0, AlphanumComparator.getInstance());
+ tagRowSorter.setComparator(1, new Comparator<Object>() {
+ @Override
+ public int compare(Object o1, Object o2) {
+ if (o1 instanceof Map && o2 instanceof Map) {
+ final String v1 = ((Map) o1).size() == 1 ? (String) ((Map) o1).keySet().iterator().next() : tr("<different>");
+ final String v2 = ((Map) o2).size() == 1 ? (String) ((Map) o2).keySet().iterator().next() : tr("<different>");
+ return AlphanumComparator.getInstance().compare(v1, v2);
+ } else {
+ return AlphanumComparator.getInstance().compare(String.valueOf(o1), String.valueOf(o2));
+ }
+ }
+ });
}
private void buildMembershipTable() {
@@ -455,6 +483,10 @@ implements SelectionChangedListener, MapView.EditLayerChangeListener, DataSetLis
tagTable.addMouseListener(new PopupMenuLauncher(tagMenu));
}
+ public void setFilter(final SearchCompiler.Match filter) {
+ this.tagRowSorter.setRowFilter(new SearchBasedRowFilter(filter));
+ }
+
/**
* Assigns all needed keys like Enter and Spacebar to most important actions.
*/
@@ -499,6 +531,19 @@ implements SelectionChangedListener, MapView.EditLayerChangeListener, DataSetLis
getActionMap().put("onHelp", helpAction);
}
+ private JosmTextField setupFilter() {
+ final JosmTextField f = new DisableShortcutsOnFocusGainedTextField();
+ f.setToolTipText(tr("Tag filter"));
+ final CompileSearchTextDecorator decorator = CompileSearchTextDecorator.decorate(f);
+ f.addPropertyChangeListener("filter", new PropertyChangeListener() {
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ setFilter(decorator.getMatch());
+ }
+ });
+ return f;
+ }
+
/**
* This simply fires up an {@link RelationEditor} for the relation shown; everything else
* is the editor's business.
@@ -662,11 +707,12 @@ implements SelectionChangedListener, MapView.EditLayerChangeListener, DataSetLis
List<Relation> sortedRelations = new ArrayList<>(roles.keySet());
Collections.sort(sortedRelations, new Comparator<Relation>() {
- @Override public int compare(Relation o1, Relation o2) {
+ @Override
+ public int compare(Relation o1, Relation o2) {
int comp = Boolean.valueOf(o1.isDisabledAndHidden()).compareTo(o2.isDisabledAndHidden());
return comp != 0 ? comp : DefaultNameFormatter.getInstance().getRelationComparator().compare(o1, o2);
- }}
- );
+ }
+ });
for (Relation r: sortedRelations) {
membershipData.addRow(new Object[]{r, roles.get(r)});
@@ -685,6 +731,7 @@ implements SelectionChangedListener, MapView.EditLayerChangeListener, DataSetLis
deleteAction.setEnabled(hasTags || hasMemberships);
tagTable.setVisible(hasTags);
tagTable.getTableHeader().setVisible(hasTags);
+ tagTableFilter.setVisible(hasTags);
selectSth.setVisible(!hasSelection);
pluginHook.setVisible(hasSelection);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/SearchBasedRowFilter.java b/src/org/openstreetmap/josm/gui/dialogs/properties/SearchBasedRowFilter.java
new file mode 100644
index 0000000..72fcd7c
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/SearchBasedRowFilter.java
@@ -0,0 +1,88 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.properties;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
+import javax.swing.RowFilter;
+import javax.swing.table.TableModel;
+
+import org.openstreetmap.josm.actions.search.SearchCompiler;
+import org.openstreetmap.josm.data.osm.Tagged;
+
+/**
+ * A {@link RowFilter} implementation which matches tags w.r.t. the specified filter's
+ * {@link SearchCompiler.Match#match(org.openstreetmap.josm.data.osm.Tagged)} method.
+ *
+ * <p>An {@link javax.swing.RowFilter.Entry}'s column 0 is considered as key, and column 1 is considered as value.</p>
+ */
+class SearchBasedRowFilter extends RowFilter<TableModel, Integer> {
+
+ final SearchCompiler.Match filter;
+
+ /**
+ * Constructs a new {@code SearchBasedRowFilter} with the given filter.
+ * @param filter the filter used to match tags
+ */
+ SearchBasedRowFilter(SearchCompiler.Match filter) {
+ this.filter = filter;
+ }
+
+ @Override
+ public boolean include(Entry entry) {
+ final String key = entry.getStringValue(0);
+ final String value = entry.getStringValue(1);
+ return filter.match(new OneKeyValue(key, value));
+ }
+
+ static class OneKeyValue implements Tagged {
+ private final String key;
+ private final String value;
+
+ OneKeyValue(String key, String value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ @Override
+ public void setKeys(Map<String, String> keys) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Map<String, String> getKeys() {
+ return Collections.singletonMap(key, value);
+ }
+
+ @Override
+ public void put(String key, String value) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String get(String k) {
+ return key.equals(k) ? value : null;
+ }
+
+ @Override
+ public void remove(String key) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean hasKeys() {
+ return true;
+ }
+
+ @Override
+ public Collection<String> keySet() {
+ return Collections.singleton(key);
+ }
+
+ @Override
+ public void removeAll() {
+ throw new UnsupportedOperationException();
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java b/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
index 34126b7..8db7201 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
@@ -216,7 +216,7 @@ public class ChildRelationBrowser extends JPanel {
* Action for downloading all child relations for a given parent relation.
* Recursively.
*/
- class DownloadAllChildRelationsAction extends AbstractAction{
+ class DownloadAllChildRelationsAction extends AbstractAction {
DownloadAllChildRelationsAction() {
putValue(SHORT_DESCRIPTION, tr("Download all child relations (recursively)"));
putValue(SMALL_ICON, ImageProvider.get("download"));
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
index 29ef27c..5c5128b 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
@@ -82,8 +82,8 @@ import org.openstreetmap.josm.gui.tagging.TagEditorModel;
import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
import org.openstreetmap.josm.io.OnlineResource;
import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -1207,7 +1207,7 @@ public class GenericRelationEditor extends RelationEditor {
}
}
- class DeleteCurrentRelationAction extends AbstractAction implements PropertyChangeListener{
+ class DeleteCurrentRelationAction extends AbstractAction implements PropertyChangeListener {
DeleteCurrentRelationAction() {
putValue(SHORT_DESCRIPTION, tr("Delete the currently edited relation"));
putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
@@ -1564,7 +1564,7 @@ public class GenericRelationEditor extends RelationEditor {
}
}
- class DownloadSelectedIncompleteMembersAction extends AbstractAction implements ListSelectionListener, TableModelListener{
+ class DownloadSelectedIncompleteMembersAction extends AbstractAction implements ListSelectionListener, TableModelListener {
DownloadSelectedIncompleteMembersAction() {
putValue(SHORT_DESCRIPTION, tr("Download selected incomplete members"));
putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincompleteselected"));
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
index 1c881b5..c0dd0c2 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
@@ -122,26 +122,27 @@ public class MemberTable extends OsmPrimitivesTable implements IMemberModelListe
}
private transient ListSelectionListener highlighterListener = new ListSelectionListener() {
- @Override
- public void valueChanged(ListSelectionEvent lse) {
- if (Main.isDisplayingMapView()) {
- Collection<RelationMember> sel = getMemberTableModel().getSelectedMembers();
- final List<OsmPrimitive> toHighlight = new ArrayList<>();
- for (RelationMember r: sel) {
- if (r.getMember().isUsable()) {
- toHighlight.add(r.getMember());
- }
+ @Override
+ public void valueChanged(ListSelectionEvent lse) {
+ if (Main.isDisplayingMapView()) {
+ Collection<RelationMember> sel = getMemberTableModel().getSelectedMembers();
+ final List<OsmPrimitive> toHighlight = new ArrayList<>();
+ for (RelationMember r: sel) {
+ if (r.getMember().isUsable()) {
+ toHighlight.add(r.getMember());
}
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- if (Main.isDisplayingMapView() && highlightHelper.highlightOnly(toHighlight)) {
- Main.map.mapView.repaint();
- }
- }
- });
}
- }};
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ if (Main.isDisplayingMapView() && highlightHelper.highlightOnly(toHighlight)) {
+ Main.map.mapView.repaint();
+ }
+ }
+ });
+ }
+ }
+ };
private void initHighlighting() {
highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
index 7de9c5f..7c3d7a3 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
@@ -38,9 +38,10 @@ import org.openstreetmap.josm.gui.dialogs.relation.sort.RelationSorter;
import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType;
import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionTypeCalculator;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
public class MemberTableModel extends AbstractTableModel
@@ -104,7 +105,11 @@ implements TableModelListener, SelectionChangedListener, DataSetListener, OsmPri
public void dataChanged(DataChangedEvent event) {
// just trigger a repaint - the display name of the relation members may have changed
Collection<RelationMember> sel = getSelectedMembers();
- fireTableDataChanged();
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ public void run() {
+ fireTableDataChanged();
+ }
+ });
setSelectedMembers(sel);
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java b/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java
index 39b8a0e..435933a 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java
@@ -50,7 +50,7 @@ import org.xml.sax.SAXException;
* </pre>
*
*/
-public class ParentRelationLoadingTask extends PleaseWaitRunnable{
+public class ParentRelationLoadingTask extends PleaseWaitRunnable {
private boolean canceled;
private Exception lastException;
private DataSet referrers;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java
index 071d95a..9f6aa26 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java
@@ -19,7 +19,7 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
* RelationDialogManager keeps track of the open relation editors.
*
*/
-public class RelationDialogManager extends WindowAdapter implements MapView.LayerChangeListener{
+public class RelationDialogManager extends WindowAdapter implements MapView.LayerChangeListener {
/** keeps track of open relation editors */
private static RelationDialogManager relationDialogManager;
@@ -102,6 +102,7 @@ public class RelationDialogManager extends WindowAdapter implements MapView.Laye
public RelationDialogManager() {
openDialogs = new HashMap<>();
}
+
/**
* Register the relation editor for a relation managed by a
* {@link OsmDataLayer}.
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java
index de17f9f..a647b48 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java
@@ -137,6 +137,7 @@ public abstract class RelationEditor extends ExtendedDialog {
setTitle(tr("Edit relation #{0} in layer ''{1}''", relation.getId(), layer.getName()));
}
}
+
/**
* Replies the currently edited relation
*
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java
index c9f32b5..35dddfc 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java
@@ -15,7 +15,7 @@ import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.tools.CheckParameterUtil;
-public class SelectionTableModel extends AbstractTableModel implements SelectionChangedListener, MapView.LayerChangeListener{
+public class SelectionTableModel extends AbstractTableModel implements SelectionChangedListener, MapView.LayerChangeListener {
/** this selection table model only displays selected primitives in this layer */
private transient OsmDataLayer layer;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
index 8e87cd3..c9f8803 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
@@ -30,7 +30,7 @@ import org.openstreetmap.josm.data.osm.Way;
*/
public class RelationNodeMap {
- private static class NodesWays{
+ private static class NodesWays {
public final Map<Node, Set<Integer>> nodes = new TreeMap<>();
public final Map<Integer, Set<Node>> ways = new TreeMap<>();
public final boolean oneWay;
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 da7f3ea..d3dd76f 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java
@@ -107,7 +107,7 @@ public class RelationSorter {
public List<RelationMember> sortMembers(List<RelationMember> list) {
final Map<String, RelationMember> platformByName = new HashMap<>();
for (RelationMember i : list) {
- if ("platform".equals(i.getRole())) {
+ if (i.getRole().startsWith("platform")) {
final RelationMember old = platformByName.put(getStopName(i.getMember()), i);
if (old != null) {
// Platform with same name present. Stop to avoid damaging complicated relations.
@@ -118,7 +118,7 @@ public class RelationSorter {
}
final List<RelationMember> sorted = new ArrayList<>(list.size());
for (RelationMember i : list) {
- if ("stop".equals(i.getRole())) {
+ if (i.getRole().startsWith("stop")) {
sorted.add(i);
final RelationMember platform = platformByName.remove(getStopName(i.getMember()));
if (platform != null) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java
index 7193972..53d10dc 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java
@@ -212,6 +212,7 @@ public class WayConnectionTypeCalculator {
private Direction determineDirection(int ref_i, Direction ref_direction, int k) {
return determineDirection(ref_i, ref_direction, k, false);
}
+
/**
* Determines the direction of way k with respect to the way ref_i.
* The way ref_i is assumed to have the direction ref_direction and
diff --git a/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java b/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java
index def8c0c..77b0d27 100644
--- a/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java
+++ b/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java
@@ -207,7 +207,7 @@ public class BookmarkSelection implements DownloadSelection {
}
}
- class RemoveAction extends AbstractAction implements ListSelectionListener{
+ class RemoveAction extends AbstractAction implements ListSelectionListener {
/**
* Constructs a new {@code RemoveAction}.
*/
diff --git a/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java b/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
index 10c0470..193ae5c 100644
--- a/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
+++ b/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
@@ -187,7 +187,7 @@ public class BoundingBoxSelection implements DownloadSelection {
tf.setToolTipText(null);
}
- class LatValueChecker extends FocusAdapter implements ActionListener{
+ class LatValueChecker extends FocusAdapter implements ActionListener {
private JosmTextField tfLatValue;
LatValueChecker(JosmTextField tfLatValue) {
diff --git a/src/org/openstreetmap/josm/gui/download/DownloadDialog.java b/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
index bd3c7c2..9a9bbe2 100644
--- a/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
+++ b/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
@@ -162,7 +162,8 @@ public class DownloadDialog extends JDialog {
@Override
public void actionPerformed(ActionEvent e) {
Main.pref.put("download.autorun", cbStartup.isSelected());
- }});
+ }
+ });
pnl.add(cbNewLayer, GBC.std().anchor(GBC.WEST).insets(5, 5, 5, 5));
pnl.add(cbStartup, GBC.std().anchor(GBC.WEST).insets(15, 5, 5, 5));
diff --git a/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java b/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
index 5384925..e1b16e4 100644
--- a/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
+++ b/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
@@ -166,7 +166,7 @@ public class CoordinateInfoViewer extends JPanel {
* {@link HistoryNode}.
*
*/
- private static class LatLonViewer extends JPanel implements Observer{
+ private static class LatLonViewer extends JPanel implements Observer {
private JLabel lblLat;
private JLabel lblLon;
diff --git a/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java b/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java
index f35ae90..1d04ea5 100644
--- a/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java
+++ b/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java
@@ -35,7 +35,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
* about a given {@link org.openstreetmap.josm.data.osm.OsmPrimitive}.
*
*/
-public class HistoryBrowserDialog extends JDialog implements HistoryDataSetListener{
+public class HistoryBrowserDialog extends JDialog implements HistoryDataSetListener {
/** the embedded browser */
private HistoryBrowser browser;
diff --git a/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java b/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
index 6bee96a..d848609 100644
--- a/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
+++ b/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
@@ -78,7 +78,7 @@ class TwoColumnDiff {
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) {
+ || script != null && scriptReversed.getTotalNumberOfChanges() < script.getTotalNumberOfChanges()) {
this.referenceReversed = true;
twoColumnDiffFromScript(scriptReversed, referenceReversed, current, true);
} else {
diff --git a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
index 95889c7..479046f 100644
--- a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
+++ b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
@@ -43,7 +43,7 @@ import org.openstreetmap.josm.tools.date.DateUtils;
* of a {@link OsmPrimitive}.
* @since 1709
*/
-public class VersionInfoPanel extends JPanel implements Observer{
+public class VersionInfoPanel extends JPanel implements Observer {
private PointInTimeType pointInTimeType;
private transient HistoryBrowserModel model;
private JMultilineLabel lblInfo;
diff --git a/src/org/openstreetmap/josm/gui/history/VersionTable.java b/src/org/openstreetmap/josm/gui/history/VersionTable.java
index c2ea042..334e114 100644
--- a/src/org/openstreetmap/josm/gui/history/VersionTable.java
+++ b/src/org/openstreetmap/josm/gui/history/VersionTable.java
@@ -43,7 +43,7 @@ import org.openstreetmap.josm.tools.OpenBrowser;
* of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive}.
* @since 1709
*/
-public class VersionTable extends JTable implements Observer{
+public class VersionTable extends JTable implements Observer {
private VersionTablePopupMenu popupMenu;
private final transient HistoryBrowserModel model;
diff --git a/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java b/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java
index c54e79c..9d5de69 100644
--- a/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java
+++ b/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java
@@ -46,7 +46,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
* whether the changeset should be closed after the next upload</li>
* </ul>
*/
-public class ChangesetManagementPanel extends JPanel implements ListDataListener{
+public class ChangesetManagementPanel extends JPanel implements ListDataListener {
public static final String SELECTED_CHANGESET_PROP = ChangesetManagementPanel.class.getName() + ".selectedChangeset";
public static final String CLOSE_CHANGESET_AFTER_UPLOAD = ChangesetManagementPanel.class.getName() + ".closeChangesetAfterUpload";
@@ -316,7 +316,7 @@ public class ChangesetManagementPanel extends JPanel implements ListDataListener
* Closes the currently selected changeset
*
*/
- class CloseChangesetAction extends AbstractAction implements ItemListener{
+ class CloseChangesetAction extends AbstractAction implements ItemListener {
CloseChangesetAction() {
putValue(SMALL_ICON, ImageProvider.get("closechangeset"));
putValue(SHORT_DESCRIPTION, tr("Close the currently selected open changeset"));
diff --git a/src/org/openstreetmap/josm/gui/io/CredentialDialog.java b/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
index ecfd764..818dd7a 100644
--- a/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
@@ -343,7 +343,7 @@ public class CredentialDialog extends JDialog {
* If current text field is not empty, but the next one is (or just contains a sequence of spaces), focuses the next text field.
* If both text fields contain characters, submits the form by calling owner's {@link OKAction}.
*/
- private static class TFKeyListener implements KeyListener{
+ private static class TFKeyListener implements KeyListener {
protected CredentialDialog owner; // owner Dependency Injection to call OKAction
protected JTextField currentTF;
protected JTextField nextTF;
diff --git a/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java b/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
index d1b5e05..1fe141b 100644
--- a/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
+++ b/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
@@ -28,7 +28,7 @@ import org.xml.sax.SAXException;
* Asynchronous task for downloading and unpacking arbitrary file lists
* Shows progress bar when downloading
*/
-public class DownloadFileTask extends PleaseWaitRunnable{
+public class DownloadFileTask extends PleaseWaitRunnable {
private final String address;
private final File file;
private final boolean mkdir;
diff --git a/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java b/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
index 37f4479..ed1c148 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
@@ -20,7 +20,7 @@ import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.tools.ImageProvider;
// FIXME this class should extend HtmlPanel instead (duplicated code in here)
-public class UploadParameterSummaryPanel extends JPanel implements HyperlinkListener, PropertyChangeListener{
+public class UploadParameterSummaryPanel extends JPanel implements HyperlinkListener, PropertyChangeListener {
private transient UploadStrategySpecification spec = new UploadStrategySpecification();
private int numObjects;
private JMultilineLabel jepMessage;
diff --git a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
index bc6e6bc..43e44e0 100644
--- a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
@@ -496,6 +496,7 @@ public abstract class AbstractTileSourceLayer extends ImageryLayer implements Im
}
}
+
/**
* Creates popup menu items and binds to mouse actions
*/
@@ -677,6 +678,7 @@ public abstract class AbstractTileSourceLayer extends ImageryLayer implements Im
Math.pow(2d, ZOOM_OFFSET.get()) * visibileTiles // use offset to decide, how many tiles are visible
* 2);
}
+
/**
* Checks zoom level against settings
* @param maxZoomLvl zoom level to check
@@ -1214,11 +1216,11 @@ public abstract class AbstractTileSourceLayer extends ImageryLayer implements Im
}
private boolean tooLarge() {
- return this.tilesSpanned() > 20;
+ return insane() || this.tilesSpanned() > 20;
}
private boolean insane() {
- return this.tilesSpanned() > 100;
+ return size() > tileCache.getCacheSize();
}
private double tilesSpanned() {
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
index beef384..65e0826 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
@@ -129,7 +129,9 @@ public abstract class ConvertToDataLayerAction<T extends Layer> extends Abstract
}
final DataSet ds = convert();
final OsmDataLayer layer = new OsmDataLayer(ds, tr("Converted from: {0}", this.layer.getName()), null);
- layer.setAssociatedFile(new File(this.layer.getAssociatedFile().getParentFile(), this.layer.getAssociatedFile().getName() + ".osm"));
+ if (this.layer.getAssociatedFile() != null) {
+ layer.setAssociatedFile(new File(this.layer.getAssociatedFile().getParentFile(), this.layer.getAssociatedFile().getName() + ".osm"));
+ }
layer.setUploadDiscouraged(true);
Main.main.addLayer(layer);
Main.main.removeLayer(this.layer);
diff --git a/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java
index c39fd67..9146268 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java
@@ -24,11 +24,13 @@ public class AreaElemStyle extends ElemStyle {
public Color color;
public MapImage fillImage;
public TextElement text;
+ public Float extent;
- protected AreaElemStyle(Cascade c, Color color, MapImage fillImage, TextElement text) {
+ protected AreaElemStyle(Cascade c, Color color, MapImage fillImage, Float extent, TextElement text) {
super(c, 1f);
CheckParameterUtil.ensureParameterNotNull(color);
this.color = color;
+ this.extent = extent;
this.fillImage = fillImage;
this.text = text;
}
@@ -37,6 +39,7 @@ public class AreaElemStyle extends ElemStyle {
final Cascade c = env.mc.getCascade(env.layer);
MapImage fillImage = null;
Color color = null;
+ Float extent = null;
IconReference iconRef = c.get(FILL_IMAGE, null, IconReference.class);
if (iconRef != null) {
@@ -77,8 +80,10 @@ public class AreaElemStyle extends ElemStyle {
text = TextElement.create(env, PaintColors.AREA_TEXT.get(), true);
}
+ extent = c.get(FILL_EXTENT, null, float.class);
+
if (color != null)
- return new AreaElemStyle(c, color, fillImage, text);
+ return new AreaElemStyle(c, color, fillImage, extent, text);
else
return null;
}
@@ -95,12 +100,12 @@ public class AreaElemStyle extends ElemStyle {
myColor = paintSettings.getRelationSelectedColor(color.getAlpha());
}
}
- painter.drawArea((Way) osm, myColor, fillImage, painter.isInactiveMode() || osm.isDisabled(), text);
+ painter.drawArea((Way) osm, myColor, fillImage, extent, painter.isInactiveMode() || osm.isDisabled(), text);
} else if (osm instanceof Relation) {
if (color != null && (selected || outermember)) {
myColor = paintSettings.getRelationSelectedColor(color.getAlpha());
}
- painter.drawArea((Relation) osm, myColor, fillImage, painter.isInactiveMode() || osm.isDisabled(), text);
+ painter.drawArea((Relation) osm, myColor, fillImage, extent, painter.isInactiveMode() || osm.isDisabled(), text);
}
}
@@ -116,6 +121,8 @@ public class AreaElemStyle extends ElemStyle {
return false;
if (!Objects.equals(color, other.color))
return false;
+ if (extent != other.extent)
+ return false;
if (!Objects.equals(text, other.text))
return false;
return true;
@@ -125,6 +132,7 @@ public class AreaElemStyle extends ElemStyle {
public int hashCode() {
int hash = 3;
hash = 61 * hash + color.hashCode();
+ hash = 61 * hash + (extent != null ? Float.floatToIntBits(extent) : 0);
hash = 61 * hash + (fillImage != null ? fillImage.hashCode() : 0);
hash = 61 * hash + (text != null ? text.hashCode() : 0);
return hash;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java b/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java
index 97ea371..253ba45 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java
@@ -7,6 +7,8 @@ import java.util.Collections;
import java.util.List;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.tools.LanguageInfo;
@@ -147,7 +149,8 @@ public abstract class LabelCompositionStrategy {
}
}
- public static class DeriveLabelFromNameTagsCompositionStrategy extends LabelCompositionStrategy {
+ public static class DeriveLabelFromNameTagsCompositionStrategy
+ extends LabelCompositionStrategy implements PreferenceChangedListener {
/**
* The list of default name tags from which a label candidate is derived.
@@ -175,11 +178,6 @@ public abstract class LabelCompositionStrategy {
/**
* <p>Creates the strategy and initializes its name tags from the preferences.</p>
- *
- * <p><strong>Note:</strong> If the list of name tags in the preferences changes, strategy instances
- * are not notified. It's up to the client to listen to preference changes and
- * invoke {@link #initNameTagsFromPreferences()} accordingly.</p>
- *
*/
public DeriveLabelFromNameTagsCompositionStrategy() {
initNameTagsFromPreferences();
@@ -295,5 +293,12 @@ public abstract class LabelCompositionStrategy {
public String toString() {
return "{" + getClass().getSimpleName() +'}';
}
+
+ @Override
+ public void preferenceChanged(PreferenceChangeEvent e) {
+ if (e.getKey() != null && e.getKey().startsWith("mappaint.name")) {
+ initNameTagsFromPreferences();
+ }
+ }
}
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java b/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java
index 7e12f3f..e21f45b 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java
@@ -9,6 +9,7 @@ public interface StyleKeys {
String DASHES_BACKGROUND_OPACITY = "dashes-background-opacity";
String DASHES_OFFSET = "dashes-offset";
String FILL_COLOR = "fill-color";
+ String FILL_EXTENT = "fill-extent";
String FILL_IMAGE = "fill-image";
String FILL_OPACITY = "fill-opacity";
String FONT_FAMILY = "font-family";
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
index 7bb8581..735c74d 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
@@ -653,6 +653,7 @@ public final class ExpressionFactory {
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
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
index feb3759..739958d 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
@@ -120,7 +120,7 @@ public interface Selector {
* referrer was found.</p>
*
*/
- private class MatchingReferrerFinder extends AbstractVisitor{
+ private class MatchingReferrerFinder extends AbstractVisitor {
private Environment e;
/**
diff --git a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
index 9a805da..d564184 100644
--- a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
+++ b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
@@ -335,7 +335,7 @@ public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
/**
* Starts the authorisation process
*/
- class RunAuthorisationAction extends AbstractAction implements DocumentListener{
+ class RunAuthorisationAction extends AbstractAction implements DocumentListener {
RunAuthorisationAction() {
putValue(NAME, tr("Authorize now"));
putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
diff --git a/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java b/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
index d41ff11..63dc2a2 100644
--- a/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
+++ b/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
@@ -38,7 +38,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
*
* @since 2746
*/
-public class ManualAuthorizationUI extends AbstractAuthorizationUI{
+public class ManualAuthorizationUI extends AbstractAuthorizationUI {
private JosmTextField tfAccessTokenKey;
private transient AccessTokenKeyValidator valAccessTokenKey;
diff --git a/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java b/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java
index 2452589..aaadf58 100644
--- a/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java
+++ b/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java
@@ -14,7 +14,7 @@ import javax.swing.JPanel;
import org.openstreetmap.josm.data.oauth.OsmPrivileges;
import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
-public class OsmPrivilegesPanel extends VerticallyScrollablePanel{
+public class OsmPrivilegesPanel extends VerticallyScrollablePanel {
private JCheckBox cbWriteApi;
private JCheckBox cbWriteGpx;
diff --git a/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java b/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
index af8faec..c5b300e 100644
--- a/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
+++ b/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
@@ -381,7 +381,7 @@ public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
/**
* Action for retrieving a request token
*/
- class RetrieveRequestTokenAction extends AbstractAction{
+ class RetrieveRequestTokenAction extends AbstractAction {
RetrieveRequestTokenAction() {
putValue(NAME, tr("Retrieve Request Token"));
diff --git a/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
index af478da..af4aa0b 100644
--- a/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
+++ b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
@@ -321,7 +321,8 @@ public final class PreferenceTabbedPane extends JTabbedPane implements MouseWhee
@Override
public boolean identify(TabPreferenceSetting tps, Object name) {
return name != null && tps != null && tps.getIconName() != null && name.equals(tps.getIconName());
- }}, name);
+ }
+ }, name);
}
public void selectTabByPref(Class<? extends TabPreferenceSetting> clazz) {
@@ -329,7 +330,8 @@ public final class PreferenceTabbedPane extends JTabbedPane implements MouseWhee
@Override
public boolean identify(TabPreferenceSetting tps, Object clazz) {
return tps.getClass().isAssignableFrom((Class<?>) clazz);
- }}, clazz);
+ }
+ }, clazz);
}
public boolean selectSubTabByPref(Class<? extends SubPreferenceSetting> clazz) {
@@ -341,7 +343,8 @@ public final class PreferenceTabbedPane extends JTabbedPane implements MouseWhee
@Override
public boolean identify(TabPreferenceSetting tps, Object unused) {
return tps.equals(tab);
- }}, null);
+ }
+ }, null);
return tab.selectSubTab(sub);
}
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java b/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
index 9069201..fb15455 100644
--- a/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
+++ b/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
@@ -68,6 +68,8 @@ import org.openstreetmap.josm.actions.AdaptableAction;
import org.openstreetmap.josm.actions.JosmAction;
import org.openstreetmap.josm.actions.ParameterizedAction;
import org.openstreetmap.josm.actions.ParameterizedActionDecorator;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -482,7 +484,7 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
private final DefaultMutableTreeNode rootActionsNode = new DefaultMutableTreeNode(tr("Actions"));
- public JToolBar control = new JToolBar();
+ public final JToolBar control = new JToolBar();
private final Map<Object, ActionDefinition> buttonActions = new ConcurrentHashMap<>(30);
@Override
@@ -899,6 +901,14 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
public ToolbarPreferences() {
control.setFloatable(false);
control.setComponentPopupMenu(popupMenu);
+ Main.pref.addPreferenceChangeListener(new PreferenceChangedListener() {
+ @Override
+ public void preferenceChanged(PreferenceChangeEvent e) {
+ if ("toolbar.visible".equals(e.getKey())) {
+ refreshToolbarControl();
+ }
+ }
+ });
}
private void loadAction(DefaultMutableTreeNode node, MenuElement menu) {
@@ -1064,8 +1074,11 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
b.setFocusTraversalKeysEnabled(!unregisterTab);
}
}
+
+ boolean visible = Main.pref.getBoolean("toolbar.visible", true);
+
control.setFocusTraversalKeysEnabled(!unregisterTab);
- control.setVisible(control.getComponentCount() != 0);
+ control.setVisible(visible && control.getComponentCount() != 0);
control.repaint();
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java b/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
index 6081ed7..b68c4b6 100644
--- a/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
@@ -264,10 +264,11 @@ public class MapPaintPreference implements SubPreferenceSetting {
// XML style is not bundled anymore
list.remove(Utils.find(list, new Predicate<SourceEntry>() {
- @Override
- public boolean evaluate(SourceEntry se) {
- return "resource://styles/standard/elemstyles.xml".equals(se.url);
- }}));
+ @Override
+ public boolean evaluate(SourceEntry se) {
+ return "resource://styles/standard/elemstyles.xml".equals(se.url);
+ }
+ }));
return changed;
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
index e3458e9..d3c9805 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
@@ -92,7 +92,7 @@ public class CustomProjectionChoice extends AbstractProjectionChoice implements
}
@Override
- public final boolean isValid() {
+ public boolean isValid() {
try {
CustomProjection test = new CustomProjection();
test.update(input.getText());
@@ -109,7 +109,6 @@ public class CustomProjectionChoice extends AbstractProjectionChoice implements
valStatus.setVisible(true);
return true;
}
-
};
JButton btnCheck = new JButton(tr("Validate"));
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
index 752d59f..308bbde 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
@@ -27,7 +27,7 @@ import org.openstreetmap.josm.io.auth.CredentialsManager;
* parameters.
*
*/
-public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel implements PropertyChangeListener{
+public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel implements PropertyChangeListener {
/** indicates whether we use basic authentication */
private JRadioButton rbBasicAuthentication;
diff --git a/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java b/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java
index 6fadf8c..2269171 100644
--- a/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java
+++ b/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java
@@ -23,7 +23,12 @@ public abstract class AbstractProgressMonitor implements ProgressMonitor {
private final CancelHandler cancelHandler;
- protected enum State {INIT, IN_TASK, IN_SUBTASK, FINISHED}
+ protected enum State {
+ INIT,
+ IN_TASK,
+ IN_SUBTASK,
+ FINISHED
+ }
protected State state = State.INIT;
diff --git a/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java b/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java
index efb2741..0830467 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java
@@ -16,7 +16,7 @@ import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
* This is the table cell editor for the tag editor dialog.
*
*/
-public class TagCellEditor extends AbstractCellEditor implements TableCellEditor{
+public class TagCellEditor extends AbstractCellEditor implements TableCellEditor {
protected AutoCompletingTextField editor;
protected transient TagModel currentTag;
diff --git a/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java b/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
index 5254947..b12fb5a 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
@@ -60,6 +60,7 @@ public class TagEditorModel extends AbstractTableModel {
this.rowSelectionModel = new DefaultListSelectionModel();
this.colSelectionModel = new DefaultListSelectionModel();
}
+
/**
* Creates a new tag editor model.
*
@@ -300,6 +301,7 @@ public class TagEditorModel extends AbstractTableModel {
setDirty(true);
}
}
+
/**
* deletes the tags given by tagIndices
*
diff --git a/src/org/openstreetmap/josm/gui/tagging/TagTable.java b/src/org/openstreetmap/josm/gui/tagging/TagTable.java
index de99deb..1cca688 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TagTable.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TagTable.java
@@ -281,9 +281,8 @@ public class TagTable extends JTable {
/**
* Action to be run when the user adds a new tag.
*
- *
*/
- class AddAction extends RunnableAction implements PropertyChangeListener{
+ class AddAction extends RunnableAction implements PropertyChangeListener {
AddAction() {
putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
putValue(SHORT_DESCRIPTION, tr("Add a new tag"));
@@ -315,10 +314,10 @@ public class TagTable extends JTable {
}
}
- /**
+ /**
* Action to be run when the user wants to paste tags from buffer
*/
- class PasteAction extends RunnableAction implements PropertyChangeListener{
+ class PasteAction extends RunnableAction implements PropertyChangeListener {
PasteAction() {
putValue(SMALL_ICON, ImageProvider.get("", "pastetags"));
putValue(SHORT_DESCRIPTION, tr("Paste tags from buffer"));
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java
index f46eb5b..ad71e92 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java
@@ -11,6 +11,7 @@ import javax.swing.JMenuItem;
import javax.swing.JSeparator;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MenuScroller;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
/**
@@ -72,6 +73,11 @@ public final class TaggingPresets {
m.add(mi);
}
}
+ for (JMenu submenu : submenus.values()) {
+ if (submenu.getItemCount() >= Main.pref.getInteger("taggingpreset.min-elements-for-scroller", 15)) {
+ MenuScroller.setScrollerFor(submenu);
+ }
+ }
}
if (Main.pref.getBoolean("taggingpreset.sortmenu")) {
TaggingPresetMenu.sortMenu(Main.main.menu.presetsMenu);
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java b/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
index 9220972..104607f 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
@@ -402,12 +402,14 @@ public abstract class ComboMultiSelect extends KeyedItem {
if (display_array.length != value_array.length) {
Main.error(tr("Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' must be the same as in ''values''",
key, text));
+ Main.error(tr("Detailed information: {0} <> {1}", Arrays.toString(display_array), Arrays.toString(value_array)));
display_array = value_array;
}
if (short_descriptions_array != null && short_descriptions_array.length != value_array.length) {
Main.error(tr("Broken tagging preset \"{0}-{1}\" - number of items in ''short_descriptions'' must be the same as in ''values''",
key, text));
+ Main.error(tr("Detailed information: {0} <> {1}", Arrays.toString(short_descriptions_array), Arrays.toString(value_array)));
short_descriptions_array = null;
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java b/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java
index 2c95fdd..55af7a0 100644
--- a/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java
+++ b/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java
@@ -31,7 +31,7 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
*
*
*/
-public abstract class AbstractTextComponentValidator implements ActionListener, FocusListener, DocumentListener, PropertyChangeListener{
+public abstract class AbstractTextComponentValidator implements ActionListener, FocusListener, DocumentListener, PropertyChangeListener {
private static final Border ERROR_BORDER = BorderFactory.createLineBorder(Color.RED, 1);
private static final Color ERROR_BACKGROUND = new Color(255, 224, 224);
diff --git a/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java b/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
index e31139e..616eee5 100644
--- a/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
+++ b/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
@@ -163,7 +163,7 @@ public class BoundingBoxSelectionPanel extends JPanel {
}
}
- private static class LongitudeValidator extends AbstractTextComponentValidator{
+ private static class LongitudeValidator extends AbstractTextComponentValidator {
public static void decorate(JTextComponent tc) {
new LongitudeValidator(tc);
diff --git a/src/org/openstreetmap/josm/gui/widgets/CompileSearchTextDecorator.java b/src/org/openstreetmap/josm/gui/widgets/CompileSearchTextDecorator.java
new file mode 100644
index 0000000..b283a61
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/widgets/CompileSearchTextDecorator.java
@@ -0,0 +1,74 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.widgets;
+
+import java.awt.Color;
+
+import javax.swing.UIManager;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.text.JTextComponent;
+
+import org.openstreetmap.josm.actions.search.SearchCompiler;
+
+/**
+ * Decorates a text component with an execution to the search compiler. Afterwards, a {@code "filter"} property change
+ * will be fired and the compiled search can be accessed with {@link #getMatch()}.
+ */
+public final class CompileSearchTextDecorator implements DocumentListener {
+
+ private final JTextComponent textComponent;
+ private final String originalToolTipText;
+ private SearchCompiler.Match filter = null;
+
+ private CompileSearchTextDecorator(JTextComponent textComponent) {
+ this.textComponent = textComponent;
+ this.originalToolTipText = textComponent.getToolTipText();
+ textComponent.getDocument().addDocumentListener(this);
+ }
+
+ /**
+ * Decorates a text component with an execution to the search compiler. Afterwards, a {@code "filter"} property change
+ * will be fired and the compiled search can be accessed with {@link #getMatch()}.
+ * @param f the text component to decorate
+ * @return an instance of the decorator in order to access the compiled search via {@link #getMatch()}
+ */
+ public static CompileSearchTextDecorator decorate(JTextComponent f) {
+ return new CompileSearchTextDecorator(f);
+ }
+
+ private void setFilter() {
+ try {
+ textComponent.setBackground(UIManager.getColor("TextField.background"));
+ textComponent.setToolTipText(originalToolTipText);
+ filter = SearchCompiler.compile(textComponent.getText());
+ } catch (SearchCompiler.ParseError ex) {
+ textComponent.setBackground(new Color(255, 224, 224));
+ textComponent.setToolTipText(ex.getMessage());
+ filter = new SearchCompiler.Always();
+ }
+ textComponent.firePropertyChange("filter", 0, 1);
+ }
+
+ /**
+ * Returns the compiled search
+ * @return the compiled search
+ */
+ public SearchCompiler.Match getMatch() {
+ return filter;
+ }
+
+ @Override
+ public void insertUpdate(DocumentEvent e) {
+ setFilter();
+ }
+
+ @Override
+ public void removeUpdate(DocumentEvent e) {
+ setFilter();
+ }
+
+ @Override
+ public void changedUpdate(DocumentEvent e) {
+ setFilter();
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java b/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
index 9e1909e..40b3c69 100644
--- a/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
+++ b/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
@@ -172,6 +172,7 @@ public class QuadStateCheckBox extends JCheckBox {
return State.UNSET;
}
}
+
/** Rotate to the next allowed state.*/
private void nextState() {
State current = getState();
diff --git a/src/org/openstreetmap/josm/gui/widgets/SelectAllOnFocusGainedDecorator.java b/src/org/openstreetmap/josm/gui/widgets/SelectAllOnFocusGainedDecorator.java
index 4e65cf1..7bb8f2e 100644
--- a/src/org/openstreetmap/josm/gui/widgets/SelectAllOnFocusGainedDecorator.java
+++ b/src/org/openstreetmap/josm/gui/widgets/SelectAllOnFocusGainedDecorator.java
@@ -7,7 +7,7 @@ import java.awt.event.FocusEvent;
import javax.swing.text.JTextComponent;
-public class SelectAllOnFocusGainedDecorator extends FocusAdapter{
+public class SelectAllOnFocusGainedDecorator extends FocusAdapter {
public static void decorate(JTextComponent tc) {
if (tc == null) return;
diff --git a/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java b/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
index 2fccf42..5cf60f9 100644
--- a/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
+++ b/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
@@ -194,7 +194,7 @@ public class BoundingBoxDownloader extends OsmServerReader {
@Override
public List<Note> parseNotes(int noteLimit, int daysClosed, ProgressMonitor progressMonitor)
throws OsmTransferException, MoreNotesException {
- progressMonitor.beginTask("Downloading notes");
+ progressMonitor.beginTask(tr("Downloading notes"));
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.");
diff --git a/src/org/openstreetmap/josm/io/CachedFile.java b/src/org/openstreetmap/josm/io/CachedFile.java
index 486824f..428bb8f 100644
--- a/src/org/openstreetmap/josm/io/CachedFile.java
+++ b/src/org/openstreetmap/josm/io/CachedFile.java
@@ -483,6 +483,7 @@ public class CachedFile {
throws MalformedURLException, IOException {
return connectFollowingRedirect(downloadUrl, httpAccept, ifModifiedSince, null);
}
+
/**
* Opens a connection for downloading a resource.
* <p>
diff --git a/src/org/openstreetmap/josm/io/GpxReader.java b/src/org/openstreetmap/josm/io/GpxReader.java
index 6b04fb0..73ad0d7 100644
--- a/src/org/openstreetmap/josm/io/GpxReader.java
+++ b/src/org/openstreetmap/josm/io/GpxReader.java
@@ -43,7 +43,19 @@ import org.xml.sax.helpers.DefaultHandler;
*/
public class GpxReader implements GpxConstants {
- private enum State { init, gpx, metadata, wpt, rte, trk, ext, author, link, trkseg, copyright}
+ private enum State {
+ init,
+ gpx,
+ metadata,
+ wpt,
+ rte,
+ trk,
+ ext,
+ author,
+ link,
+ trkseg,
+ copyright
+ }
private String version;
/** The resulting gpx data */
diff --git a/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java b/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
index 909b32a..ac4602e 100644
--- a/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
+++ b/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
@@ -55,7 +55,7 @@ import org.openstreetmap.josm.tools.Utils;
* }
* </pre>
*/
-public class MultiFetchServerObjectReader extends OsmServerReader{
+public class MultiFetchServerObjectReader extends OsmServerReader {
/**
* the max. number of primitives retrieved in one step. Assuming IDs with 7 digits,
* this leads to a max. request URL of ~ 1600 Bytes ((7 digits + 1 Separator) * 200),
diff --git a/src/org/openstreetmap/josm/io/NoteReader.java b/src/org/openstreetmap/josm/io/NoteReader.java
index 1be31fd..f470a1c 100644
--- a/src/org/openstreetmap/josm/io/NoteReader.java
+++ b/src/org/openstreetmap/josm/io/NoteReader.java
@@ -39,7 +39,10 @@ public class NoteReader {
* while the other is used to generate the notes dump file. The parser
* needs to know which one it is handling.
*/
- private enum NoteParseMode {API, DUMP}
+ private enum NoteParseMode {
+ API,
+ DUMP
+ }
/**
* SAX handler to read note information from its XML representation.
diff --git a/src/org/openstreetmap/josm/io/auth/CredentialsAgentResponse.java b/src/org/openstreetmap/josm/io/auth/CredentialsAgentResponse.java
index ba693d2..ce771ee 100644
--- a/src/org/openstreetmap/josm/io/auth/CredentialsAgentResponse.java
+++ b/src/org/openstreetmap/josm/io/auth/CredentialsAgentResponse.java
@@ -25,6 +25,7 @@ public class CredentialsAgentResponse {
public String getUsername() {
return username;
}
+
/**
* Sets the user name
* @param username The user name
@@ -32,6 +33,7 @@ public class CredentialsAgentResponse {
public void setUsername(String username) {
this.username = username;
}
+
/**
* Replies the password
* @return The password in plain text
@@ -39,6 +41,7 @@ public class CredentialsAgentResponse {
public char[] getPassword() {
return password;
}
+
/**
* Sets the password
* @param password The password in plain text
@@ -46,6 +49,7 @@ public class CredentialsAgentResponse {
public void setPassword(char[] password) {
this.password = Utils.copyArray(password);
}
+
/**
* Determines if authentication request has been canceled by user
* @return true if authentication request has been canceled by user, false otherwise
@@ -53,6 +57,7 @@ public class CredentialsAgentResponse {
public boolean isCanceled() {
return canceled;
}
+
/**
* Sets the cancelation status (authentication request canceled by user)
* @param canceled the cancelation status (authentication request canceled by user)
@@ -60,6 +65,7 @@ public class CredentialsAgentResponse {
public void setCanceled(boolean canceled) {
this.canceled = canceled;
}
+
/**
* Determines if authentication credentials should be saved
* @return true if authentication credentials should be saved, false otherwise
@@ -67,6 +73,7 @@ public class CredentialsAgentResponse {
public boolean isSaveCredentials() {
return saveCredentials;
}
+
/**
* Sets the saving status (authentication credentials to save)
* @param saveCredentials the saving status (authentication credentials to save)
diff --git a/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java b/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java
index 49a253c..b0b0dea 100644
--- a/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java
+++ b/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java
@@ -21,6 +21,7 @@ import org.openstreetmap.josm.gui.layer.ImageryLayer;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.TMSLayer;
import org.openstreetmap.josm.gui.layer.WMSLayer;
+import org.openstreetmap.josm.gui.layer.WMTSLayer;
import org.openstreetmap.josm.io.session.SessionWriter.ExportSupport;
import org.openstreetmap.josm.tools.GBC;
import org.w3c.dom.Element;
@@ -45,6 +46,10 @@ public class ImagerySessionExporter implements SessionLayerExporter {
this((ImageryLayer) layer);
}
+ public ImagerySessionExporter(WMTSLayer layer) {
+ this((ImageryLayer) layer);
+ }
+
@Override
public Collection<Layer> getDependencies() {
return Collections.emptySet();
diff --git a/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java b/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
index 8597a4c..33e411b 100644
--- a/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
+++ b/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
@@ -32,7 +32,7 @@ import org.xml.sax.SAXException;
* and {@link #getFailedPlugins()} replies the list of failed plugins.
*
*/
-public class PluginDownloadTask extends PleaseWaitRunnable{
+public class PluginDownloadTask extends PleaseWaitRunnable {
/**
* The accepted MIME types sent in the HTTP Accept header.
diff --git a/src/org/openstreetmap/josm/plugins/PluginHandler.java b/src/org/openstreetmap/josm/plugins/PluginHandler.java
index 3438659..5fcc6b2 100644
--- a/src/org/openstreetmap/josm/plugins/PluginHandler.java
+++ b/src/org/openstreetmap/josm/plugins/PluginHandler.java
@@ -1163,7 +1163,8 @@ public final class PluginHandler {
@Override
public boolean accept(File dir, String name) {
return name.endsWith(".jar.new");
- }});
+ }
+ });
if (files == null)
return;
diff --git a/src/org/openstreetmap/josm/tools/Diff.java b/src/org/openstreetmap/josm/tools/Diff.java
index c611164..22f771e 100644
--- a/src/org/openstreetmap/josm/tools/Diff.java
+++ b/src/org/openstreetmap/josm/tools/Diff.java
@@ -569,6 +569,14 @@ public class Diff {
this.link = old;
}
+ /**
+ * Returns the number of insertions and deletions of this change as well as
+ * (recursively) the changes linked via {@link #link}.
+ */
+ public int getTotalNumberOfChanges() {
+ return inserted + deleted + (link != null ? link.getTotalNumberOfChanges() : 0);
+ }
+
@Override
public String toString() {
String s = String.format("%d -%d +%d %d", line0, deleted, inserted, line1);
diff --git a/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java b/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java
index 0c31048..031f83f 100644
--- a/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java
+++ b/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java
@@ -31,6 +31,7 @@ public class GeoPropertyIndex<T> {
* @return property value at that point. Must not be null.
*/
T get(LatLon ll);
+
/**
* Look up the property for a coordinate rectangle.
* @param box the rectangle
diff --git a/src/org/openstreetmap/josm/tools/Geometry.java b/src/org/openstreetmap/josm/tools/Geometry.java
index 752951f..00287d6 100644
--- a/src/org/openstreetmap/josm/tools/Geometry.java
+++ b/src/org/openstreetmap/josm/tools/Geometry.java
@@ -42,7 +42,12 @@ public final class Geometry {
// Hide default constructor for utils classes
}
- public enum PolygonIntersection {FIRST_INSIDE_SECOND, SECOND_INSIDE_FIRST, OUTSIDE, CROSSING}
+ public enum PolygonIntersection {
+ FIRST_INSIDE_SECOND,
+ SECOND_INSIDE_FIRST,
+ OUTSIDE,
+ CROSSING
+ }
/**
* Will find all intersection and add nodes there for list of given ways.
@@ -596,11 +601,19 @@ public final class Geometry {
p2 = oldPoint;
}
- //test if the line is crossed and if so invert the inside flag.
- if ((newPoint.getEastNorth().getY() < point.getEastNorth().getY()) == (point.getEastNorth().getY() <= oldPoint.getEastNorth().getY())
- && (point.getEastNorth().getX() - p1.getEastNorth().getX()) * (p2.getEastNorth().getY() - p1.getEastNorth().getY())
- < (p2.getEastNorth().getX() - p1.getEastNorth().getX()) * (point.getEastNorth().getY() - p1.getEastNorth().getY())) {
- inside = !inside;
+ EastNorth pEN = point.getEastNorth();
+ EastNorth opEN = oldPoint.getEastNorth();
+ EastNorth npEN = newPoint.getEastNorth();
+ EastNorth p1EN = p1.getEastNorth();
+ EastNorth p2EN = p2.getEastNorth();
+
+ if (pEN != null && opEN != null && npEN != null && p1EN != null && p2EN != null) {
+ //test if the line is crossed and if so invert the inside flag.
+ if ((npEN.getY() < pEN.getY()) == (pEN.getY() <= opEN.getY())
+ && (pEN.getX() - p1EN.getX()) * (p2EN.getY() - p1EN.getY())
+ < (p2EN.getX() - p1EN.getX()) * (pEN.getY() - p1EN.getY())) {
+ inside = !inside;
+ }
}
oldPoint = newPoint;
diff --git a/src/org/openstreetmap/josm/tools/I18n.java b/src/org/openstreetmap/josm/tools/I18n.java
index 39db0ec..2032c00 100644
--- a/src/org/openstreetmap/josm/tools/I18n.java
+++ b/src/org/openstreetmap/josm/tools/I18n.java
@@ -7,6 +7,8 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
@@ -36,6 +38,16 @@ import org.openstreetmap.josm.gui.widgets.AbstractFileChooser;
*/
public final class I18n {
+ /**
+ * This annotates strings which do not permit a clean i18n. This is mostly due to strings
+ * containing two nouns which can occur in singular or plural form.
+ * <br>
+ * No behaviour is associated with this annotation.
+ */
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface QuirkyPluralString {
+ }
+
private I18n() {
// Hide default constructor for utils classes
}
@@ -426,7 +438,7 @@ public final class I18n {
// 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("nb", PluralMode.MODE_NOTONE);
languages.put("nl", PluralMode.MODE_NOTONE);
languages.put("pl", PluralMode.MODE_PL);
languages.put("pt", PluralMode.MODE_NOTONE);
diff --git a/src/org/openstreetmap/josm/tools/ImageProvider.java b/src/org/openstreetmap/josm/tools/ImageProvider.java
index 8f54f2e..734f258 100644
--- a/src/org/openstreetmap/josm/tools/ImageProvider.java
+++ b/src/org/openstreetmap/josm/tools/ImageProvider.java
@@ -1149,7 +1149,9 @@ public class ImageProvider {
.setMaxSize(ImageSizes.CURSOROVERLAY))).get();
}
if (GraphicsEnvironment.isHeadless()) {
- Main.warn("Cursors are not available in headless mode. Returning null for '"+name+'\'');
+ if (Main.isDebugEnabled()) {
+ Main.debug("Cursors are not available in headless mode. Returning null for '"+name+'\'');
+ }
return null;
}
return Toolkit.getDefaultToolkit().createCustomCursor(img.getImage(),
diff --git a/src/org/openstreetmap/josm/tools/Shortcut.java b/src/org/openstreetmap/josm/tools/Shortcut.java
index 9d451b2..26ac062 100644
--- a/src/org/openstreetmap/josm/tools/Shortcut.java
+++ b/src/org/openstreetmap/josm/tools/Shortcut.java
@@ -207,6 +207,7 @@ public final class Shortcut {
menu.setMnemonic(KeyEvent.getKeyText(assignedKey).charAt(0)); //getKeyStroke().getKeyChar() seems not to work here
}
}
+
/**
* use this to set a buttons's mnemonic
*/
@@ -215,6 +216,7 @@ public final class Shortcut {
button.setMnemonic(KeyEvent.getKeyText(assignedKey).charAt(0)); //getKeyStroke().getKeyChar() seems not to work here
}
}
+
/**
* Sets the mnemonic key on a text component.
*/
@@ -223,6 +225,7 @@ public final class Shortcut {
component.setFocusAccelerator(KeyEvent.getKeyText(assignedKey).charAt(0));
}
}
+
/**
* use this to set a actions's accelerator
*/
diff --git a/src/org/openstreetmap/josm/tools/Utils.java b/src/org/openstreetmap/josm/tools/Utils.java
index c4a887e..f71abe6 100644
--- a/src/org/openstreetmap/josm/tools/Utils.java
+++ b/src/org/openstreetmap/josm/tools/Utils.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.tools.I18n.trn;
import java.awt.Color;
+import java.awt.Font;
import java.awt.Toolkit;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.ClipboardOwner;
@@ -12,6 +13,8 @@ import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.StringSelection;
import java.awt.datatransfer.Transferable;
import java.awt.datatransfer.UnsupportedFlavorException;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphVector;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
@@ -33,6 +36,7 @@ import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
+import java.text.Bidi;
import java.text.MessageFormat;
import java.util.AbstractCollection;
import java.util.AbstractList;
@@ -1492,4 +1496,49 @@ public final class Utils {
public static int hashMapInitialCapacity(int nEntries) {
return hashMapInitialCapacity(nEntries, 0.75f);
}
+
+ /**
+ * Utility class to save a string along with its rendering direction
+ * (left-to-right or right-to-left).
+ */
+ private static class DirectionString {
+ public final int direction;
+ public final String str;
+
+ DirectionString(int direction, String str) {
+ this.direction = direction;
+ this.str = str;
+ }
+ }
+
+ /**
+ * Convert a string to a list of {@link GlyphVector}s. The string may contain
+ * bi-directional text. The result will be in correct visual order.
+ * Each element of the resulting list corresponds to one section of the
+ * string with consistent writing direction (left-to-right or right-to-left).
+ *
+ * @param string the string to render
+ * @param font the font
+ * @param frc a FontRenderContext object
+ * @return a list of GlyphVectors
+ */
+ public static List<GlyphVector> getGlyphVectorsBidi(String string, Font font, FontRenderContext frc) {
+ List<GlyphVector> gvs = new ArrayList<>();
+ Bidi bidi = new Bidi(string, Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT);
+ byte[] levels = new byte[bidi.getRunCount()];
+ DirectionString[] dirStrings = new DirectionString[levels.length];
+ for (int i = 0; i < levels.length; ++i) {
+ levels[i] = (byte) bidi.getRunLevel(i);
+ String substr = string.substring(bidi.getRunStart(i), bidi.getRunLimit(i));
+ int dir = levels[i] % 2 == 0 ? Bidi.DIRECTION_LEFT_TO_RIGHT : Bidi.DIRECTION_RIGHT_TO_LEFT;
+ dirStrings[i] = new DirectionString(dir, substr);
+ }
+ Bidi.reorderVisually(levels, 0, dirStrings, 0, levels.length);
+ for (int i = 0; i < dirStrings.length; ++i) {
+ char[] chars = dirStrings[i].str.toCharArray();
+ gvs.add(font.layoutGlyphVector(frc, chars, 0, chars.length, dirStrings[i].direction));
+ }
+ return gvs;
+ }
+
}
diff --git a/src/org/openstreetmap/josm/tools/date/DateUtils.java b/src/org/openstreetmap/josm/tools/date/DateUtils.java
index ba5a6fb..81be8fb 100644
--- a/src/org/openstreetmap/josm/tools/date/DateUtils.java
+++ b/src/org/openstreetmap/josm/tools/date/DateUtils.java
@@ -251,6 +251,7 @@ public final class DateUtils {
return DateFormat.getTimeInstance(timeStyle, Locale.getDefault());
}
}
+
/**
* Formats a time to be displayed to current user, based on user preferences.
* @param time The time to display. Must not be {@code null}
diff --git a/styles/standard/elemstyles.mapcss b/styles/standard/elemstyles.mapcss
index 45439df..a58028e 100644
--- a/styles/standard/elemstyles.mapcss
+++ b/styles/standard/elemstyles.mapcss
@@ -44,6 +44,18 @@ setting::alt_turn_icons {
default: false;
}
+setting::place_fill_colour {
+ type: boolean;
+ label: tr("Display fill colour of areas with place=*");
+ default: false;
+}
+
+setting::partial_fill {
+ type: boolean;
+ label: tr("Areas are drawn with fill only around their inner edges");
+ default: false;
+}
+
/*********************/
/* turn restrictions */
/*********************/
@@ -536,7 +548,7 @@ way[highway=road] {
width: 2;
casing-width: 0.5;
casing-color: #ff9696;
- color: #770000;
+ color: highway_road#770000;
}
way[highway=track][area?], relation[type=multipolygon][highway=track] {
fill-color: highway_track#6e541c;
@@ -587,6 +599,7 @@ way[highway=path][bicycle=designated],
way[highway=path][bicycle=official] {
width: 1;
color: bicycle#b100ff;
+ set cyclecolor;
}
way[highway=path][foot=designated],
way[highway=path][foot=official] {
@@ -597,6 +610,7 @@ way[highway=path][bicycle=designated][foot=designated],
way[highway=path][bicycle=official][foot=official] {
width: 1;
color: bicycle#b100ff;
+ set cyclecolor;
dashes: 14,14;
dashes-background-color: foot#00ff00;
}
@@ -605,6 +619,7 @@ way[highway=path][bicycle=designated][foot=yes],
way[highway=path][bicycle=official][foot=yes] {
width: 1;
color: bicycle#b100ff;
+ set cyclecolor;
dashes: 21,7;
dashes-background-color: foot#00ff00;
}
@@ -1385,6 +1400,16 @@ way[man_made=pipeline] {
width: 2;
color: pipeline#660000;
}
+node[pipeline=marker] {
+ icon-image: "misc/pipeline_marker.svg";
+ set icon_z17;
+ text: auto;
+}
+node[pipeline=valve] {
+ icon-image: "misc/valve.svg";
+ set icon_z17;
+ text: auto;
+}
node[man_made=breakwater],
node[man_made=groyne],
node[man_made=embankment],
@@ -1480,11 +1505,51 @@ node[man_made=cutline] {
/* office tags */
/***************/
-area[office=company],
-area[office=government] {
+node[office=accountant],
+node[office=administrative],
+node[office=advertising_agency],
+node[office=architect],
+node[office=association],
+node[office=company],
+node[office=educational_institution],
+node[office=employment_agency],
+node[office=estate_agent],
+node[office=foundation],
+node[office=government],
+node[office=insurance],
+node[office=it],
+node[office=lawyer],
+node[office=newspaper],
+node[office=ngo],
+node[office=notary],
+node[office=political_party],
+node[office=religion],
+node[office=research],
+node[office=tax_advisor],
+node[office=telecommunication] {
fill-color: office#de5696;
}
-node[office=company] {
+node[office=accountant],
+node[office=administrative],
+node[office=advertising_agency],
+node[office=architect],
+node[office=association],
+node[office=company],
+node[office=educational_institution],
+node[office=employment_agency],
+node[office=estate_agent],
+node[office=foundation],
+node[office=insurance],
+node[office=it],
+node[office=lawyer],
+node[office=newspaper],
+node[office=ngo],
+node[office=notary],
+node[office=political_party],
+node[office=religion],
+node[office=research],
+node[office=tax_advisor],
+node[office=telecommunication] {
icon-image: "icons/office_blue.png";
set icon_z17;
text: auto;
@@ -3075,7 +3140,6 @@ area[natural],
area[man_made] {
z-index: -2; /* put areas that can have other areas inside (e.g. building) a little lower, see #9606 */
}
-area[landuse=farm],
area[landuse=farmland] {
fill-color: farmland#b8e0b1;
}
@@ -3457,7 +3521,7 @@ area[aeroway=aerodrome] {
width: 2;
dashes: 9,9;
}
-node[aeroway=aerodrome] {
+node[aeroway=aerodrome][military!=airfield] {
icon-image: "transport/airport.png";
set icon_z17;
text: auto;
@@ -3966,12 +4030,6 @@ node[natural=peak][tourism=viewpoint] {
area[natural=glacier] {
fill-color: glacier#ffffff;
}
-node[natural=glacier] {
- icon-image: "misc/landmark/glacier_small.png";
- set icon_z0;
- text: auto;
- set text_z0;
-}
node[natural=volcano] {
icon-image: "misc/landmark/volcano_small.png";
set icon_z0;
@@ -4099,6 +4157,7 @@ node[natural=tree][type=palm] {
set icon_z17;
text: auto;
}
+node[natural=glacier],
node[natural=scree],
node[natural=scrub],
node[natural=fell],
@@ -4430,22 +4489,22 @@ node["openGeoDB:location"=locality] {
text-halo-color: white;
text-halo-radius: 1;
}
-area[place=continent],
-area[place=country],
-area[place=state],
-area[place=region],
-area[place=county],
-area[place=city],
-area[place=town],
-area[place=village],
-area[place=hamlet],
-area[place=farm],
-area[place=isolated_dwelling],
-area[place=neighbourhood],
-area[place=suburb],
-area[place=locality],
-area[place=island],
-area[place=islet] {
+area[setting("place_fill_colour")][place=continent],
+area[setting("place_fill_colour")][place=country],
+area[setting("place_fill_colour")][place=state],
+area[setting("place_fill_colour")][place=region],
+area[setting("place_fill_colour")][place=county],
+area[setting("place_fill_colour")][place=city],
+area[setting("place_fill_colour")][place=town],
+area[setting("place_fill_colour")][place=village],
+area[setting("place_fill_colour")][place=hamlet],
+area[setting("place_fill_colour")][place=farm],
+area[setting("place_fill_colour")][place=isolated_dwelling],
+area[setting("place_fill_colour")][place=neighbourhood],
+area[setting("place_fill_colour")][place=suburb],
+area[setting("place_fill_colour")][place=locality],
+area[setting("place_fill_colour")][place=island],
+area[setting("place_fill_colour")][place=islet] {
fill-color: place#8de3cb;
}
node[place=continent],
@@ -4560,11 +4619,10 @@ node[place=farm] {
text-halo-radius: 1;
z-index: 2.1;
}
-node[place=locality] {
+node|z15-[place=locality],
+node|z-14[place=locality][!setting("hide_icons")] {
icon-image: "place/locality.png";
- set icon_z0;
text: auto;
- set text_z0;
font-size: 10;
font-weight: bold;
text-color:black;
@@ -4625,9 +4683,10 @@ way["tiger:reviewed"=no]::core_tiger {
/*
Summary of different zoom levels:
- (any zoom) place=* and a few natural icons with their text is shown
+ (any zoom) place=* (except locality) and a few natural icons with their text is shown
|z-15 untagged way nodes are hidden completely
- |z16- fixme=* and note=* symbols
+ |z15 place=locality icon
+ |z16- fixme=* and note=* symbols; place=locality text
|z17- normal POI icons (without text),
street name along highway=* ways
|z18- text for normal POI icons is shown
@@ -4684,6 +4743,9 @@ relation|z-16[type=restriction][setting("hide_icons")] {
node|z-17[setting("hide_icons")]!.text_z0 {
text: none;
}
+node|z16-17[setting("hide_icons")][place=locality] {
+ text: auto;
+}
node|z19,area|z19 { font-size: 9; }
node|z20-,area|z20- { font-size: 10; }
@@ -4700,9 +4762,19 @@ way|z17-[highway^=tertiary][setting("highway_labels")],
way|z17-[highway=unclassified][setting("highway_labels")],
way|z17-[highway=residential][setting("highway_labels")],
way|z17-[highway=living_street][setting("highway_labels")],
+way|z17-[highway=escape][setting("highway_labels")],
way|z17-[highway=pedestrian][!area?][setting("highway_labels")],
+way|z17-[highway=steps][setting("highway_labels")],
+way|z17-[highway=footway][setting("highway_labels")],
+way|z17-[highway=path][setting("highway_labels")],
way|z17-[highway=service][setting("highway_labels")],
-way|z17-[highway=track][setting("highway_labels")] {
+way|z17-[highway=track][setting("highway_labels")],
+way|z17-[highway=cycleway][setting("highway_labels")],
+way|z17-[highway=bridleway][setting("highway_labels")],
+way|z17-[highway=bus_guideway][setting("highway_labels")],
+way|z17-[highway=raceway][setting("highway_labels")],
+way|z17-[highway=construction][setting("highway_labels")],
+way|z17-[highway=road][setting("highway_labels")] {
text: auto;
text-color: black;
font-size: 9;
@@ -4727,10 +4799,14 @@ way|z17-[highway^=tertiary][setting("highway_labels")] {
}
way|z17-[highway=unclassified][setting("highway_labels")],
way|z17-[highway=residential][setting("highway_labels")],
-way|z17-[highway=living_street][setting("highway_labels")] {
+way|z17-[highway=living_street][setting("highway_labels")],
+way|z17-[highway=escape][setting("highway_labels")] {
text-halo-color: street#c0c0c0;
}
-way[highway=pedestrian][!area?][setting("highway_labels")] {
+way|z17-[highway=pedestrian][!area?][setting("highway_labels")],
+way|z17-[highway=steps][setting("highway_labels")],
+way|z17-[highway=footway][setting("highway_labels")],
+way|z17-[highway=path][setting("highway_labels")] {
text-halo-color: foot#00ff00;
}
way|z17-[highway=service][setting("highway_labels")] {
@@ -4739,6 +4815,31 @@ way|z17-[highway=service][setting("highway_labels")] {
way|z17-[highway=track][setting("highway_labels")] {
text-halo-color: highway_track#6e541c;
}
+way|z17-[highway=cycleway][setting("highway_labels")],
+way|z17-[highway=path][setting("highway_labels")].cyclecolor {
+ text-halo-color: bicycle#b100ff;
+}
+way|z17-[highway=bridleway][setting("highway_labels")] {
+ text-halo-color: horse#a18559;
+}
+way|z17-[highway=bus_guideway][setting("highway_labels")] {
+ text-halo-color: rail#404040;
+}
+way|z17-[highway=raceway][setting("highway_labels")] {
+ text-halo-color: raceway#ff80ff;
+}
+way|z17-[highway=construction][setting("highway_labels")] {
+ text-halo-color: construction#ffff00;
+}
+way|z17-[highway=road][setting("highway_labels")] {
+ text-halo-color: highway_road#770000;
+}
+way|z17-[highway][railway=platform][setting("highway_labels")] {
+ text-halo-color: rail#404040;
+}
+way|z17-[highway][public_transport=platform][setting("highway_labels")] {
+ text-halo-color: service#809bc0;
+}
way|z18[highway][setting("highway_labels")] {
font-size: 10;
}
@@ -4749,6 +4850,14 @@ way|z20-[highway][setting("highway_labels")] {
font-size: 12;
}
+/*************/
+/* Area fill */
+/*************/
+
+area[setting("partial_fill")] {
+ fill-extent: 25;
+}
+
/* "deprecated" tags
historic=museum -> tourism=museum
man_made=power_wind -> power=generator and power_source=wind
diff --git a/test/data/regress/12038/data.osm b/test/data/regress/12038/data.osm
new file mode 100644
index 0000000..0792950
--- /dev/null
+++ b/test/data/regress/12038/data.osm
@@ -0,0 +1,655 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' upload='true' generator='JOSM'>
+ <node id='2267121941' timestamp='2013-04-14T15:30:32Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8861199' lon='-0.4203613' />
+ <node id='2267121957' timestamp='2013-04-14T15:30:32Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8849974' lon='-0.404549' />
+ <node id='2267121963' timestamp='2013-04-14T15:30:33Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8885628' lon='-0.4263867' />
+ <node id='2267121965' timestamp='2013-04-14T15:30:33Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8861364' lon='-0.4167369' />
+ <node id='2267121970' timestamp='2013-04-14T15:30:33Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8894459' lon='-0.4270522' />
+ <node id='2267121975' timestamp='2013-04-14T15:30:33Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8863594' lon='-0.4127584' />
+ <node id='2267121978' timestamp='2013-04-14T15:30:33Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8879447' lon='-0.4265668' />
+ <node id='2267121984' timestamp='2013-04-14T15:30:33Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8931568' lon='-0.4272073' />
+ <node id='2267122017' timestamp='2013-04-14T15:30:34Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8861529' lon='-0.4168898' />
+ <node id='2267122022' timestamp='2013-04-14T15:30:34Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8806633' lon='-0.4121118' />
+ <node id='2267122039' timestamp='2013-04-14T15:30:35Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.889485' lon='-0.4270793' />
+ <node id='2267122040' timestamp='2013-04-14T15:30:35Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8905867' lon='-0.4271517' />
+ <node id='2267122045' timestamp='2013-04-14T15:30:35Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.886233' lon='-0.4129205' />
+ <node id='2267122047' timestamp='2013-04-14T15:30:35Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8919663' lon='-0.3945852' />
+ <node id='2267122067' timestamp='2013-04-14T15:30:35Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8876312' lon='-0.4006459' />
+ <node id='2267122069' timestamp='2013-04-14T15:30:35Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8859085' lon='-0.413995' />
+ <node id='2267122075' timestamp='2013-04-14T15:30:35Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8892829' lon='-0.4264989' />
+ <node id='2267122105' timestamp='2013-04-14T15:30:36Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8859912' lon='-0.4130596' />
+ <node id='2267122134' timestamp='2013-04-14T15:30:36Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8817832' lon='-0.4078389' />
+ <node id='2267122183' timestamp='2013-04-14T15:30:37Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8858711' lon='-0.4130935' />
+ <node id='2267122193' timestamp='2013-04-14T15:30:37Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8877271' lon='-0.4265002' />
+ <node id='2267122200' timestamp='2013-04-14T15:30:37Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8865073' lon='-0.4227453' />
+ <node id='2267122220' timestamp='2013-04-14T15:30:37Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8881472' lon='-0.4265073' />
+ <node id='2267122236' timestamp='2013-04-14T15:30:38Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8800603' lon='-0.4122731' />
+ <node id='2267122239' timestamp='2013-04-14T15:30:38Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8803414' lon='-0.4099294' />
+ <node id='2267122270' timestamp='2013-04-14T15:30:38Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8865423' lon='-0.4126499' />
+ <node id='2267122305' timestamp='2013-04-14T15:30:39Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8803829' lon='-0.4100744' />
+ <node id='2267122315' timestamp='2013-04-14T15:30:39Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8808875' lon='-0.4082333' />
+ <node id='2267122324' timestamp='2013-04-14T15:30:39Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8800091' lon='-0.4090451' />
+ <node id='2267122365' timestamp='2013-04-14T15:30:40Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8867116' lon='-0.4223531' />
+ <node id='2267122366' timestamp='2013-04-14T15:30:40Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8931179' lon='-0.3910946' />
+ <node id='2267122371' timestamp='2013-04-14T15:30:41Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8839093' lon='-0.4062652' />
+ <node id='2267122374' timestamp='2013-04-14T15:30:41Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8927342' lon='-0.3930786' />
+ <node id='2267122394' timestamp='2013-04-14T15:30:41Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8866368' lon='-0.4218779' />
+ <node id='2267122422' timestamp='2013-04-14T15:30:42Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8859474' lon='-0.4143406' />
+ <node id='2267122431' timestamp='2013-04-14T15:30:42Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8893022' lon='-0.4265296' />
+ <node id='2267122433' timestamp='2013-04-14T15:30:42Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8866913' lon='-0.422449' />
+ <node id='2267122465' timestamp='2013-04-14T15:30:43Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8919974' lon='-0.3944292' />
+ <node id='2267122466' timestamp='2013-04-14T15:30:43Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8796617' lon='-0.4122553' />
+ <node id='2267122476' timestamp='2013-04-14T15:30:44Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.891027' lon='-0.3970432' />
+ <node id='2267122477' timestamp='2013-04-14T15:30:44Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8872192' lon='-0.4011036' />
+ <node id='2267122488' timestamp='2013-04-14T15:30:44Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8883769' lon='-0.3998739' />
+ <node id='2267122502' timestamp='2013-04-14T15:30:44Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8899939' lon='-0.4270736' />
+ <node id='2267122503' timestamp='2013-04-14T15:30:44Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8913487' lon='-0.4273735' />
+ <node id='2267122511' timestamp='2013-04-14T15:30:45Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8860872' lon='-0.4176854' />
+ <node id='2267122523' timestamp='2013-04-14T15:30:45Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8917286' lon='-0.4273336' />
+ <node id='2267122527' timestamp='2013-04-14T15:30:45Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8891144' lon='-0.4264748' />
+ <node id='2267122528' timestamp='2013-04-14T15:30:45Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8860398' lon='-0.4027789' />
+ <node id='2267122548' timestamp='2013-04-14T15:30:46Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.892726' lon='-0.4271422' />
+ <node id='2267122559' timestamp='2013-04-14T15:30:46Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8860283' lon='-0.4185759' />
+ <node id='2267122562' timestamp='2013-04-14T15:30:46Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8902387' lon='-0.4271506' />
+ <node id='2267122580' timestamp='2013-04-14T15:30:46Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8879099' lon='-0.4004459' />
+ <node id='2267122582' timestamp='2013-04-14T15:30:46Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8912984' lon='-0.3968291' />
+ <node id='2267122672' timestamp='2013-04-14T15:30:49Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8818964' lon='-0.4078905' />
+ <node id='2267122697' timestamp='2013-04-14T15:30:50Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.880447' lon='-0.4104205' />
+ <node id='2267122712' timestamp='2013-04-14T15:30:50Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8795952' lon='-0.4131858' />
+ <node id='2267122721' timestamp='2013-04-14T15:30:50Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.880415' lon='-0.4084684' />
+ <node id='2267122753' timestamp='2013-04-14T15:30:51Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8816932' lon='-0.4129852' />
+ <node id='2267122766' timestamp='2013-04-14T15:30:51Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8861621' lon='-0.4170402' />
+ <node id='2267122769' timestamp='2013-04-14T15:30:51Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8896681' lon='-0.4270547' />
+ <node id='2267122780' timestamp='2013-04-14T15:30:52Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8908545' lon='-0.4273389' />
+ <node id='2267122794' timestamp='2013-04-14T15:30:52Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.888749' lon='-0.4264558' />
+ <node id='2267122802' timestamp='2013-04-14T15:30:52Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8867454' lon='-0.4251911' />
+ <node id='2267122806' timestamp='2013-04-14T15:30:52Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8861618' lon='-0.4172179' />
+ <node id='2267122817' timestamp='2013-04-14T15:30:53Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8931764' lon='-0.4273986' />
+ <node id='2267122822' timestamp='2013-04-14T15:30:53Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8927768' lon='-0.3930316' />
+ <node id='2267122823' timestamp='2013-04-14T15:30:53Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8930092' lon='-0.4270701' />
+ <node id='2267122824' timestamp='2013-04-14T15:30:53Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8902711' lon='-0.4271538' />
+ <node id='2267122828' timestamp='2013-04-14T15:30:53Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8888193' lon='-0.4264676' />
+ <node id='2267122834' timestamp='2013-04-14T15:30:53Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8909793' lon='-0.4273887' />
+ <node id='2267122839' timestamp='2013-04-14T15:30:53Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8860184' lon='-0.4189104' />
+ <node id='2267122840' timestamp='2013-04-14T15:30:53Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8931701' lon='-0.4275254' />
+ <node id='2267122844' timestamp='2013-04-14T15:30:54Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8920978' lon='-0.3942053' />
+ <node id='2267122847' timestamp='2013-04-14T15:30:54Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8931327' lon='-0.4271527' />
+ <node id='2267122850' timestamp='2013-04-14T15:30:54Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8919108' lon='-0.3955199' />
+ <node id='2267122862' timestamp='2013-04-14T15:30:54Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8864957' lon='-0.4214818' />
+ <node id='2267122863' timestamp='2013-04-14T15:30:54Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8924156' lon='-0.3887485' />
+ <node id='2267122864' timestamp='2013-04-14T15:30:54Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8929031' lon='-0.4270666' />
+ <node id='2267122868' timestamp='2013-04-14T15:30:54Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8867916' lon='-0.4254185' />
+ <node id='2267122869' timestamp='2013-04-14T15:30:54Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8931692' lon='-0.4272624' />
+ <node id='2267122871' timestamp='2013-04-14T15:30:54Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8907801' lon='-0.4272902' />
+ <node id='2267122874' timestamp='2013-04-14T15:30:54Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8892185' lon='-0.4264613' />
+ <node id='2267122888' timestamp='2013-04-14T15:30:55Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8899073' lon='-0.4270537' />
+ <node id='2267122891' timestamp='2013-04-14T15:30:55Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8856942' lon='-0.4131777' />
+ <node id='2267122892' timestamp='2013-04-14T15:30:55Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8861498' lon='-0.4173236' />
+ <node id='2267122895' timestamp='2013-04-14T15:30:55Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8910442' lon='-0.4274022' />
+ <node id='2267122924' timestamp='2013-04-14T15:30:56Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8890087' lon='-0.3991883' />
+ <node id='2267122929' timestamp='2013-04-14T15:30:56Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.886672' lon='-0.4219549' />
+ <node id='2267122932' timestamp='2013-04-14T15:30:56Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8906637' lon='-0.4271889' />
+ <node id='2267122935' timestamp='2013-04-14T15:30:56Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.890757' lon='-0.3972231' />
+ <node id='2267122980' timestamp='2013-04-14T15:30:57Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8901746' lon='-0.4271372' />
+ <node id='2267122994' timestamp='2013-04-14T15:30:57Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8924532' lon='-0.4271798' />
+ <node id='2267123018' timestamp='2013-04-14T15:30:58Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.886062' lon='-0.4179478' />
+ <node id='2267123041' timestamp='2013-04-14T15:30:59Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8895084' lon='-0.4270842' />
+ <node id='2267123043' timestamp='2013-04-14T15:30:59Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8859788' lon='-0.4147291' />
+ <node id='2267123052' timestamp='2013-04-14T15:30:59Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8884585' lon='-0.4263874' />
+ <node id='2267123055' timestamp='2013-04-14T15:30:59Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8861653' lon='-0.4171425' />
+ <node id='2267123058' timestamp='2013-04-14T15:30:59Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8893245' lon='-0.4265843' />
+ <node id='2267123060' timestamp='2013-04-14T15:30:59Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8862231' lon='-0.4246713' />
+ <node id='2267123163' timestamp='2013-04-14T15:31:02Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8892628' lon='-0.4264783' />
+ <node id='2267123221' timestamp='2013-04-14T15:31:04Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8876938' lon='-0.4006921' />
+ <node id='2267123304' timestamp='2013-04-14T15:31:05Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8861696' lon='-0.4191157' />
+ <node id='2267123356' timestamp='2013-04-14T15:31:05Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8860892' lon='-0.4120027' />
+ <node id='2267123369' timestamp='2013-04-14T15:31:05Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8866601' lon='-0.4225382' />
+ <node id='2267123379' timestamp='2013-04-14T15:31:06Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8925089' lon='-0.3934987' />
+ <node id='2267123385' timestamp='2013-04-14T15:31:06Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8865662' lon='-0.4117647' />
+ <node id='2267123415' timestamp='2013-04-14T15:31:06Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8830353' lon='-0.4069305' />
+ <node id='2267123427' timestamp='2013-04-14T15:31:06Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.886768' lon='-0.4253297' />
+ <node id='2267123429' timestamp='2013-04-14T15:31:06Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8911648' lon='-0.4274081' />
+ <node id='2267123447' timestamp='2013-04-14T15:31:06Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8799632' lon='-0.4122778' />
+ <node id='2267123455' timestamp='2013-04-14T15:31:06Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8814416' lon='-0.4079771' />
+ <node id='2267123499' timestamp='2013-04-14T15:31:07Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8860057' lon='-0.4154546' />
+ <node id='2267123512' timestamp='2013-04-14T15:31:07Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8893842' lon='-0.4268112' />
+ <node id='2267123545' timestamp='2013-04-14T15:31:08Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8885187' lon='-0.4263811' />
+ <node id='2267123593' timestamp='2013-04-14T15:31:09Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8803649' lon='-0.413181' />
+ <node id='2267123605' timestamp='2013-04-14T15:31:09Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8823041' lon='-0.412801' />
+ <node id='2267123666' timestamp='2013-04-14T15:31:09Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8865205' lon='-0.4239846' />
+ <node id='2267123668' timestamp='2013-04-14T15:31:09Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8926419' lon='-0.3932268' />
+ <node id='2267123674' timestamp='2013-04-14T15:31:10Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8892366' lon='-0.426465' />
+ <node id='2267123678' timestamp='2013-04-14T15:31:10Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8868344' lon='-0.4255194' />
+ <node id='2267123684' timestamp='2013-04-14T15:31:10Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8930898' lon='-0.4271058' />
+ <node id='2267123686' timestamp='2013-04-14T15:31:10Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8856399' lon='-0.4034608' />
+ <node id='2267123690' timestamp='2013-04-14T15:31:10Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8922481' lon='-0.393957' />
+ <node id='2267123703' timestamp='2013-04-14T15:31:10Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8919569' lon='-0.3946893' />
+ <node id='2267123705' timestamp='2013-04-14T15:31:10Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8868917' lon='-0.4014845' />
+ <node id='2267123720' timestamp='2013-04-14T15:31:10Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8930226' lon='-0.4302021' />
+ <node id='2267124070' timestamp='2013-04-14T15:31:15Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8929804' lon='-0.4305406' />
+ <node id='2267124082' timestamp='2013-04-14T15:31:16Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8931543' lon='-0.3928196' />
+ <node id='2267124144' timestamp='2013-04-14T15:31:17Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8804125' lon='-0.4102013' />
+ <node id='2267124168' timestamp='2013-04-14T15:31:17Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8872574' lon='-0.4261463' />
+ <node id='2267124185' timestamp='2013-04-14T15:31:17Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8804645' lon='-0.4106544' />
+ <node id='2267124248' timestamp='2013-04-14T15:31:18Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8799111' lon='-0.4086447' />
+ <node id='2267124340' timestamp='2013-04-14T15:31:21Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.884758' lon='-0.4123864' />
+ <node id='2267124341' timestamp='2013-04-14T15:31:21Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8801752' lon='-0.4122564' />
+ <node id='2267124381' timestamp='2013-04-14T15:31:22Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.884022' lon='-0.4123531' />
+ <node id='2267124451' timestamp='2013-04-14T15:31:23Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8818089' lon='-0.4128946' />
+ <node id='2267124508' timestamp='2013-04-14T15:31:23Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8798472' lon='-0.4122746' />
+ <node id='2267124535' timestamp='2013-04-14T15:31:24Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8861531' lon='-0.4198911' />
+ <node id='2267124576' timestamp='2013-04-14T15:31:24Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8919144' lon='-0.3959805' />
+ <node id='2267124663' timestamp='2013-04-14T15:31:26Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8919437' lon='-0.3950353' />
+ <node id='2267124754' timestamp='2013-04-14T15:31:27Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8866157' lon='-0.4120972' />
+ <node id='2267124820' timestamp='2013-04-14T15:31:27Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8852732' lon='-0.4040648' />
+ <node id='2267124889' timestamp='2013-04-14T15:31:28Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8804387' lon='-0.4121948' />
+ <node id='2267124895' timestamp='2013-04-14T15:31:28Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8865111' lon='-0.4126722' />
+ <node id='2267124901' timestamp='2013-04-14T15:31:28Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.885752' lon='-0.4133264' />
+ <node id='2267124903' timestamp='2013-04-14T15:31:28Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8928256' lon='-0.3929887' />
+ <node id='2267124921' timestamp='2013-04-14T15:31:29Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.881371' lon='-0.4130971' />
+ <node id='2267124923' timestamp='2013-04-14T15:31:29Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8931592' lon='-0.4279893' />
+ <node id='2267124933' timestamp='2013-04-14T15:31:29Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8853175' lon='-0.4123261' />
+ <node id='2267124941' timestamp='2013-04-14T15:31:30Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8846729' lon='-0.4051501' />
+ <node id='2267124955' timestamp='2013-04-14T15:31:30Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.880307' lon='-0.4122306' />
+ <node id='2267124974' timestamp='2013-04-14T15:31:31Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8930535' lon='-0.4270857' />
+ <node id='2267124979' timestamp='2013-04-14T15:31:31Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8867209' lon='-0.4221793' />
+ <node id='2267124981' timestamp='2013-04-14T15:31:31Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8926902' lon='-0.3931427' />
+ <node id='2267124982' timestamp='2013-04-14T15:31:31Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.893064' lon='-0.4296675' />
+ <node id='2267124985' timestamp='2013-04-14T15:31:31Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8904993' lon='-0.427139' />
+ <node id='2267124991' timestamp='2013-04-14T15:31:31Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8840718' lon='-0.4124509' />
+ <node id='2267124995' timestamp='2013-04-14T15:31:31Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8931144' lon='-0.4271291' />
+ <node id='2267124996' timestamp='2013-04-14T15:31:31Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8900254' lon='-0.397915' />
+ <node id='2267125010' timestamp='2013-04-14T15:31:32Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8929059' lon='-0.3929376' />
+ <node id='2267125019' timestamp='2013-04-14T15:31:32Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.887861' lon='-0.4265568' />
+ <node id='2267125028' timestamp='2013-04-14T15:31:32Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8863967' lon='-0.4127259' />
+ <node id='2267125037' timestamp='2013-04-14T15:31:32Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8866481' lon='-0.4124302' />
+ <node id='2267125067' timestamp='2013-04-14T15:31:33Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8866181' lon='-0.4226207' />
+ <node id='2267125101' timestamp='2013-04-14T15:31:33Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8865669' lon='-0.4226907' />
+ <node id='2267125267' timestamp='2013-04-14T15:31:35Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8875549' lon='-0.4263993' />
+ <node id='2267125279' timestamp='2013-04-14T15:31:36Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.88059' lon='-0.4121442' />
+ <node id='2267125328' timestamp='2013-04-14T15:31:37Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8920454' lon='-0.3943195' />
+ <node id='2267125342' timestamp='2013-04-14T15:31:37Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.886642' lon='-0.4121787' />
+ <node id='2267125351' timestamp='2013-04-14T15:31:37Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8864427' lon='-0.4021197' />
+ <node id='2267125679' timestamp='2013-04-14T15:31:42Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8861684' lon='-0.4189622' />
+ <node id='2267125692' timestamp='2013-04-14T15:31:42Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8883027' lon='-0.4264324' />
+ <node id='2267125698' timestamp='2013-04-14T15:31:42Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8858214' lon='-0.4135359' />
+ <node id='2267125708' timestamp='2013-04-14T15:31:43Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8866907' lon='-0.4220097' />
+ <node id='2267125712' timestamp='2013-04-14T15:31:43Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8866588' lon='-0.412289' />
+ <node id='2267125725' timestamp='2013-04-14T15:31:43Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8858739' lon='-0.4137644' />
+ <node id='2267125740' timestamp='2013-04-14T15:31:43Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.886705' lon='-0.4220661' />
+ <node id='2267125755' timestamp='2013-04-14T15:31:43Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8864773' lon='-0.4245192' />
+ <node id='2267125764' timestamp='2013-04-14T15:31:43Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8930474' lon='-0.4299013' />
+ <node id='2267125769' timestamp='2013-04-14T15:31:43Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.88429' lon='-0.4124918' />
+ <node id='2267125775' timestamp='2013-04-14T15:31:44Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8933798' lon='-0.3927407' />
+ <node id='2267125805' timestamp='2013-04-14T15:31:44Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8883626' lon='-0.4264119' />
+ <node id='2267125885' timestamp='2013-04-14T15:31:46Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8881269' lon='-0.4001996' />
+ <node id='2267125928' timestamp='2013-04-14T15:31:47Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8898424' lon='-0.3981389' />
+ <node id='2267125932' timestamp='2013-04-14T15:31:47Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8915274' lon='-0.3964815' />
+ <node id='2267125962' timestamp='2013-04-14T15:31:47Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8825694' lon='-0.4073245' />
+ <node id='2267125977' timestamp='2013-04-14T15:31:48Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8865996' lon='-0.4125683' />
+ <node id='2267126006' timestamp='2013-04-14T15:31:48Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8865697' lon='-0.4126191' />
+ <node id='2267126099' timestamp='2013-04-14T15:31:50Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8919846' lon='-0.3944822' />
+ <node id='2267126102' timestamp='2013-04-14T15:31:51Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.886721' lon='-0.4222532' />
+ <node id='2267126158' timestamp='2013-04-14T15:31:52Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8841807' lon='-0.4059886' />
+ <node id='2267126235' timestamp='2013-04-14T15:31:54Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8815994' lon='-0.4130282' />
+ <node id='2267126240' timestamp='2013-04-14T15:31:54Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8811935' lon='-0.4131387' />
+ <node id='2267126247' timestamp='2013-04-14T15:31:55Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8861288' lon='-0.4129952' />
+ <node id='2267126347' timestamp='2013-04-14T15:31:57Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8828778' lon='-0.4070567' />
+ <node id='2267126355' timestamp='2013-04-14T15:31:57Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8866965' lon='-0.4017442' />
+ <node id='2267126452' timestamp='2013-04-14T15:32:00Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8863962' lon='-0.4239035' />
+ <node id='2267126454' timestamp='2013-04-14T15:32:00Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8879923' lon='-0.4265595' />
+ <node id='2267126475' timestamp='2013-04-14T15:32:00Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8866284' lon='-0.4125019' />
+ <node id='2267126518' timestamp='2013-04-14T15:32:02Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8864172' lon='-0.4227966' />
+ <node id='2267126769' timestamp='2013-04-14T15:32:05Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8873522' lon='-0.4262427' />
+ <node id='2267126771' timestamp='2013-04-14T15:32:05Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8811645' lon='-0.4081045' />
+ <node id='2267126775' timestamp='2013-04-14T15:32:05Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8866578' lon='-0.4123516' />
+ <node id='2267126970' timestamp='2013-04-14T15:32:08Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8860356' lon='-0.415937' />
+ <node id='2267126974' timestamp='2013-04-14T15:32:09Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8894079' lon='-0.4269625' />
+ <node id='2267126976' timestamp='2013-04-14T15:32:09Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8860802' lon='-0.4163705' />
+ <node id='2267126985' timestamp='2013-04-14T15:32:09Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8863385' lon='-0.4248921' />
+ <node id='2267126986' timestamp='2013-04-14T15:32:09Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8894183' lon='-0.4270005' />
+ <node id='2267127007' timestamp='2013-04-14T15:32:09Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8893103' lon='-0.3988154' />
+ <node id='2311734181' timestamp='2013-05-19T19:26:34Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='16198499' lat='50.8923525' lon='-0.3887436' />
+ <node id='2311734190' timestamp='2013-05-19T19:26:34Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='16198499' lat='50.8927982' lon='-0.4311012' />
+ <node id='3811630646' timestamp='2015-10-31T20:40:57Z' uid='221923' user='michaelinredhill' visible='true' version='1' changeset='35000283' lat='50.8866032' lon='-0.4018822' />
+ <node id='3811632058' timestamp='2015-10-31T20:40:57Z' uid='221923' user='michaelinredhill' visible='true' version='1' changeset='35000283' lat='50.8918856' lon='-0.3960178' />
+ <way id='222191929' timestamp='2015-10-31T20:41:00Z' uid='221923' user='michaelinredhill' visible='true' version='2' changeset='35000283'>
+ <nd ref='2311734190' />
+ <nd ref='2267124070' />
+ <nd ref='2267123720' />
+ <nd ref='2267125764' />
+ <nd ref='2267124982' />
+ <nd ref='2267124923' />
+ <nd ref='2267122840' />
+ <nd ref='2267122817' />
+ <nd ref='2267122869' />
+ <nd ref='2267121984' />
+ <nd ref='2267122847' />
+ <nd ref='2267124995' />
+ <nd ref='2267123684' />
+ <nd ref='2267124974' />
+ <nd ref='2267122823' />
+ <nd ref='2267122864' />
+ <nd ref='2267122548' />
+ <nd ref='2267122994' />
+ <nd ref='2267122523' />
+ <nd ref='2267122503' />
+ <nd ref='2267123429' />
+ <nd ref='2267122895' />
+ <nd ref='2267122834' />
+ <nd ref='2267122780' />
+ <nd ref='2267122871' />
+ <nd ref='2267122932' />
+ <nd ref='2267122040' />
+ <nd ref='2267124985' />
+ <nd ref='2267122824' />
+ <nd ref='2267122562' />
+ <nd ref='2267122980' />
+ <nd ref='2267122502' />
+ <nd ref='2267122888' />
+ <nd ref='2267122769' />
+ <nd ref='2267123041' />
+ <nd ref='2267122039' />
+ <nd ref='2267121970' />
+ <nd ref='2267126986' />
+ <nd ref='2267126974' />
+ <nd ref='2267123512' />
+ <nd ref='2267123058' />
+ <nd ref='2267122431' />
+ <nd ref='2267122075' />
+ <nd ref='2267123163' />
+ <nd ref='2267123674' />
+ <nd ref='2267122874' />
+ <nd ref='2267122527' />
+ <nd ref='2267122828' />
+ <nd ref='2267122794' />
+ <nd ref='2267121963' />
+ <nd ref='2267123545' />
+ <nd ref='2267123052' />
+ <nd ref='2267125805' />
+ <nd ref='2267125692' />
+ <nd ref='2267122220' />
+ <nd ref='2267126454' />
+ <nd ref='2267121978' />
+ <nd ref='2267125019' />
+ <nd ref='2267122193' />
+ <nd ref='2267125267' />
+ <nd ref='2267126769' />
+ <nd ref='2267124168' />
+ <nd ref='2267123678' />
+ <nd ref='2267122868' />
+ <nd ref='2267123427' />
+ <nd ref='2267122802' />
+ <nd ref='2267126985' />
+ <nd ref='2267123060' />
+ <nd ref='2267125755' />
+ <nd ref='2267123666' />
+ <nd ref='2267126452' />
+ <nd ref='2267126518' />
+ <nd ref='2267122200' />
+ <nd ref='2267125101' />
+ <nd ref='2267125067' />
+ <nd ref='2267123369' />
+ <nd ref='2267122433' />
+ <nd ref='2267122365' />
+ <nd ref='2267126102' />
+ <nd ref='2267124979' />
+ <nd ref='2267125740' />
+ <nd ref='2267125708' />
+ <nd ref='2267122929' />
+ <nd ref='2267122394' />
+ <nd ref='2267122862' />
+ <nd ref='2267121941' />
+ <nd ref='2267124535' />
+ <nd ref='2267123304' />
+ <nd ref='2267125679' />
+ <nd ref='2267122839' />
+ <nd ref='2267122559' />
+ <nd ref='2267123018' />
+ <nd ref='2267122511' />
+ <nd ref='2267122892' />
+ <nd ref='2267122806' />
+ <nd ref='2267123055' />
+ <nd ref='2267122766' />
+ <nd ref='2267122017' />
+ <nd ref='2267121965' />
+ <nd ref='2267126976' />
+ <nd ref='2267126970' />
+ <nd ref='2267123499' />
+ <nd ref='2267123043' />
+ <nd ref='2267122422' />
+ <nd ref='2267122069' />
+ <nd ref='2267125725' />
+ <nd ref='2267125698' />
+ <nd ref='2267124901' />
+ <nd ref='2267122891' />
+ <nd ref='2267122183' />
+ <nd ref='2267122105' />
+ <nd ref='2267126247' />
+ <nd ref='2267122045' />
+ <nd ref='2267121975' />
+ <nd ref='2267125028' />
+ <nd ref='2267124895' />
+ <nd ref='2267122270' />
+ <nd ref='2267126006' />
+ <nd ref='2267125977' />
+ <nd ref='2267126475' />
+ <nd ref='2267125037' />
+ <nd ref='2267126775' />
+ <nd ref='2267125712' />
+ <nd ref='2267125342' />
+ <nd ref='2267124754' />
+ <nd ref='2267123385' />
+ <nd ref='2267123356' />
+ <nd ref='2267124933' />
+ <nd ref='2267124340' />
+ <nd ref='2267125769' />
+ <nd ref='2267124991' />
+ <nd ref='2267124381' />
+ <nd ref='2267123605' />
+ <nd ref='2267124451' />
+ <nd ref='2267122753' />
+ <nd ref='2267126235' />
+ <nd ref='2267124921' />
+ <nd ref='2267126240' />
+ <nd ref='2267123593' />
+ <nd ref='2267122712' />
+ <nd ref='2267122466' />
+ <nd ref='2267124508' />
+ <nd ref='2267123447' />
+ <nd ref='2267122236' />
+ <nd ref='2267124341' />
+ <nd ref='2267124955' />
+ <nd ref='2267124889' />
+ <nd ref='2267125279' />
+ <nd ref='2267122022' />
+ <nd ref='2267124185' />
+ <nd ref='2267122697' />
+ <nd ref='2267124144' />
+ <nd ref='2267122305' />
+ <nd ref='2267122239' />
+ <nd ref='2267122324' />
+ <nd ref='2267124248' />
+ <nd ref='2267122721' />
+ <nd ref='2267122315' />
+ <nd ref='2267126771' />
+ <nd ref='2267123455' />
+ <nd ref='2267122134' />
+ <nd ref='2267122672' />
+ <nd ref='2267125962' />
+ <nd ref='2267126347' />
+ <nd ref='2267123415' />
+ <nd ref='2267122371' />
+ <nd ref='2267126158' />
+ <nd ref='2267124941' />
+ <nd ref='2267121957' />
+ <nd ref='2267124820' />
+ <nd ref='2267123686' />
+ <nd ref='2267122528' />
+ <nd ref='2267125351' />
+ <nd ref='3811630646' />
+ <nd ref='2267126355' />
+ <nd ref='2267123705' />
+ <nd ref='2267122477' />
+ <nd ref='2267122067' />
+ <nd ref='2267123221' />
+ <nd ref='2267122580' />
+ <nd ref='2267125885' />
+ <nd ref='2267122488' />
+ <nd ref='2267122924' />
+ <nd ref='2267127007' />
+ <nd ref='2267125928' />
+ <nd ref='2267124996' />
+ <nd ref='2267122935' />
+ <nd ref='2267122476' />
+ <nd ref='2267122582' />
+ <nd ref='2267125932' />
+ <nd ref='3811632058' />
+ <nd ref='2267124576' />
+ <nd ref='2267122850' />
+ <nd ref='2267124663' />
+ <nd ref='2267123703' />
+ <nd ref='2267122047' />
+ <nd ref='2267126099' />
+ <nd ref='2267122465' />
+ <nd ref='2267125328' />
+ <nd ref='2267122844' />
+ <nd ref='2267123690' />
+ <nd ref='2267123379' />
+ <nd ref='2267123668' />
+ <nd ref='2267124981' />
+ <nd ref='2267122374' />
+ <nd ref='2267122822' />
+ <nd ref='2267124903' />
+ <nd ref='2267125010' />
+ <nd ref='2267124082' />
+ <nd ref='2267125775' />
+ <nd ref='2267122366' />
+ <nd ref='2267122863' />
+ <nd ref='2311734181' />
+ <tag k='admin_level' v='8' />
+ <tag k='boundary' v='administrative' />
+ <tag k='source' v='OS_OpenData_Boundary-Line' />
+ </way>
+ <relation id='114662' timestamp='2014-06-14T18:02:32Z' uid='2098' user='Andy Street' visible='true' version='92' changeset='22930203'>
+ <member type='way' ref='208614215' role='outer' />
+ <member type='way' ref='221531238' role='outer' />
+ <member type='way' ref='221532343' role='outer' />
+ <member type='way' ref='221532342' role='outer' />
+ <member type='way' ref='221532344' role='outer' />
+ <member type='way' ref='107477760' role='outer' />
+ <member type='way' ref='168774431' role='outer' />
+ <member type='way' ref='208614205' role='outer' />
+ <member type='way' ref='221535902' role='outer' />
+ <member type='way' ref='221537977' role='outer' />
+ <member type='way' ref='216656392' role='outer' />
+ <member type='way' ref='216658231' role='outer' />
+ <member type='way' ref='221666038' role='outer' />
+ <member type='way' ref='221667655' role='outer' />
+ <member type='way' ref='216660394' role='outer' />
+ <member type='way' ref='216664114' role='outer' />
+ <member type='way' ref='216664935' role='outer' />
+ <member type='way' ref='221754107' role='outer' />
+ <member type='way' ref='208622492' role='outer' />
+ <member type='way' ref='217367574' role='outer' />
+ <member type='way' ref='217490242' role='outer' />
+ <member type='way' ref='217369150' role='outer' />
+ <member type='way' ref='217490241' role='outer' />
+ <member type='way' ref='222117157' role='outer' />
+ <member type='way' ref='222823996' role='outer' />
+ <member type='way' ref='223104306' role='outer' />
+ <member type='way' ref='217446573' role='outer' />
+ <member type='way' ref='223317151' role='outer' />
+ <member type='way' ref='222564384' role='outer' />
+ <member type='way' ref='223025471' role='outer' />
+ <member type='way' ref='223023448' role='outer' />
+ <member type='way' ref='222560378' role='outer' />
+ <member type='way' ref='222278402' role='outer' />
+ <member type='way' ref='222191929' role='outer' />
+ <member type='way' ref='222191931' role='outer' />
+ <member type='way' ref='217483066' role='outer' />
+ <member type='way' ref='222823997' role='outer' />
+ <member type='way' ref='224914039' role='outer' />
+ <member type='way' ref='224906515' role='outer' />
+ <member type='way' ref='222821771' role='outer' />
+ <member type='way' ref='224904399' role='outer' />
+ <member type='way' ref='222724423' role='outer' />
+ <member type='way' ref='217483099' role='outer' />
+ <member type='way' ref='224903046' role='outer' />
+ <member type='way' ref='222692060' role='outer' />
+ <member type='way' ref='217483103' role='outer' />
+ <member type='way' ref='226429450' role='outer' />
+ <member type='way' ref='218286500' role='outer' />
+ <member type='way' ref='217483059' role='outer' />
+ <member type='way' ref='222145287' role='outer' />
+ <member type='way' ref='218493159' role='outer' />
+ <member type='way' ref='221531239' role='outer' />
+ <member type='way' ref='218494122' role='outer' />
+ <member type='node' ref='17722528' role='admin_centre' />
+ <member type='relation' ref='2879656' role='subarea' />
+ <member type='relation' ref='2929114' role='subarea' />
+ <member type='relation' ref='2929162' role='subarea' />
+ <member type='relation' ref='2929184' role='subarea' />
+ <member type='relation' ref='2931219' role='subarea' />
+ <member type='relation' ref='2931233' role='subarea' />
+ <member type='relation' ref='2932405' role='subarea' />
+ <member type='relation' ref='2932600' role='subarea' />
+ <member type='relation' ref='2934411' role='subarea' />
+ <member type='relation' ref='2936236' role='subarea' />
+ <member type='relation' ref='2936881' role='subarea' />
+ <member type='relation' ref='2937931' role='subarea' />
+ <member type='relation' ref='2939507' role='subarea' />
+ <member type='relation' ref='2939596' role='subarea' />
+ <member type='relation' ref='2940000' role='subarea' />
+ <member type='relation' ref='2941822' role='subarea' />
+ <member type='relation' ref='2941831' role='subarea' />
+ <member type='relation' ref='2944657' role='subarea' />
+ <member type='relation' ref='2945066' role='subarea' />
+ <member type='relation' ref='2951347' role='subarea' />
+ <member type='relation' ref='2951399' role='subarea' />
+ <member type='relation' ref='2951666' role='subarea' />
+ <member type='relation' ref='2953116' role='subarea' />
+ <member type='relation' ref='2953187' role='subarea' />
+ <member type='relation' ref='2953251' role='subarea' />
+ <member type='relation' ref='2954011' role='subarea' />
+ <member type='relation' ref='2954357' role='subarea' />
+ <member type='relation' ref='2954403' role='subarea' />
+ <member type='relation' ref='2955279' role='subarea' />
+ <member type='relation' ref='2955326' role='subarea' />
+ <member type='relation' ref='2955363' role='subarea' />
+ <member type='relation' ref='2955404' role='subarea' />
+ <tag k='admin_level' v='8' />
+ <tag k='boundary' v='administrative' />
+ <tag k='designation' v='non_metropolitan_district' />
+ <tag k='name' v='Horsham' />
+ <tag k='ons_code' v='45UF' />
+ <tag k='ref:gss' v='E07000227' />
+ <tag k='ref:lau:1' v='UKJ2405' />
+ <tag k='source:ons_code' v='OS_OpenData_CodePoint Codelist.txt' />
+ <tag k='source:ref:gss' v='ONS_OpenData' />
+ <tag k='source:ref:lau:1' v='ONS_OpenData' />
+ <tag k='type' v='boundary' />
+ <tag k='website' v='http://www.horsham.gov.uk/' />
+ <tag k='wikipedia' v='en:Horsham District' />
+ </relation>
+ <relation id='114663' timestamp='2014-10-04T12:30:09Z' uid='2098' user='Andy Street' visible='true' version='75' changeset='25850552'>
+ <member type='way' ref='208622486' role='outer' />
+ <member type='way' ref='222359029' role='outer' />
+ <member type='way' ref='222560375' role='outer' />
+ <member type='way' ref='217369770' role='outer' />
+ <member type='way' ref='217446599' role='outer' />
+ <member type='way' ref='223026229' role='outer' />
+ <member type='way' ref='223027530' role='outer' />
+ <member type='way' ref='223035667' role='outer' />
+ <member type='way' ref='223038742' role='outer' />
+ <member type='way' ref='223042427' role='outer' />
+ <member type='way' ref='223106287' role='outer' />
+ <member type='way' ref='223106288' role='outer' />
+ <member type='way' ref='223181903' role='outer' />
+ <member type='way' ref='223132582' role='outer' />
+ <member type='way' ref='223131466' role='outer' />
+ <member type='way' ref='217446535' role='outer' />
+ <member type='way' ref='224950307' role='outer' />
+ <member type='way' ref='224949291' role='outer' />
+ <member type='way' ref='217446553' role='outer' />
+ <member type='way' ref='223131460' role='outer' />
+ <member type='way' ref='223185231' role='outer' />
+ <member type='way' ref='224922545' role='outer' />
+ <member type='way' ref='224922544' role='outer' />
+ <member type='way' ref='224921679' role='outer' />
+ <member type='way' ref='223313640' role='outer' />
+ <member type='way' ref='224919511' role='outer' />
+ <member type='way' ref='224919510' role='outer' />
+ <member type='way' ref='224918392' role='outer' />
+ <member type='way' ref='223313639' role='outer' />
+ <member type='way' ref='224914810' role='outer' />
+ <member type='way' ref='223317142' role='outer' />
+ <member type='way' ref='217446573' role='outer' />
+ <member type='way' ref='223317151' role='outer' />
+ <member type='way' ref='223104306' role='outer' />
+ <member type='way' ref='222823996' role='outer' />
+ <member type='way' ref='222564384' role='outer' />
+ <member type='way' ref='223025471' role='outer' />
+ <member type='way' ref='223023448' role='outer' />
+ <member type='way' ref='222560378' role='outer' />
+ <member type='way' ref='222278402' role='outer' />
+ <member type='way' ref='222191929' role='outer' />
+ <member type='way' ref='222191931' role='outer' />
+ <member type='way' ref='222117157' role='outer' />
+ <member type='way' ref='217490241' role='outer' />
+ <member type='node' ref='17511394' role='admin_centre' />
+ <member type='relation' ref='2944634' role='subarea' />
+ <member type='relation' ref='2951590' role='subarea' />
+ <member type='relation' ref='2958699' role='subarea' />
+ <member type='relation' ref='2958710' role='subarea' />
+ <member type='relation' ref='2958722' role='subarea' />
+ <member type='relation' ref='2958732' role='subarea' />
+ <member type='relation' ref='2958802' role='subarea' />
+ <member type='relation' ref='2958817' role='subarea' />
+ <member type='relation' ref='2958850' role='subarea' />
+ <member type='relation' ref='2958955' role='subarea' />
+ <member type='relation' ref='2959807' role='subarea' />
+ <member type='relation' ref='2959831' role='subarea' />
+ <member type='relation' ref='2959832' role='subarea' />
+ <member type='relation' ref='2959846' role='subarea' />
+ <member type='relation' ref='2959862' role='subarea' />
+ <member type='relation' ref='2960173' role='subarea' />
+ <member type='relation' ref='2960188' role='subarea' />
+ <member type='relation' ref='2960694' role='subarea' />
+ <member type='relation' ref='2960701' role='subarea' />
+ <member type='relation' ref='2960752' role='subarea' />
+ <member type='relation' ref='2960986' role='subarea' />
+ <member type='relation' ref='2961046' role='subarea' />
+ <member type='relation' ref='2962316' role='subarea' />
+ <member type='relation' ref='2962348' role='subarea' />
+ <member type='relation' ref='2962386' role='subarea' />
+ <member type='relation' ref='2962492' role='subarea' />
+ <member type='relation' ref='2962499' role='subarea' />
+ <member type='relation' ref='2962566' role='subarea' />
+ <member type='relation' ref='2962596' role='subarea' />
+ <member type='relation' ref='2962609' role='subarea' />
+ <member type='relation' ref='2962686' role='subarea' />
+ <tag k='admin_level' v='8' />
+ <tag k='boundary' v='administrative' />
+ <tag k='designation' v='non_metropolitan_district' />
+ <tag k='name' v='Arun' />
+ <tag k='ons_code' v='45UC' />
+ <tag k='ref:gss' v='E07000224' />
+ <tag k='ref:lau:1' v='UKJ2402' />
+ <tag k='source:ons_code' v='OS_OpenData_CodePoint Codelist.txt' />
+ <tag k='source:ref:gss' v='ONS_OpenData' />
+ <tag k='source:ref:lau:1' v='ONS_OpenData' />
+ <tag k='type' v='boundary' />
+ <tag k='website' v='http://www.arun.gov.uk/' />
+ <tag k='wikipedia' v='en:Arun' />
+ </relation>
+ <relation id='2941822' timestamp='2013-05-21T20:59:24Z' uid='30525' user='The Maarssen Mapper' visible='true' version='3' changeset='16230349'>
+ <member type='way' ref='222564385' role='outer' />
+ <member type='way' ref='222191930' role='outer' />
+ <member type='way' ref='222193410' role='outer' />
+ <member type='way' ref='222193397' role='outer' />
+ <member type='node' ref='29543181' role='admin_centre' />
+ <member type='way' ref='222191929' role='outer' />
+ <tag k='admin_level' v='10' />
+ <tag k='boundary' v='administrative' />
+ <tag k='designation' v='civil_parish' />
+ <tag k='name' v='Washington CP' />
+ <tag k='type' v='boundary' />
+ </relation>
+ <relation id='2944634' timestamp='2013-05-20T17:44:14Z' uid='30525' user='The Maarssen Mapper' visible='true' version='2' changeset='16212928'>
+ <member type='way' ref='222359029' role='outer' />
+ <member type='way' ref='208622486' role='outer' />
+ <member type='way' ref='217490241' role='outer' />
+ <member type='way' ref='222117157' role='outer' />
+ <member type='way' ref='222191931' role='outer' />
+ <member type='way' ref='222191929' role='outer' />
+ <member type='way' ref='222278402' role='outer' />
+ <member type='way' ref='222278401' role='outer' />
+ <member type='node' ref='2312625027' role='admin_centre' />
+ <tag k='admin_level' v='10' />
+ <tag k='boundary' v='administrative' />
+ <tag k='designation' v='civil_parish' />
+ <tag k='name' v='Findon CP' />
+ <tag k='type' v='boundary' />
+ </relation>
+</osm>
diff --git a/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java b/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java
index e43e9bb..b5ec1e7 100644
--- a/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java
+++ b/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java
@@ -14,7 +14,7 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.projection.Projections;
@Ignore
-public class PropertiesMergerTest extends JFrame{
+public class PropertiesMergerTest extends JFrame {
private PropertiesMerger merger;
diff --git a/test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java b/test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java
new file mode 100644
index 0000000..52a2989
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java
@@ -0,0 +1,61 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.io.IllegalDataException;
+import org.openstreetmap.josm.io.OsmReader;
+
+/**
+ * Unit tests for class {@link PurgeAction}.
+ */
+public class PurgeActionTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init(true);
+ }
+
+ /**
+ * Non-regression test for ticket #12038.
+ * @throws IOException if any I/O error occurs
+ * @throws FileNotFoundException if the data file cannot be found
+ * @throws IllegalDataException if OSM parsing fails
+ */
+ @Test
+ public void testCopyStringWayRelation() throws FileNotFoundException, IOException, IllegalDataException {
+ try (InputStream is = new FileInputStream(TestUtils.getRegressionDataFile(12038, "data.osm"))) {
+ DataSet ds = OsmReader.parseDataSet(is, null);
+ Main.map.mapView.addLayer(new OsmDataLayer(ds, null, null));
+ for (Way w : ds.getWays()) {
+ if (w.getId() == 222191929L) {
+ ds.addSelected(w);
+ }
+ }
+ new PurgeAction().actionPerformed(null);
+ for (Way w : ds.getWays()) {
+ if (w.getId() == 222191929L) {
+ assertTrue(w.isIncomplete());
+ assertEquals(0, w.getNodesCount());
+ }
+ }
+ }
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/cache/JCSCacheManagerTest.java b/test/unit/org/openstreetmap/josm/data/cache/JCSCacheManagerTest.java
new file mode 100644
index 0000000..75a225e
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/cache/JCSCacheManagerTest.java
@@ -0,0 +1,25 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.cache;
+
+import java.util.logging.Logger;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+
+public class JCSCacheManagerTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ @Test
+ public void testLoggingAdaptor12054() throws Exception {
+ JCSCacheManager.getCache("foobar", 1, 0, "foobar"); // cause logging adaptor to be initialized
+ Logger.getLogger("org.apache.commons.jcs").warning("{switch:0}");
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java b/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java
new file mode 100644
index 0000000..b89cb80
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java
@@ -0,0 +1,35 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.imagery;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+
+/**
+ *
+ * Unit tests for class {@link ImageryInfo}.
+ *
+ */
+public class ImageryInfoTest {
+
+ /**
+ * Setup tests
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Test if extended URL is returned properly
+ */
+ @Test
+ public void testGetExtendedUrl() {
+ ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null);
+ testImageryTMS.setDefaultMinZoom(16);
+ testImageryTMS.setDefaultMaxZoom(23);
+ assertEquals("tms[16,23]:http://localhost", testImageryTMS.getExtendedUrl());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/NodeTest.java b/test/unit/org/openstreetmap/josm/data/osm/NodeTest.java
new file mode 100644
index 0000000..394bf3a
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/NodeTest.java
@@ -0,0 +1,44 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.DataSource;
+import org.openstreetmap.josm.data.coor.LatLon;
+
+/**
+ * Unit tests of the {@code Node} class.
+ */
+public class NodeTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Non-regression test for ticket #12060.
+ */
+ @Test
+ public void testTicket12060() {
+ DataSet ds = new DataSet();
+ ds.dataSources.add(new DataSource(new Bounds(LatLon.ZERO), null));
+ Node n = new Node(1, 1);
+ n.setCoor(LatLon.ZERO);
+ ds.addPrimitive(n);
+ n.setCoor(null);
+ assertFalse(n.isNewOrUndeleted());
+ assertNotNull(ds.getDataSourceArea());
+ assertNull(n.getCoor());
+ assertFalse(n.isOutsideDownloadArea());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/WaySegmentTest.java b/test/unit/org/openstreetmap/josm/data/osm/WaySegmentTest.java
new file mode 100644
index 0000000..ffd6a8e
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/WaySegmentTest.java
@@ -0,0 +1,48 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import java.util.Arrays;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.coor.LatLon;
+
+public class WaySegmentTest {
+
+ @Before
+ public void setUp() throws Exception {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ @Test
+ public void testForNodePair() throws Exception {
+ final DataSet ds = new DataSet();
+ final Node n1 = new Node(new LatLon(0, 0));
+ final Node n2 = new Node(new LatLon(1, 0));
+ final Node n3 = new Node(new LatLon(2, 0));
+ final Node n4 = new Node(new LatLon(3, 0));
+ final Way w = new Way();
+ for (OsmPrimitive p : Arrays.asList(n1, n2, n3, n4, w)) {
+ ds.addPrimitive(p);
+ }
+ w.addNode(n1);
+ w.addNode(n2);
+ w.addNode(n1);
+ w.addNode(n3);
+ w.addNode(n1);
+ w.addNode(n4);
+ w.addNode(n1);
+ Assert.assertEquals(WaySegment.forNodePair(w, n1, n2).lowerIndex, 0);
+ Assert.assertEquals(WaySegment.forNodePair(w, n1, n3).lowerIndex, 2);
+ Assert.assertEquals(WaySegment.forNodePair(w, n1, n4).lowerIndex, 4);
+ Assert.assertEquals(WaySegment.forNodePair(w, n4, n1).lowerIndex, 5);
+ try {
+ Assert.assertEquals(WaySegment.forNodePair(w, n3, n4).lowerIndex, 5);
+ throw new IllegalStateException("Expecting IllegalArgumentException");
+ } catch (IllegalArgumentException expected) {
+ System.out.println("Expected exception: " + expected.getMessage());
+ }
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java
index 17acdd0..c40af50 100644
--- a/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java
@@ -2,8 +2,10 @@
package org.openstreetmap.josm.data.validation.tests;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import org.junit.BeforeClass;
@@ -11,6 +13,7 @@ import org.junit.Test;
import org.openstreetmap.josm.JOSMFixture;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.osm.Tag;
import org.openstreetmap.josm.data.validation.TestError;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
@@ -67,4 +70,20 @@ public class TagCheckerTest {
assertEquals("Presets do not contain property value", errors.get(0).getMessage());
assertEquals("Value 'forrest' for key 'landuse' not in presets.", errors.get(0).getDescription());
}
+
+ /**
+ * Checks that tags specifically ignored are effectively not in internal presets.
+ * @throws IOException if any I/O error occurs
+ */
+ @Test
+ public void testIgnoredTagsNotInPresets() throws IOException {
+ List<String> errors = new ArrayList<>();
+ new TagChecker().initialize();
+ for (Tag tag : TagChecker.getIgnoredTags()) {
+ if (TagChecker.isTagInPresets(tag.getKey(), tag.getValue())) {
+ errors.add(tag.toString());
+ }
+ }
+ assertTrue(errors.toString(), errors.isEmpty());
+ }
}
--
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