[josm] 01/06: Imported Upstream version 0.0.svn7643+dfsg1
Bas Couwenberg
sebastic at xs4all.nl
Wed Oct 22 20:49:51 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm.
commit 1c9e7eb8479be71ed5f0d5a015abef0ae3e73085
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Oct 21 22:29:19 2014 +0200
Imported Upstream version 0.0.svn7643+dfsg1
---
.classpath | 2 +-
REVISION | 8 +-
build.xml | 4 +-
data/defaultpresets.xml | 211 ++++---
data/left-right-hand-traffic.osm | 4 +-
data/mappaint-style.xsd | 1 +
data/tagging-preset.xsd | 1 +
data/validator/deprecated.mapcss | 50 +-
i18n/build.xml | 26 +-
i18n/po/af.po | 30 +-
i18n/po/am.po | 30 +-
i18n/po/ar.po | 30 +-
i18n/po/ast.po | 30 +-
i18n/po/az.po | 30 +-
i18n/po/be.po | 30 +-
i18n/po/bg.po | 30 +-
i18n/po/bn.po | 30 +-
i18n/po/br.po | 30 +-
i18n/po/bs.po | 30 +-
i18n/po/ca.po | 51 +-
i18n/po/ca at valencia.po | 30 +-
i18n/po/cs.po | 30 +-
i18n/po/cy.po | 30 +-
i18n/po/da.po | 70 +--
i18n/po/de.po | 120 ++--
i18n/po/de_DE.po | 30 +-
i18n/po/el.po | 30 +-
i18n/po/en_AU.po | 30 +-
i18n/po/en_CA.po | 30 +-
i18n/po/en_GB.po | 30 +-
i18n/po/eo.po | 30 +-
i18n/po/es.po | 30 +-
i18n/po/et.po | 74 +--
i18n/po/eu.po | 30 +-
i18n/po/fa.po | 30 +-
i18n/po/fi.po | 30 +-
i18n/po/fil.po | 30 +-
i18n/po/fr.po | 132 ++--
i18n/po/gl.po | 30 +-
i18n/po/he.po | 30 +-
i18n/po/hi.po | 30 +-
i18n/po/hr.po | 30 +-
i18n/po/ht.po | 30 +-
i18n/po/hu.po | 85 +--
i18n/po/hy.po | 30 +-
i18n/po/ia.po | 30 +-
i18n/po/id.po | 30 +-
i18n/po/is.po | 30 +-
i18n/po/it.po | 677 +++++++++++----------
i18n/po/ja.po | 30 +-
i18n/po/ka.po | 30 +-
i18n/po/km.po | 132 ++--
i18n/po/ko.po | 30 +-
i18n/po/ky.po | 30 +-
i18n/po/lo.po | 30 +-
i18n/po/lt.po | 30 +-
i18n/po/lv.po | 30 +-
i18n/po/mk.po | 30 +-
i18n/po/ms.po | 30 +-
i18n/po/nb.po | 30 +-
i18n/po/nds.po | 30 +-
i18n/po/nl.po | 30 +-
i18n/po/nn.po | 30 +-
i18n/po/oc.po | 30 +-
i18n/po/pa.po | 30 +-
i18n/po/pl.po | 30 +-
i18n/po/pt.po | 30 +-
i18n/po/pt_BR.po | 87 +--
i18n/po/rm.po | 30 +-
i18n/po/ro.po | 30 +-
i18n/po/ru.po | 48 +-
i18n/po/sk.po | 30 +-
i18n/po/sl.po | 30 +-
i18n/po/sq.po | 30 +-
i18n/po/sr.po | 30 +-
i18n/po/sv.po | 30 +-
i18n/po/ta.po | 30 +-
i18n/po/te.po | 30 +-
i18n/po/th.po | 30 +-
i18n/po/tr.po | 30 +-
i18n/po/ug.po | 30 +-
i18n/po/uk.po | 48 +-
i18n/po/ur.po | 30 +-
i18n/po/vi.po | 30 +-
i18n/po/zh_CN.po | 30 +-
i18n/po/zh_TW.po | 30 +-
images/cursor/modifier/create_note.png | Bin 0 -> 148 bytes
.../notes/note_closed.png} | Bin
images/dialogs/notes/note_comment.png | Bin 0 -> 290 bytes
.../notes/note_new.png} | Bin
.../notes/note_open.png} | Bin
images/dialogs/pin.png | Bin 0 -> 623 bytes
.../note_new_24x24.png => mapmode/addnote.png} | Bin
images/notes/note_closed_16x16.png | Bin 601 -> 0 bytes
images/notes/note_new_16x16.png | Bin 604 -> 0 bytes
images/notes/note_open_16x16.png | Bin 597 -> 0 bytes
src/org/openstreetmap/josm/Main.java | 24 +-
.../josm/actions/ReportBugAction.java | 49 ++
.../josm/actions/ShowStatusReportAction.java | 5 +-
.../actions/downloadtasks/DownloadGpsTask.java | 9 +-
.../actions/downloadtasks/DownloadNotesTask.java | 5 +-
.../actions/downloadtasks/DownloadOsmTask.java | 170 ++++--
.../josm/actions/mapmode/AddNoteAction.java | 90 +++
.../josm/actions/mapmode/ExtrudeAction.java | 3 +-
src/org/openstreetmap/josm/data/APIDataSet.java | 8 +-
src/org/openstreetmap/josm/data/osm/NoteData.java | 168 +++++
.../openstreetmap/josm/data/osm/OsmPrimitive.java | 33 +
.../data/osm/visitor/paint/StyledMapRenderer.java | 6 +
.../data/validation/tests/MapCSSTagChecker.java | 13 +-
src/org/openstreetmap/josm/gui/MainMenu.java | 5 +
src/org/openstreetmap/josm/gui/MapFrame.java | 6 +
src/org/openstreetmap/josm/gui/MapMover.java | 21 +-
.../openstreetmap/josm/gui/PleaseWaitRunnable.java | 15 +
.../conflict/tags/TagConflictResolverModel.java | 7 +-
.../josm/gui/dialogs/LayerListDialog.java | 1 -
.../openstreetmap/josm/gui/dialogs/NoteDialog.java | 356 +++++++++++
.../dialogs/relation/GenericRelationEditor.java | 9 +-
.../josm/gui/download/PlaceSelection.java | 33 +-
.../io/DownloadPrimitivesWithReferrersTask.java | 2 +-
.../openstreetmap/josm/gui/layer/NoteLayer.java | 148 ++++-
src/org/openstreetmap/josm/gui/layer/WMSLayer.java | 1 +
.../josm/gui/layer/geoimage/ImageViewerDialog.java | 8 +-
.../josm/gui/mappaint/AreaElemStyle.java | 7 +-
.../josm/gui/mappaint/BoxTextElemStyle.java | 3 +-
.../openstreetmap/josm/gui/mappaint/ElemStyle.java | 4 +-
.../josm/gui/mappaint/ElemStyles.java | 1 -
.../josm/gui/mappaint/LineElemStyle.java | 5 +-
.../josm/gui/mappaint/LineTextElemStyle.java | 3 +-
.../josm/gui/mappaint/MapPaintMenu.java | 2 +-
.../josm/gui/mappaint/NodeElemStyle.java | 3 +-
.../josm/gui/mappaint/RepeatImageElemStyle.java | 3 +-
.../josm/gui/mappaint/StyleSource.java | 3 -
.../gui/mappaint/mapcss/ExpressionFactory.java | 1 -
.../josm/gui/mappaint/xml/XmlStyleSource.java | 1 -
.../josm/gui/tagging/TaggingPreset.java | 2 +-
.../josm/gui/tagging/TaggingPresetItems.java | 18 +-
.../gui/tagging/ac/AutoCompletingComboBox.java | 58 +-
.../josm/gui/util/AdvancedKeyPressDetector.java | 29 +-
.../DisableShortcutsOnFocusGainedTextField.java | 16 +-
.../josm/gui/widgets/JosmPasswordField.java | 25 +-
.../josm/gui/widgets/JosmTextArea.java | 22 +-
.../josm/gui/widgets/JosmTextField.java | 15 +-
src/org/openstreetmap/josm/io/FileImporter.java | 9 +
src/org/openstreetmap/josm/io/NmeaReader.java | 5 +-
src/org/openstreetmap/josm/io/NoteImporter.java | 2 +-
.../josm/io/remotecontrol/DNSName.java | 4 +-
.../josm/io/remotecontrol/RemoteControl.java | 2 +-
.../josm/io/remotecontrol/RequestProcessor.java | 2 +
.../io/remotecontrol/handler/LoadDataHandler.java | 151 +++++
.../josm/plugins/PluginDownloadTask.java | 4 +-
.../plugins/ReadLocalPluginInformationTask.java | 1 -
.../openstreetmap/josm/tools/ExceptionUtil.java | 1 -
src/org/openstreetmap/josm/tools/ExifReader.java | 2 +-
.../openstreetmap/josm/tools/GeoPropertyIndex.java | 4 +-
.../openstreetmap/josm/tools/ImageProvider.java | 5 +-
.../openstreetmap/josm/tools/PlatformHookOsx.java | 48 +-
src/org/openstreetmap/josm/tools/Shortcut.java | 34 +-
styles/standard/elemstyles.mapcss | 86 ++-
taginfoextract.groovy | 57 +-
.../josm/gui/history/HistoryBrowserTest.java | 3 -
.../josm/actions/JoinAreasActionTest.java | 3 +-
.../validation/tests/MultipolygonTestTest.java | 5 +-
162 files changed, 3540 insertions(+), 2115 deletions(-)
diff --git a/.classpath b/.classpath
index ef55b70..9fb16b4 100644
--- a/.classpath
+++ b/.classpath
@@ -13,7 +13,7 @@
<classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar"/>
<classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/>
<classpathentry kind="lib" path="test/lib/jfcunit.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_67"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_72"/>
<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
<classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.jar"/>
<classpathentry kind="lib" path="test/lib/unitils-core/commons-lang-2.3.jar"/>
diff --git a/REVISION b/REVISION
index 7210ac4..12c0d0d 100644
--- a/REVISION
+++ b/REVISION
@@ -1,18 +1,18 @@
<?xml version="1.0"?>
<info>
<entry
+ kind="dir"
path="trunk"
- revision="7588"
- kind="dir">
+ revision="7643">
<url>http://josm.openstreetmap.de/svn/trunk</url>
<repository>
<root>http://josm.openstreetmap.de/svn</root>
<uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
</repository>
<commit
- revision="7588">
+ revision="7643">
<author>Don-vip</author>
-<date>2014-09-29T21:52:43.230322Z</date>
+<date>2014-10-21T19:19:16.087295Z</date>
</commit>
</entry>
</info>
diff --git a/build.xml b/build.xml
index c0900fd..aafecea 100644
--- a/build.xml
+++ b/build.xml
@@ -270,7 +270,7 @@ Build-Date: ${build.tstamp}
<include name="**/*.jar"/>
</fileset>
<pathelement path="dist/josm-custom.jar"/>
- <pathelement path="tools/groovy-all-2.3.6.jar"/>
+ <pathelement path="tools/groovy-all-2.3.7.jar"/>
</path>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
@@ -317,7 +317,7 @@ Build-Date: ${build.tstamp}
</sequential>
</macrodef>
<target name="test-compile" depends="test-init,dist">
- <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="tools/groovy-all-2.3.6.jar"/>
+ <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="tools/groovy-all-2.3.7.jar"/>
<call-groovyc testfamily="unit">
<cp-elements>
<path refid="test.classpath"/>
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index 0c03564..9672a22 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -45,7 +45,7 @@ item_separator: horizontal separator line between items (in window)
key: fixed key/value pair to be set
key: key to set
value: value to set
- match: none/key/key!/keyvalue (default is "keyvalue", see below for more information)
+ match: none/key/key!/keyvalue/keyvalue! (default is "keyvalue!", see below for more information)
text: text box
key: key to set
@@ -58,7 +58,7 @@ text: text box
auto-increment with the given stepping. auto-increment only
happens if the user selects it. default is no auto-increment;
mutually exclusive with use_last_as_default.
- match: none/key/key!/keyvalue (default is "none", see below for more information)
+ match: none/key/key!/keyvalue/keyvalue! (default is "none", see below for more information)
length: length of input box (number of characters allowed)
alternative_autocomplete_keys: comma separated list of alternative keys to use for autocompletion
@@ -82,7 +82,7 @@ combo: combo box, with multiple choices and possible to enter free form text
default: default string to display (defaults to "")
use_last_as_default: true/false/force (default is "false")
editable: allow to add other values as text (default is "true")
- match: none/key/key!/keyvalue (default is none, see below for more information)
+ match: none/key/key!/keyvalue/keyvalue! (default is none, see below for more information)
values_searchable: true/false (whether to search in combo (display_)values when searching for presets)
length: length of input box (number of characters allowed)
@@ -107,7 +107,7 @@ multiselect: list of values from which zero or more can be selected
icon_size: maximal size of icon. If tag is not setup it is taken default size of icon file
default: default string to display (defaults to "")
use_last_as_default: true/false/force (default is "false")
- match: none/key/key!/keyvalue (default is "none", see below for more information)
+ match: none/key/key!/keyvalue/keyvalue! (default is "none", see below for more information)
values_searchable: true/false (whether to search in multiselect (display_)values when searching for presets)
checkgroup: group of checks
@@ -120,7 +120,7 @@ check: checkbox
value_on: the value to set when checked (default is "yes")
value_off: the value to set when unchecked (default is "no")
disable_off: whether the off value is disabled in the dialog, i.e., only unset or yes are provided
- match: none/key/key!/keyvalue (default is "none", see below for more information)
+ match: none/key/key!/keyvalue/keyvalue! (default is "none", see below for more information)
role: type to specify possible roles in relations
key: the role name used in relation
@@ -142,6 +142,7 @@ reference: include an earlier defined template
description: what is your preset meant to be
shortdescription: very short description
link: a link to a helpful website (optional)
+ icon: an icon for the whole presets
The fields description, shortdescription and link may also be localized (e.g. de.link)
See also https://josm.openstreetmap.de/wiki/TaggingPresets wiki page.
@@ -160,7 +161,8 @@ the tags of an OSM object fit into this preset.
- none: neutral, i.e., do not consider this item for matching
- key: positive if key matches, neutral otherwise
- key!: positive if key matches, negative otherwise
- - keyvalue: positive if key and value matches, negative otherwise
+ - keyvalue: positive if key and value matches, neutral otherwise
+ - keyvalue!: positive if key and value matches, negative otherwise
Note that for a match, at least one positive and no negative is required.
-->
<!-- Item chunks -->
@@ -281,9 +283,12 @@ Note that for a match, at least one positive and no negative is required.
<text key="brand" text="Brand" />
<reference ref="oh" />
</chunk>
- <chunk id="internet_smoking_wheelchair">
+ <chunk id="internet">
<combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
<combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+ </chunk>
+ <chunk id="internet_smoking_wheelchair">
+ <reference ref="internet" />
<combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
<combo key="wheelchair" text="Wheelchairs" values="yes,no" />
</chunk>
@@ -323,6 +328,12 @@ Note that for a match, at least one positive and no negative is required.
<reference ref="payment_base" />
<check key="payment:account_cards" text="Account or loyalty cards" />
</chunk>
+ <chunk id="fee">
+ <combo key="fee" text="Fee" values="yes,no" />
+ </chunk>
+ <chunk id="fee_interval">
+ <combo key="fee" text="Fee" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
+ </chunk>
<chunk id="parking_name_type_ref">
<text key="name" text="Name" />
<combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
@@ -331,17 +342,19 @@ Note that for a match, at least one positive and no negative is required.
<chunk id="parking_access_fee_operator_surface">
<space />
<combo key="access" text="Access" values="yes,private,customers,permissive,no" />
- <combo key="fee" text="Fee" values="yes,no,interval" />
+ <reference ref="fee_interval" />
<text key="operator" text="Operator" />
<reference ref="surface" />
- <space />
</chunk>
<chunk id="maxstay">
<combo key="maxstay" text="Time Limit (minutes)" values="0,30,60,90,120,180" />
</chunk>
+ <chunk id="supervised">
+ <combo key="supervised" text="Supervised" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
+ </chunk>
<chunk id="supervised_lit_oh">
- <combo key="supervised" text="Supervised" values="yes,no,interval" />
- <combo key="lit" text="Lit" values="yes,no,interval" />
+ <reference ref="supervised" />
+ <combo key="lit" text="Lit" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
<reference ref="oh" />
</chunk>
<chunk id="general_access">
@@ -831,6 +844,7 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Key:construction"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:construction"
it.href="http://wiki.openstreetmap.org/wiki/IT:Key:construction"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:construction"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:construction"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:construction"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:construction" />
@@ -897,6 +911,7 @@ Note that for a match, at least one positive and no negative is required.
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:junction=roundabout"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:junction=roundabout"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:junction=roundabout"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:junction=roundabout"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:junction=roundabout"
ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout"
@@ -1016,6 +1031,7 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Bicycle"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Bicycle"
hr.href="http://wiki.openstreetmap.org/wiki/Hr:Bicycle"
+ hu.href="http://wiki.openstreetmap.org/wiki/Hu:Bicycle"
it.href="http://wiki.openstreetmap.org/wiki/IT:Bicycle"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Bicycle"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Bicycle"
@@ -1042,7 +1058,8 @@ Note that for a match, at least one positive and no negative is required.
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=cycleway"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=cycleway"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=cycleway"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=cycleway" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=cycleway"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=cycleway" />
<key key="highway" value="cycleway" />
<optional>
<reference ref="name_layer" />
@@ -1175,6 +1192,7 @@ Note that for a match, at least one positive and no negative is required.
<item name="Traffic Signal" icon="presets/traffic-light.png" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=traffic_signals"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=traffic_signals"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=traffic_signals"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=traffic_signals"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=traffic_signals"
@@ -1183,7 +1201,7 @@ Note that for a match, at least one positive and no negative is required.
<optional text="Optional crossing attributes:">
<combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
<combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
- <check key="supervised" text="Crossing attendant" />
+ <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
<check key="bicycle" text="Cross by bicycle" />
<check key="horse" text="Cross on horseback" />
</optional>
@@ -1211,6 +1229,7 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=mini_roundabout"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=mini_roundabout"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=mini_roundabout"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=mini_roundabout" />
<key key="highway" value="mini_roundabout" />
@@ -1231,7 +1250,7 @@ Note that for a match, at least one positive and no negative is required.
<key key="highway" value="crossing" />
<combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
<combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" />
- <check key="supervised" text="Crossing attendant" />
+ <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
<check key="bicycle" text="Cross by bicycle" />
<check key="horse" text="Cross on horseback" />
</item> <!-- Pedestrian Crossing -->
@@ -1258,6 +1277,7 @@ Note that for a match, at least one positive and no negative is required.
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=turning_circle"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=turning_circle"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=turning_circle"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=turning_circle" />
<key key="highway" value="turning_circle" />
@@ -1493,12 +1513,13 @@ Note that for a match, at least one positive and no negative is required.
<text key="width" text="Width (meters)" length="7" />
</optional>
</item> <!-- Ditch -->
- <item name="Kerb" type="way,closedway" preset_name_label="true">
+ <item name="Kerb" icon="styles/standard/vehicle/kerb.svg" type="node,way,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=kerb"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=kerb"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=kerb" />
<key key="barrier" value="kerb" />
<reference ref="optional_height" />
+ <combo key="wheelchair" text="Wheelchairs" values="no,limited,yes" />
</item> <!-- Kerb -->
<separator/> <!-- *** Access *** -->
<item name="Entrance (Barrier Opening)" icon="styles/standard/vehicle/entrance.png" type="node" preset_name_label="true">
@@ -1984,7 +2005,7 @@ Note that for a match, at least one positive and no negative is required.
<key key="natural" value="beach" />
<reference ref="name_wikipedia" />
<optional>
- <combo key="supervised" text="Supervised" values="yes,no,interval" />
+ <reference ref="supervised" />
<reference ref="oh" />
<reference ref="general_access" />
<combo key="surface" text="Surface" values="gravel,pebblestone,sand" />
@@ -2136,7 +2157,9 @@ Note that for a match, at least one positive and no negative is required.
</optional>
</item> <!-- Rail -->
<item name="Narrow Gauge Rail" icon="presets/railway.png" type="way" preset_name_label="true">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail" />
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=light_rail"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=light_rail" />
<key key="railway" value="narrow_gauge" />
<optional>
<combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
@@ -2211,7 +2234,8 @@ Note that for a match, at least one positive and no negative is required.
<separator/>
<item name="Disused Rail" icon="presets/railway.png" type="way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:railway=disused"
- de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=disused" />
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=disused"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=disused" />
<key key="railway" value="disused" />
<optional>
<reference ref="railway_service" />
@@ -2220,6 +2244,7 @@ Note that for a match, at least one positive and no negative is required.
<item name="Abandoned Rail" icon="presets/railway.png" type="way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:railway=abandoned"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=abandoned"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=abandoned"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:railway=abandoned" />
<key key="railway" value="abandoned" />
<optional>
@@ -2241,7 +2266,7 @@ Note that for a match, at least one positive and no negative is required.
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=level_crossing" />
<key key="railway" value="level_crossing" />
<optional>
- <check key="supervised" text="Supervised" />
+ <reference ref="supervised" />
<check key="crossing:light" text="Traffic lights" />
<check key="crossing:bell" text="Sound signals" />
<combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
@@ -2258,9 +2283,9 @@ Note that for a match, at least one positive and no negative is required.
<key key="railway" value="crossing" />
<optional>
<combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
+ <reference ref="supervised" />
<check key="horse" text="Cross on horseback" />
<check key="bicycle" text="Cross by bicycle" />
- <check key="supervised" text="Supervised" />
<check key="crossing:light" text="Traffic lights" />
<check key="crossing:bell" text="Sound signals" />
<combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
@@ -2314,6 +2339,7 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aerialway=cable_car"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:aerialway=cable_car"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aerialway=cable_car"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aerialway=cable_car"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aerialway=cable_car"
sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:aerialway=cable_car" />
<space />
@@ -2634,10 +2660,11 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=motorcycle_parking" />
<space />
<key key="amenity" value="motorcycle_parking" />
- <text key="name" text="Name" />
+ <reference ref="parking_name_type_ref" />
<text key="capacity" text="Capacity" />
- <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
- <combo key="fee" text="Fee" values="yes,no" />
+ <reference ref="parking_access_fee_operator_surface" />
+ <reference ref="supervised_lit_oh" />
+ <check key="covered" text="Covered (with roof)" />
</item> <!-- Parking -->
<item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"
@@ -2682,7 +2709,8 @@ Note that for a match, at least one positive and no negative is required.
<text key="capacity" text="Capacity" />
<combo key="bicycle_parking" text="Type" values="anchors,building,ground_slots,informal,lockers,rack,shed,stands,wall_loops" />
<check key="covered" text="Covered" />
- <check key="supervised" text="Supervised" />
+ <reference ref="fee_interval" />
+ <reference ref="supervised_lit_oh" />
</item> <!-- Parking -->
<item name="Bike Dealer" icon="presets/bike.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
@@ -2729,7 +2757,7 @@ Note that for a match, at least one positive and no negative is required.
<link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route" />
<space />
<key key="type" value="route" />
- <combo key="route" text="Route type" values="train,subway,monorail,tram,light_rail,bus,trolleybus,aerialway,ferry" values_searchable="true" match="keyvalue" />
+ <combo key="route" text="Route type" values="train,subway,monorail,tram,light_rail,bus,trolleybus,aerialway,ferry" values_searchable="true" match="keyvalue!" />
<key key="public_transport:version" value="2" /> <!-- only validate marked relations in order to avoid false positives -->
<reference ref="name_ref" />
<optional>
@@ -2847,6 +2875,7 @@ Note that for a match, at least one positive and no negative is required.
<link href="http://wiki.openstreetmap.org/wiki/Tag:public_transport=station"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:public_transport=station"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:public_transport=station"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:public_transport=station"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:public_transport=station"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:public_transport=station" />
<space />
@@ -2860,6 +2889,7 @@ Note that for a match, at least one positive and no negative is required.
<separator/> <!-- *** Access *** -->
<item name="Subway Entrance" icon="presets/underground.png" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=subway_entrance"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=subway_entrance"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=subway_entrance" />
@@ -2888,7 +2918,7 @@ Note that for a match, at least one positive and no negative is required.
<group name="Public Transport (Legacy)" icon="presets/bus.png">
<item name="Public transport route (Legacy)" icon="presets/path.png" type="relation" preset_name_label="true">
<key key="type" value="route" />
- <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" values_searchable="true" match="keyvalue" />
+ <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" values_searchable="true" match="keyvalue!" />
<key key="public_transport:version" value="1" /> <!-- only validate marked relations in order to avoid false positives -->
<reference ref="name_ref" />
<optional>
@@ -3025,7 +3055,7 @@ Note that for a match, at least one positive and no negative is required.
</optional>
</item> <!-- Airport Ground -->
<separator/>
- <item name="Runway" icon="presets/runway.png" type="way" preset_name_label="true">
+ <item name="Runway" icon="presets/runway.png" type="way,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aeroway=runway"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aeroway=runway"
@@ -3036,7 +3066,7 @@ Note that for a match, at least one positive and no negative is required.
<text key="ref" text="Reference" />
</optional>
</item> <!-- Runway -->
- <item name="Taxiway" icon="presets/taxiway.png" type="way" preset_name_label="true">
+ <item name="Taxiway" icon="presets/taxiway.png" type="way,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aeroway=taxiway"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=taxiway"
@@ -3093,8 +3123,7 @@ Note that for a match, at least one positive and no negative is required.
<space />
<key key="aeroway" value="terminal" />
<text key="name" text="Name" />
- <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
- <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+ <reference ref="internet" />
<reference ref="link_contact" />
</item> <!-- Terminal -->
<item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node" preset_name_label="true">
@@ -3221,7 +3250,7 @@ Note that for a match, at least one positive and no negative is required.
<reference ref="internet_smoking_wheelchair" />
<space />
<text key="capacity" text="Number of places" />
- <combo key="fee" text="Requires a fee" values="yes,no,interval" />
+ <reference ref="fee_interval" />
<check key="power_supply" text="Power supply" />
<check key="tents" text="Tents allowed" />
<space />
@@ -3434,8 +3463,7 @@ Note that for a match, at least one positive and no negative is required.
<key key="tourism" value="information" />
<key key="information" value="office" />
<reference ref="name_oh" />
- <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
- <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+ <reference ref="internet" />
<reference ref="link_contact" />
</item> <!-- Information Office -->
<item name="Map" icon="presets/map.png" type="node" preset_name_label="true">
@@ -3513,9 +3541,8 @@ Note that for a match, at least one positive and no negative is required.
<reference ref="name_operator" />
<text key="description" text="Closer description" />
<text key="ref" text="Reference number" />
- <combo key="fee" text="Fee" values="yes,no" />
- <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
- <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+ <reference ref="fee" />
+ <reference ref="internet" />
</item> <!-- Information Terminal -->
<item name="Audio Guide" icon="presets/information.png" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Key:information"
@@ -3531,7 +3558,7 @@ Note that for a match, at least one positive and no negative is required.
<reference ref="name_operator" />
<text key="description" text="Closer description" />
<text key="ref" text="Reference number" />
- <combo key="fee" text="Fee" values="yes,no" />
+ <reference ref="fee" />
<space />
<label text="Audioguide via mobile phone?" />
<text key="phone" text="Phone number" />
@@ -3639,7 +3666,7 @@ Note that for a match, at least one positive and no negative is required.
<space />
<key key="leisure" value="horse_riding" />
<reference ref="name_operator_oh" />
- <text key="fee" text="Fee" />
+ <reference ref="fee" />
<space />
<reference ref="contact" />
</item> <!-- Horse Riding -->
@@ -3700,6 +3727,14 @@ Note that for a match, at least one positive and no negative is required.
<combo key="fuel" text="Fuel" text_context="grill" values="charcoal,electric,wood" />
<check key="covered" text="Covered" />
</item> <!-- Public Grill -->
+ <item name="Firepit" icon="styles/standard/leisure/firepit.svg" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=firepit"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=firepit"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:leisure=firepit" />
+ <space />
+ <key key="leisure" value="firepit" />
+ <text key="name" text="Name" />
+ </item> <!-- Firepit -->
<item name="Fishing" icon="presets/fishing.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=fishing"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=fishing"
@@ -3779,6 +3814,7 @@ Note that for a match, at least one positive and no negative is required.
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=artwork"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=artwork"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:tourism=artwork"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=artwork"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=artwork"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=artwork"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=artwork" />
@@ -3952,7 +3988,7 @@ Note that for a match, at least one positive and no negative is required.
<space />
<key key="amenity" value="place_of_worship" />
<text key="name" text="Name" />
- <combo key="religion" text="Religion" values="bahai,jain,sikh,spiritualist,taoist,unitarian,zoroastrian" match="keyvalue" values_searchable="true" />
+ <combo key="religion" text="Religion" values="bahai,jain,sikh,spiritualist,taoist,unitarian,zoroastrian" match="keyvalue!" values_searchable="true" />
<reference ref="service_times" />
<reference ref="oh" />
</item> <!-- Other Place of Worship -->
@@ -3990,8 +4026,7 @@ Note that for a match, at least one positive and no negative is required.
<label text="Community Centre" />
<space />
<key key="amenity" value="community_centre" />
- <reference ref="name_operator" />
- <reference ref="oh" />
+ <reference ref="name_operator_oh" />
</item> <!-- Community Centre -->
<item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy"
@@ -4027,7 +4062,7 @@ Note that for a match, at least one positive and no negative is required.
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=prison" />
<space />
<key key="amenity" value="prison" />
- <text key="name" text="Name" />
+ <reference ref="name_operator" />
<reference ref="link_contact" />
</item> <!-- Prison -->
<item name="Police" icon="styles/standard/service/police.png" type="node,closedway,relation" preset_name_label="true">
@@ -4070,7 +4105,7 @@ Note that for a match, at least one positive and no negative is required.
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=post_office" />
<space />
<key key="amenity" value="post_office" />
- <reference ref="name_operator" />
+ <reference ref="name_operator_oh" />
</item> <!-- Post Office -->
</group> <!-- Public Buildings -->
<group name="Education" icon="presets/school.png">
@@ -4084,7 +4119,7 @@ Note that for a match, at least one positive and no negative is required.
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=kindergarten" />
<space />
<key key="amenity" value="kindergarten" />
- <text key="name" text="Name" />
+ <reference ref="name_operator_oh" />
<reference ref="link_contact" />
</item> <!-- Kindergarten -->
<item name="School" icon="presets/school.png" type="node,closedway,relation" preset_name_label="true">
@@ -4100,7 +4135,7 @@ Note that for a match, at least one positive and no negative is required.
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=school" />
<space />
<key key="amenity" value="school" />
- <text key="name" text="Name" />
+ <reference ref="name_operator_oh" />
<reference ref="link_contact" />
</item> <!-- School -->
<item name="University" icon="styles/standard/education/university.png" type="node,closedway,relation" preset_name_label="true">
@@ -4115,7 +4150,7 @@ Note that for a match, at least one positive and no negative is required.
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=university" />
<space />
<key key="amenity" value="university" />
- <text key="name" text="Name" />
+ <reference ref="name_operator" />
<reference ref="link_contact" />
</item> <!-- University -->
<item name="College" icon="styles/standard/education/college.png" type="node,closedway,relation" preset_name_label="true">
@@ -4127,7 +4162,7 @@ Note that for a match, at least one positive and no negative is required.
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=college" />
<space />
<key key="amenity" value="college" />
- <text key="name" text="Name" />
+ <reference ref="name_operator" />
<reference ref="link_contact" />
</item> <!-- College -->
<item name="Driving School" icon="styles/standard/education/driving_school.png" type="node,closedway" preset_name_label="true">
@@ -4136,7 +4171,7 @@ Note that for a match, at least one positive and no negative is required.
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=driving_school" />
<space />
<key key="amenity" value="driving_school" />
- <reference ref="name_operator" />
+ <reference ref="name_operator_oh" />
<combo key="license_classes" text="License Classes" values="A;A1;B;BE;C,A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E" />
<reference ref="link_contact" />
</item> <!-- Driving School -->
@@ -4161,7 +4196,7 @@ Note that for a match, at least one positive and no negative is required.
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=clinic" />
<space />
<key key="amenity" value="clinic" />
- <text key="name" text="Name" />
+ <reference ref="name_operator" />
<reference ref="link_contact" />
</item> <!-- Clinic -->
<item name="Doctor's Office" icon="styles/standard/health/doctor.png" type="node,closedway" preset_name_label="true">
@@ -4304,12 +4339,26 @@ Note that for a match, at least one positive and no negative is required.
<combo key="toilets:disposal" text="Type" values="flush,pitlatrine,chemical,bucket" />
<optional>
<text key="description" text="Description" />
- <combo key="fee" text="Fee" values="yes,no" />
+ <reference ref="fee" />
<text key="operator" text="Operator" />
<combo key="toilets:position" text="Usage Position" values="seated,seated;urinal,squat,urinal" />
<combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
</optional>
</item> <!-- Toilets/Restrooms -->
+ <item name="Shower" icon="styles/standard/service/shower.svg" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=shower"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=shower" />
+ <space />
+ <key key="amenity" value="shower" />
+ <combo key="access" text="Access rights" values="public,permissive,customers" />
+ <optional>
+ <text key="description" text="Description" />
+ <combo key="fee" text="Fee" values="yes,no" />
+ <text key="operator" text="Operator" />
+ <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
+ <reference ref="oh" />
+ </optional>
+ </item> <!-- Shower -->
<item name="Post Box" icon="styles/standard/service/post_box.png" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=post_box"
@@ -4354,8 +4403,7 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:internet_access"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:internet_access" />
<space />
- <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" match="key" />
- <combo key="internet_access:fee" text="Internet access fee" values="yes,no" match="key" />
+ <reference ref="internet" />
</item> <!-- Internet Access -->
<item name="Automated Defibrillator" icon="presets/aed.svg" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=defibrillator"
@@ -4713,6 +4761,14 @@ Note that for a match, at least one positive and no negative is required.
<text key="name" text="Name" />
<combo key="leisure" text="Type" values="sports_centre,stadium,swimming_pool,water_park" default="swimming_pool" values_searchable="true" />
</item> <!-- Swimming -->
+ <item name="Scuba Diving" icon="styles/standard/sport/scuba_diving.svg" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=scuba_diving"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=scuba_diving"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:sport=scuba_diving" />
+ <space />
+ <key key="sport" value="scuba_diving" />
+ <text key="name" text="Name" />
+ </item> <!-- Scuba Diving -->
<item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Piste_Maps"
@@ -4968,7 +5024,7 @@ Note that for a match, at least one positive and no negative is required.
<text key="name" text="Name" />
<combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
</item> <!-- RC Car -->
- <item name="Raceway" type="closedway" preset_name_label="true">
+ <item name="Raceway" icon="styles/standard/sport/raceway.svg" type="closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=raceway"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=raceway"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=raceway"
@@ -4997,7 +5053,7 @@ Note that for a match, at least one positive and no negative is required.
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,farm,transportation,greenhouse,office,university,hospital,warehouse,retail,shed,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,farm,transportation,greenhouse,office,university,hospital,warehouse,retail,shed,cowshed,construction" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
<text key="name" text="Name" />
</item> <!-- Building -->
<item name="Residential Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,relation" preset_name_label="true">
@@ -5015,7 +5071,7 @@ Note that for a match, at least one positive and no negative is required.
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="residential,apartments,house,hut,dormitory,terrace,detached,roof" default="residential" match="keyvalue" values_context="building" values_searchable="true" />
+ <combo key="building" text="Building" values="residential,apartments,house,hut,dormitory,terrace,detached,roof" default="residential" match="keyvalue!" values_context="building" values_searchable="true" />
<text key="name" text="Name" />
</item> <!-- Residential Building -->
<item name="Entrance" icon="styles/standard/misc/entrance-yes.png" type="node" preset_name_label="true">
@@ -5197,7 +5253,7 @@ Note that for a match, at least one positive and no negative is required.
<key key="man_made" value="watermill" />
<text key="name" text="Name" />
</item> <!-- Watermill -->
- <item name="Fountain" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
+ <item name="Fountain" icon="styles/standard/misc/fountain.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fountain"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain"
@@ -5289,7 +5345,8 @@ Note that for a match, at least one positive and no negative is required.
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=survey_point"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=survey_point"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=survey_point" />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=survey_point"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=survey_point" />
<space />
<key key="man_made" value="survey_point" />
<text key="name" text="Name" />
@@ -5337,7 +5394,7 @@ Note that for a match, at least one positive and no negative is required.
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:bridge"
zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Key:bridge" />
<space />
- <combo key="bridge" text="Bridge" values="yes,aqueduct,boardwalk,cantilever,covered,low_water_crossing,trestle,viaduct" match="keyvalue" default="yes" />
+ <combo key="bridge" text="Bridge" values="yes,aqueduct,boardwalk,cantilever,covered,low_water_crossing,trestle,viaduct" match="keyvalue!" default="yes" />
<combo key="bridge:structure" text="Structure" values="arch,beam,truss,floating,suspension,cable-stayed,simple-suspension,humpback" match="key" />
<reference ref="optional_bridge" />
</item> <!-- Bridge -->
@@ -5708,7 +5765,7 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=line"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=line" />
<space />
- <combo key="power" text="Line type" values="line,minor_line" default="line" match="keyvalue" />
+ <combo key="power" text="Line type" values="line,minor_line" default="line" match="keyvalue!" />
<reference ref="voltage_frequency" />
<reference ref="ref_operator_branch" />
<optional>
@@ -5954,7 +6011,8 @@ Note that for a match, at least one positive and no negative is required.
<reference ref="link_contact" />
</item> <!-- Candy Store -->
<item name="Tea" icon="styles/standard/shop/groceries/tea.svg" type="node,closedway" preset_name_label="true">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tea" />
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tea"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=tea" />
<space />
<key key="shop" value="tea" />
<reference ref="name_oh" />
@@ -6352,6 +6410,15 @@ Note that for a match, at least one positive and no negative is required.
<reference ref="name_oh" />
<reference ref="link_contact" />
</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"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=antiques"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:shop=antiques" />
+ <space />
+ <key key="shop" value="antiques" />
+ <reference ref="name_oh" />
+ <reference ref="link_contact" />
+ </item> <!-- Antiques -->
</group> <!-- Home decoration -->
<group name="Printed Material" icon="presets/stationery.png">
<item name="Stationery" icon="presets/stationery.png" type="node,closedway" preset_name_label="true">
@@ -6447,6 +6514,7 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hairdresser"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=hairdresser"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=hairdresser"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=hairdresser"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hairdresser"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=hairdresser" />
<space />
@@ -6458,6 +6526,7 @@ Note that for a match, at least one positive and no negative is required.
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beauty"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=beauty"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=beauty"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=beauty"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=beauty"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=beauty" />
<space />
@@ -6476,6 +6545,7 @@ Note that for a match, at least one positive and no negative is required.
</item> <!-- Optician -->
<item name="Jewellery" icon="styles/standard/shop/jewelry.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
+ pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=jewelry"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=jewelry"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=jewelry" />
<space />
@@ -6614,7 +6684,8 @@ Note that for a match, at least one positive and no negative is required.
</item> <!-- Bookmaker -->
<item name="Lottery" icon="presets/lottery.svg" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=lottery"
- es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=lottery" />
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=lottery"
+ pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=lottery" />
<space />
<key key="shop" value="lottery" />
<reference ref="name_operator_oh" />
@@ -6914,7 +6985,7 @@ Note that for a match, at least one positive and no negative is required.
<reference ref="name_wikipedia" />
<reference ref="oh" />
<reference ref="general_access" />
- <combo key="fee" text="Fee" values="yes,no" />
+ <reference ref="fee" />
</item> <!-- Cave Entrance -->
<separator/>
<item name="Island" icon="presets/island.png" type="node,closedway" preset_name_label="true">
@@ -6929,6 +7000,7 @@ Note that for a match, at least one positive and no negative is required.
</item> <!-- Island -->
<item name="Islet" icon="presets/islet.png" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=islet"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=islet"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=islet"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=islet" />
@@ -7599,7 +7671,8 @@ Note that for a match, at least one positive and no negative is required.
it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:multipolygon"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:multipolygon"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:multipolygon"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:multipolygon" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:multipolygon"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Relation:multipolygon" />
<key key="type" value="multipolygon" />
<optional>
<text key="name" text="Name" />
@@ -7616,7 +7689,8 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:boundary"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:boundary"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:boundary" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:boundary"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Relation:boundary" />
<space />
<key key="type" value="boundary" />
<text key="name" text="Name" />
@@ -7701,7 +7775,7 @@ Note that for a match, at least one positive and no negative is required.
<space/>
<key key="type" value="route"/>
<key key="route" value="bicycle"/>
- <combo key="network" text="Network" values="icn,ncn,rcn,lcn" match="keyvalue" />
+ <combo key="network" text="Network" values="icn,ncn,rcn,lcn" match="keyvalue!" />
<reference ref="name_ref_operator"/>
<optional>
<reference ref="route_hikebike_optionals" />
@@ -7741,7 +7815,7 @@ Note that for a match, at least one positive and no negative is required.
<space/>
<key key="type" value="route"/>
<key key="route" value="hiking"/>
- <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" match="keyvalue" />
+ <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" match="keyvalue!" />
<reference ref="name_ref_operator"/>
<optional>
<reference ref="route_hikebike_optionals" />
@@ -7758,7 +7832,7 @@ Note that for a match, at least one positive and no negative is required.
<space/>
<key key="type" value="route"/>
<key key="route" value="piste"/>
- <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" match="keyvalue" />
+ <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" match="keyvalue!" />
<reference ref="name_ref_operator"/>
<optional>
<reference ref="route_hikebike_optionals" />
@@ -7779,7 +7853,7 @@ Note that for a match, at least one positive and no negative is required.
<space/>
<key key="type" value="route"/>
<key key="route" value="piste"/>
- <combo key="piste:type" text="Piste type" values="nordic,alpine" match="keyvalue" />
+ <combo key="piste:type" text="Piste type" values="nordic,alpine" match="keyvalue!" />
<reference ref="name_ref_operator"/>
<optional>
<reference ref="route_hikebike_optionals" />
@@ -7824,6 +7898,7 @@ Note that for a match, at least one positive and no negative is required.
<item name="Railway Route" icon="presets/path.png" type="relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:route=railway"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=railway"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:route=railway"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:route=railway"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:route=railway" />
<space/>
diff --git a/data/left-right-hand-traffic.osm b/data/left-right-hand-traffic.osm
index 4c3ee00..1e24fa9 100644
--- a/data/left-right-hand-traffic.osm
+++ b/data/left-right-hand-traffic.osm
@@ -151,8 +151,8 @@
<node id='-764' lat='63.1290' lon='2.4035'/>
<node id='-762' lat='57.6493' lon='-16.5155'/>
<node id='-760' lat='49.4527' lon='-19.3755'/>
-<node id='-758' lat='49.3378' lon='-2.2576'/>
-<node id='-756' lat='49.9785' lon='-1.9319'/>
+<node id='-758' lat='49.1018' lon='-1.9463'/>
+<node id='-756' lat='49.9266' lon='-2.0292'/>
<node id='-754' lat='22.2160' lon='113.6160'/>
<node id='-752' lat='22.1200' lon='113.6329'/>
<node id='-750' lat='11.6458' lon='102.9135'/>
diff --git a/data/mappaint-style.xsd b/data/mappaint-style.xsd
index 7859091..7a97f74 100644
--- a/data/mappaint-style.xsd
+++ b/data/mappaint-style.xsd
@@ -21,6 +21,7 @@
<attribute name="shortdescription" type="string" />
<attribute name="description" type="string" />
<attribute name="link" type="string"/>
+ <attribute name="icon" type="string"/>
<anyAttribute processContents="skip"/>
</complexType>
diff --git a/data/tagging-preset.xsd b/data/tagging-preset.xsd
index b8739ff..90a8b20 100644
--- a/data/tagging-preset.xsd
+++ b/data/tagging-preset.xsd
@@ -292,6 +292,7 @@
<enumeration value="key" />
<enumeration value="key!" />
<enumeration value="keyvalue" />
+ <enumeration value="keyvalue!" />
</restriction>
</simpleType>
diff --git a/data/validator/deprecated.mapcss b/data/validator/deprecated.mapcss
index 35ce581..22a2819 100644
--- a/data/validator/deprecated.mapcss
+++ b/data/validator/deprecated.mapcss
@@ -81,13 +81,33 @@
suggestAlternative: "generator:output";
}
+*[shop=antique] {
+ throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+ fixAdd: "shop=antiques";
+}
+
+*[shop=bags] {
+ throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+ fixAdd: "shop=bag";
+}
+
*[shop=organic] {
/* from http://wiki.openstreetmap.org/wiki/Tag:shop=organic */
throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
fixAdd: "shop=supermarket";
fixAdd: "organic=only";
}
-
+
+*[shop=pets] {
+ throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+ fixAdd: "shop=pet";
+}
+
+*[shop=pharmacy] {
+ throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+ fixChangeKey: "shop => amenity";
+}
+
*[bicycle_parking=sheffield] {
/* from http://wiki.openstreetmap.org/wiki/Key:bicycle_parking */
throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
@@ -280,3 +300,31 @@
fixAdd: "bridge=yes";
fixAdd: "bridge:structure=suspension";
}
+
+/* See #10530 - Incorrect tag proposed in internal preset for years */
+*[fee=interval],
+*[lit=interval],
+*[supervised=interval] {
+ throwWarning: tr("{0} is deprecated. Please specify ìnterval by using opening_hours syntax", "{0.tag}");
+}
+
+/* See #10582 - JOSM supported this tag as "don't upload this" feature, before the introduction of upload flag at layer level */
+*[/josm\/ignore/] {
+ throwError: tr("{0} is deprecated. Please delete this object and use a private layer instead", "{0.key}");
+ fixDeleteObject: this;
+}
+
+/* see #8281 */
+*[sport=diving] {
+ throwWarning: tr("{0} is deprecated", "{0.tag}");
+ suggestAlternative: "sport=scuba_diving";
+ suggestAlternative: "sport=cliff_diving";
+}
+
+/* see #8281 */
+*[parking=park_and_ride] {
+ throwWarning: tr("{0} is deprecated", "{0.tag}");
+ fixRemove: "parking";
+ fixAdd: "amenity=parking";
+ fixAdd: "park_ride=yes";
+}
\ No newline at end of file
diff --git a/i18n/build.xml b/i18n/build.xml
index 0d92ebe..8f82fd4 100644
--- a/i18n/build.xml
+++ b/i18n/build.xml
@@ -30,16 +30,16 @@
<!--<exec executable="perl" output="${i18n.build.dir}/trans_style.java">
<arg line="convstyle.pl ${josm.style}"/>
</exec>-->
- <exec executable="perl" output="${i18n.build.dir}/trans_validator.java">
+ <exec executable="perl" failonerror="true" output="${i18n.build.dir}/trans_validator.java">
<arg line="convvalidator.pl ${validator.tagfile}"/>
</exec>
- <exec executable="perl" output="${i18n.build.dir}/trans_wms.java">
+ <exec executable="perl" failonerror="true" output="${i18n.build.dir}/trans_wms.java">
<arg line="convwms.pl ${wms.srcfile}"/>
</exec>
- <exec executable="perl" output="${i18n.build.dir}/trans_surveyor.java">
+ <exec executable="perl" failonerror="true" output="${i18n.build.dir}/trans_surveyor.java">
<arg line="convsurveyor.pl ${surveyor.srcfile}"/>
</exec>
- <exec executable="perl" output="${i18n.build.dir}/trans_plugins.java">
+ <exec executable="perl" failonerror="true" output="${i18n.build.dir}/trans_plugins.java">
<arg line="convplugins.pl ${plugin.dir}/*/build.xml"/>
</exec>
<copy file="specialmessages.java" todir="${i18n.build.dir}"/>
@@ -69,7 +69,7 @@
<fileset dir="${josm.build.dir}/data/validator" includes="*.mapcss"/>
<fileset dir="${josm.build.dir}/styles/standard" includes="*.mapcss"/>
</gettext-extract>
- <exec executable="msgcomm" output="po/data.pot">
+ <exec executable="msgcomm" failonerror="true" output="po/data.pot">
<arg line="--unique po/core.pot ${i18n.build.dir}/core.2.pot ${i18n.build.dir}/data.raw.pot"/>
</exec>
</target>
@@ -77,7 +77,7 @@
<gettext-extract keysFile="plugins.raw.pot" poDirectory="${i18n.build.dir}" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
<fileset dir="${plugin.dir}" includes="**/*.java"/>
</gettext-extract>
- <exec executable="msgcomm" output="po/plugins.pot">
+ <exec executable="msgcomm" failonerror="true" output="po/plugins.pot">
<arg line="--unique po/core.pot ${i18n.build.dir}/core.2.pot ${i18n.build.dir}/plugins.raw.pot"/>
</exec>
</target>
@@ -86,7 +86,7 @@
<antcall target="coretrans"/>
<foreach param="path" target="plugintrans">
<path>
- <dirset dir="${plugin.dir}" includes="*"/>
+ <dirset dir="${plugin.dir}" includes="*" excludes="00_*" />
</path>
</foreach>
</target>
@@ -111,14 +111,14 @@
<fileset dir="po"/>
</copy>
<gettext-merge keysFile="josm.pot" poDirectory="${po.build.dir}/core"/>
- <exec executable="perl">
+ <exec executable="perl" failonerror="true">
<arg line="i18n.pl ${i18n.install.dir}/ ${po.build.dir}/core/*.po"/>
</exec>
</target>
<target name="plugintrans" depends="init">
<basename file="${path}" property="dir"/>
<mkdir dir="${po.build.dir}/plugin_${dir}"/>
- <exec executable="perl" output="${po.build.dir}/plugin_${dir}/trans_plugin.java">
+ <exec executable="perl" failonerror="true" output="${po.build.dir}/plugin_${dir}/trans_plugin.java">
<arg line="convplugins.pl ${plugin.dir}/${dir}/build.xml"/>
</exec>
<gettext-extract keysFile="josm.pot" poDirectory="${po.build.dir}/plugin_${dir}" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
@@ -132,7 +132,7 @@
<fileset dir="po"/>
</copy>
<gettext-merge keysFile="josm.pot" poDirectory="${po.build.dir}/plugin_${dir}"/>
- <exec executable="perl">
+ <exec executable="perl" failonerror="true">
<arg line="i18n.pl ${plugin.dir}/${dir}/data/ ${po.build.dir}/plugin_${dir}/*.po"/>
</exec>
</then>
@@ -151,20 +151,20 @@
</target>
<target name="test">
<mkdir dir="${i18n.build.dir}/test"/>
- <exec executable="perl">
+ <exec executable="perl" failonerror="true">
<arg line="i18n.pl ${i18n.build.dir}/test/ po/*.po"/>
</exec>
</target>
<target name="pot" depends="po/josm.pot" />
<target name="transifex" depends="po/core.pot,po/plugins.pot,po/data.pot" />
<target name="update">
- <exec executable="perl">
+ <exec executable="perl" failonerror="true">
<arg line="launchpad.pl bzronly"/>
</exec>
<antcall target="build"/>
</target>
<target name="updatecore">
- <exec executable="perl">
+ <exec executable="perl" failonerror="true">
<arg line="launchpad.pl bzronly"/>
</exec>
<antcall target="buildcore"/>
diff --git a/i18n/po/af.po b/i18n/po/af.po
index 035327c..97aea92 100644
--- a/i18n/po/af.po
+++ b/i18n/po/af.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2011-10-13 02:39+0000\n"
"Last-Translator: Grant Slater <Unknown>\n"
"Language-Team: Afrikaans <af at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:31+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:31+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: af\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/am.po b/i18n/po/am.po
index 3bc9c8c..eeba648 100644
--- a/i18n/po/am.po
+++ b/i18n/po/am.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2010-03-30 12:09+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Amharic <am at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:33+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:33+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: am\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/ar.po b/i18n/po/ar.po
index 33f0521..f43198a 100644
--- a/i18n/po/ar.po
+++ b/i18n/po/ar.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2013-03-30 14:17+0000\n"
"Last-Translator: Chdoula <chdoula at gmail.com>\n"
"Language-Team: Arabic <ar at li.org>\n"
@@ -11,8 +11,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:33+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:34+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: ar\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12590,6 +12590,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14206,6 +14212,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17727,6 +17736,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22248,15 +22260,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26344,9 +26347,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/ast.po b/i18n/po/ast.po
index ec3a407..e7635e4 100644
--- a/i18n/po/ast.po
+++ b/i18n/po/ast.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-10-04 23:51+0000\n"
"Last-Translator: edrux <Unknown>\n"
"Language-Team: Asturian <ast at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:35+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:36+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: ast\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -13925,6 +13925,12 @@ msgstr "Les llonxitúes tienen de tar ente {0} y {1}"
msgid "The minima must be less than the maxima"
msgstr "Los mínimos tien de ser inferior a los máximos"
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -15910,6 +15916,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Complementu pa roblar dixitalmente datos OSM"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -19476,6 +19485,9 @@ msgstr "piscina"
msgid "water_park"
msgstr "parque acuáticu"
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Tipu de pista d'esquí"
@@ -24188,15 +24200,6 @@ msgstr "Escueya una área (por casu, construcción) d'una imaxe subxacente."
msgid "Area Selector"
msgstr "Selector d'Área"
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr "Área creada"
@@ -28587,9 +28590,6 @@ msgstr ""
msgid "Save SDS file"
msgstr "Grabar arquivu SDS"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Non pudo faese copia de seguridá. La esceición ye: {0}"
-
msgid "Simplify Area"
msgstr "Simplificar área"
diff --git a/i18n/po/az.po b/i18n/po/az.po
index a2642ba..568c9eb 100644
--- a/i18n/po/az.po
+++ b/i18n/po/az.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2013-01-12 17:56+0000\n"
"Last-Translator: iAZISS <iss-sash at mail.ru>\n"
"Language-Team: Azerbaijani <az at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:36+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:37+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -12549,6 +12549,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14165,6 +14171,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17686,6 +17695,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22207,15 +22219,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26303,9 +26306,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/be.po b/i18n/po/be.po
index 31c0d44..a0c03fb 100644
--- a/i18n/po/be.po
+++ b/i18n/po/be.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2013-07-08 12:07+0000\n"
"Last-Translator: Andrew West <2thewest at gmail.com>\n"
"Language-Team: Belarusian <i18n at mova.org>\n"
@@ -11,8 +11,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:38+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:39+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: be\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12730,6 +12730,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14346,6 +14352,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17867,6 +17876,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22388,15 +22400,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26488,9 +26491,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/bg.po b/i18n/po/bg.po
index adaae77..5e3aae6 100644
--- a/i18n/po/bg.po
+++ b/i18n/po/bg.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-03-09 08:52+0000\n"
"Last-Translator: pl71 <Unknown>\n"
"Language-Team: Bulgarian <bg at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:41+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:42+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: bg\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12790,6 +12790,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14436,6 +14442,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17957,6 +17966,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Тип писта"
@@ -22480,15 +22492,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26624,9 +26627,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/bn.po b/i18n/po/bn.po
index f461eb8..632d515 100644
--- a/i18n/po/bn.po
+++ b/i18n/po/bn.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2013-06-13 16:28+0000\n"
"Last-Translator: Md Alamgir <alamgircu at hotmail.com>\n"
"Language-Team: Bengali <bn at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:38+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:39+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: bn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12553,6 +12553,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14169,6 +14175,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17690,6 +17699,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22211,15 +22223,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26307,9 +26310,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/br.po b/i18n/po/br.po
index b0f5ab5..7494629 100644
--- a/i18n/po/br.po
+++ b/i18n/po/br.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2011-10-17 12:11+0000\n"
"Last-Translator: Fulup <Unknown>\n"
"Language-Team: Breton <br at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:40+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:41+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: br\n"
msgid "License"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/bs.po b/i18n/po/bs.po
index eca0ca9..14a6d5a 100644
--- a/i18n/po/bs.po
+++ b/i18n/po/bs.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2012-11-03 23:07+0000\n"
"Last-Translator: Alen Mahovic <eyeofthestorm at windowslive.com>\n"
"Language-Team: Bosnian <bs at li.org>\n"
@@ -11,8 +11,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:39+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:40+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: bs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12553,6 +12553,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14169,6 +14175,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17690,6 +17699,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22211,15 +22223,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26307,9 +26310,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/ca.po b/i18n/po/ca.po
index ad3611b..50ebb27 100644
--- a/i18n/po/ca.po
+++ b/i18n/po/ca.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
-"PO-Revision-Date: 2014-10-15 06:57+0000\n"
-"Last-Translator: pitort <pitort at eclipso.eu>\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"PO-Revision-Date: 2014-10-20 18:29+0000\n"
+"Last-Translator: Don-vip <Unknown>\n"
"Language-Team: el_libre - - www.catmidia.cat\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:42+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:43+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: ca\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1224,7 +1224,7 @@ msgid "Report bug"
msgstr "Informa d''un error"
msgid "Report a ticket to JOSM bugtracker"
-msgstr ""
+msgstr "Informa d''un problema al sistema de de seguiment d''errors de JOSM"
msgid "Restart"
msgstr "Reinicia"
@@ -8186,13 +8186,14 @@ msgid "Querying name server ..."
msgstr "Consultant el servidor de noms..."
msgid "Error occured with query ''{0}'': ''{1}''"
-msgstr ""
+msgstr "Ha hagut un error en executar la consulta ''{0}'': ''{1}''"
msgid "Name server returned invalid data. Please try again."
msgstr ""
+"El servidor ha retornat dades no vàlides. Si us plau proveu un altre cop."
msgid "Bad response"
-msgstr ""
+msgstr "Resposta dolenta"
msgid "Type"
msgstr "Tipus"
@@ -14024,6 +14025,12 @@ msgstr "Les longituds han d''estar entre {0} i {1}"
msgid "The minima must be less than the maxima"
msgstr "El mínim ha de ser més petit que el màxim"
+msgid "Remote Control has been asked to load the following data:"
+msgstr "Hom ha demanat al cotnrol remot de carregar les dades següents:"
+
+msgid "Loading data"
+msgstr "Carregant dades"
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -16015,6 +16022,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Connector per signar digitalment dades OSM"
+msgid "${plugin.description}"
+msgstr "${plugin.description}"
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -19576,6 +19586,9 @@ msgstr "piscina"
msgid "water_park"
msgstr "parc_aquàtic"
+msgid "Scuba Diving"
+msgstr "Submarinisme"
+
msgid "Piste type"
msgstr "Tipus de pistes"
@@ -22587,16 +22600,16 @@ msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lituània)"
msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
+msgstr "Luxemburg Inspire Orto 2010"
msgid "Luxembourg Inspire Ortho 2013"
-msgstr ""
+msgstr "Luxemburg Inspire Orto 2013"
msgid "Luxembourg Inspire Railway"
-msgstr ""
+msgstr "Luxemburg Inspire Ferrocarrils"
msgid "Luxembourg Inspire Roads"
-msgstr ""
+msgstr "Luxemburg Inspire Carreteres"
msgid "Niger Delta Oct 2012 Landsat"
msgstr "Delta del Níger Oct 2012 Landsat"
@@ -24278,15 +24291,6 @@ msgstr "Seleccioneu un àrea (p.ex. un edifici) sobre una imatge subjacent."
msgid "Area Selector"
msgstr "Selector d''àrea"
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr "Àrea creada"
@@ -24312,7 +24316,7 @@ msgstr ""
"l''informe d''error, d''aquesta manera podrem trobar la font del problema."
msgid "Area detection algorithm settings."
-msgstr "Paràmetres de l'algorisme de detecció d'àrea."
+msgstr "Paràmetres de l''algorisme de detecció d''àrea."
msgid "Algorithm Settings"
msgstr "Configuració de l''algorisme"
@@ -28714,9 +28718,6 @@ msgstr ""
msgid "Save SDS file"
msgstr "Enregistrar el fitxer SDS"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "No es pot fer la còpia de seguretat. L''excepció ha estat: {0}"
-
msgid "Simplify Area"
msgstr "Simplifica àrea"
diff --git a/i18n/po/ca at valencia.po b/i18n/po/ca at valencia.po
index 9055f5e..8d7c9cb 100644
--- a/i18n/po/ca at valencia.po
+++ b/i18n/po/ca at valencia.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2013-10-22 10:01+0000\n"
"Last-Translator: pitort <pitort at eclipso.eu>\n"
"Language-Team: el_libre - - www.catmidia.cat\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:35+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:39+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: ca at valencia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -13870,6 +13870,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -15832,6 +15838,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Connector per signar digitalment dades OSM"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -19380,6 +19389,9 @@ msgstr "piscina"
msgid "water_park"
msgstr "parc_aquàtic"
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Tipus de pistes"
@@ -24043,15 +24055,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -28463,9 +28466,6 @@ msgstr ""
msgid "Save SDS file"
msgstr "Enregistrar el fitxer SDS"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "No es pot fer la còpia de seguretat. L''excepció ha estat: {0}"
-
msgid "Simplify Area"
msgstr "Simplifica àrea"
diff --git a/i18n/po/cs.po b/i18n/po/cs.po
index 942fa8b..1b95699 100644
--- a/i18n/po/cs.po
+++ b/i18n/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-09-14 19:38+0000\n"
"Last-Translator: Jan Martinec <Unknown>\n"
"Language-Team: Czech <cs at li.org>\n"
@@ -10,8 +10,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 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:44+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: cs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -13793,6 +13793,12 @@ msgstr "Zeměpisné délky musí být mezi {0} a {1}"
msgid "The minima must be less than the maxima"
msgstr "Minimum musí být menší než maximum"
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -15781,6 +15787,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Doplněk pro digitální podepisování dat OSM"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr "Poskytuje jednoduché GUI pro přidávání a úpravy odbočovacích pruhů."
@@ -19333,6 +19342,9 @@ msgstr "kúpalisko"
msgid "water_park"
msgstr "aquapark"
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Typ trasy"
@@ -24007,15 +24019,6 @@ msgstr ""
msgid "Area Selector"
msgstr "Výběr plochy"
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr "Vytvořená plocha"
@@ -28349,9 +28352,6 @@ msgstr ""
msgid "Save SDS file"
msgstr "Uložit SDS soubor"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Nemohu zálohovat soubor. Došlo k vyjímce: {0}"
-
msgid "Simplify Area"
msgstr "Zjednodušit plochu"
diff --git a/i18n/po/cy.po b/i18n/po/cy.po
index f8e6808..5aadb15 100644
--- a/i18n/po/cy.po
+++ b/i18n/po/cy.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2009-07-17 21:45+0000\n"
"Last-Translator: iggy23 <Unknown>\n"
"Language-Team: Welsh <cy at li.org>\n"
@@ -11,8 +11,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
"2 : 3;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:27+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:31+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: cy\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12551,6 +12551,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14167,6 +14173,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17688,6 +17697,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22209,15 +22221,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26305,9 +26308,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/da.po b/i18n/po/da.po
index 5ac6015..e804cf9 100644
--- a/i18n/po/da.po
+++ b/i18n/po/da.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
-"PO-Revision-Date: 2014-10-07 10:01+0000\n"
-"Last-Translator: Jens Winbladh <jens at somewhere.dk>\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"PO-Revision-Date: 2014-10-20 22:01+0000\n"
+"Last-Translator: Jørn <joern.map at gmail.com>\n"
"Language-Team: Dansk <kde-i18n-doc at kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:44+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:45+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: da_DK\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -400,7 +400,7 @@ msgstr ""
msgid "Combine {0} way"
msgid_plural "Combine {0} ways"
msgstr[0] "Kombinere {0} way"
-msgstr[1] "Kombinere {0} way'ene"
+msgstr[1] "Kombinere {0} way''ene"
msgid "Please select at least two ways to combine."
msgstr "Vælg mindst to veje at kombinere."
@@ -725,10 +725,10 @@ msgid "Include a node into the nearest way segments"
msgstr "Inkludér et punkt i de nærmeste vej-sekmenter"
msgid "Move Node onto Way"
-msgstr ""
+msgstr "Flyt punkt til vej"
msgid "Move the node onto the nearest way segments and include it"
-msgstr ""
+msgstr "Flyt punktet til nærmeste vej og inkluderer det"
msgid "No Shortcut"
msgstr "Ingen genvej"
@@ -2037,10 +2037,10 @@ msgid "Switch angle snapping mode while drawing"
msgstr "Aktivér vinkellås tilstand mens der tegnes"
msgid "Dual alignment"
-msgstr ""
+msgstr "Dobbelt tilpasning"
msgid "Switch dual alignment mode while extruding"
-msgstr ""
+msgstr "Skift dobbelt tilpasningstilstand under udstrækningen"
msgid "Extrude"
msgstr "Træk ud"
@@ -2061,7 +2061,7 @@ msgstr ""
"dobbeltklik for at tilføje et nyt punkt."
msgid "Dual alignment active."
-msgstr ""
+msgstr "Dobbelt tilpasning aktiv."
msgid "Segment collapsed due to its direction reversing."
msgstr ""
@@ -12473,7 +12473,7 @@ msgid "Change Tags"
msgstr ""
msgid "Add or remove toolbar button"
-msgstr ""
+msgstr "Tilføj eller fjern værktøjslinjeknap"
msgid "Unknown requisite: {0}"
msgstr "Ukendt krav: {0}"
@@ -13544,6 +13544,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -15386,6 +15392,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Udvidelse til at signere OSM-data digitalt"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -16700,10 +16709,10 @@ msgid "Stop"
msgstr "Stop"
msgid "Give Way"
-msgstr ""
+msgstr "Ubetinget vigepligt"
msgid "Mini-Roundabout"
-msgstr ""
+msgstr "Minirundkørsel"
msgid "clockwise"
msgstr "med uret"
@@ -16712,7 +16721,7 @@ msgid "Pedestrian Crossing"
msgstr "Fodgængerfelt"
msgid "Traffic Calming"
-msgstr "trafikdæmpning"
+msgstr "Trafikdæmpning"
msgid "bump"
msgstr "bump"
@@ -16742,7 +16751,7 @@ msgid "Turning Circle"
msgstr "Vendeplads"
msgid "Turning Loop"
-msgstr ""
+msgstr "Vendeplads med ø"
msgid "City Limit"
msgstr "Bygrænse"
@@ -16949,7 +16958,7 @@ msgid "Stream"
msgstr "Bæk"
msgid "Wadi"
-msgstr ""
+msgstr "Tørt flodleje"
msgid "Canal"
msgstr "Kanal"
@@ -17915,7 +17924,7 @@ msgid "Alpine Hut"
msgstr "Alpinhytte"
msgid "Caravan Site/RV Park"
-msgstr ""
+msgstr "Autocamperplads"
msgid "Number of places"
msgstr "Antal pladser"
@@ -18020,10 +18029,10 @@ msgid "Bar"
msgstr "Bar"
msgid "Night Club"
-msgstr ""
+msgstr "Natklub"
msgid "Strip Club"
-msgstr ""
+msgstr "Stripklub"
msgid "Tourism"
msgstr "Turisme"
@@ -18211,7 +18220,7 @@ msgid "charcoal"
msgstr "trækul"
msgid "Firepit"
-msgstr ""
+msgstr "Bålplads"
msgid "Fishing"
msgstr "Fiskeri"
@@ -18503,7 +18512,7 @@ msgid "Hearing Aids"
msgstr "Høreapparater"
msgid "Baby Hatch/Safe Haven"
-msgstr ""
+msgstr "Babyluge"
msgid "Emergency Access Point"
msgstr ""
@@ -18560,7 +18569,7 @@ msgid "urinal"
msgstr ""
msgid "Shower"
-msgstr ""
+msgstr "Bruser"
msgid "Post Box"
msgstr "Postkasse"
@@ -18912,6 +18921,9 @@ msgstr ""
msgid "water_park"
msgstr "badeland"
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Piste type"
@@ -23441,15 +23453,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -27583,9 +27586,6 @@ msgstr ""
msgid "Save SDS file"
msgstr "Gem SDS fil"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Kan ikke sikkerhedskopiere filen. Undtagelsen er: {0}"
-
msgid "Simplify Area"
msgstr "Simplificer område"
diff --git a/i18n/po/de.po b/i18n/po/de.po
index 95effb4..c0dcb87 100644
--- a/i18n/po/de.po
+++ b/i18n/po/de.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
-"PO-Revision-Date: 2014-09-25 14:08+0000\n"
-"Last-Translator: Ettore Atalan <atalanttore at googlemail.com>\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"PO-Revision-Date: 2014-10-20 17:02+0000\n"
+"Last-Translator: Simon Legner <Unknown>\n"
"Language-Team: JOSM\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:50+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:52+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: de\n"
"X-Poedit-SearchPath-0: .\n"
"X-Poedit-Basepath: /home/simon/src/josm.all/i18n\n"
@@ -1238,7 +1238,7 @@ msgid "Report bug"
msgstr "Fehler melden"
msgid "Report a ticket to JOSM bugtracker"
-msgstr ""
+msgstr "Fehler im JOSM-Bugtracker melden"
msgid "Restart"
msgstr "Neu starten"
@@ -1849,7 +1849,7 @@ msgid "Markers from {0}"
msgstr "Wegpunkte von {0}"
msgid "Downloading Notes"
-msgstr "Anmerkungen werden heruntergeladen"
+msgstr "Hinweise werden heruntergeladen"
msgid "Download Compressed OSM Change"
msgstr "Komprimierte OSM-Änderung herunterladen"
@@ -1977,19 +1977,19 @@ msgid "Error during download"
msgstr "Fehler beim Herunterladen"
msgid "Add a new Note"
-msgstr ""
+msgstr "Neuen Hinweis hinzufügen"
msgid "Add note mode"
-msgstr ""
+msgstr "Modus zum Hinzufügen von Hinweisen"
msgid "Click the location where you wish to create a new note"
-msgstr ""
+msgstr "Auf den Ort klicken, wo ein neuer Hinweis hizugefügt werden soll"
msgid "Enter a comment for a new note"
-msgstr ""
+msgstr "Einen Kommentar für den Hinweis eingeben"
msgid "Create new note"
-msgstr ""
+msgstr "Neuen Hinweis erstellen"
msgid "Delete Mode"
msgstr "Löschmodus"
@@ -3948,7 +3948,7 @@ msgid "API Capabilities"
msgstr "API-Fähigkeiten"
msgid "Checks for errors against API capabilities"
-msgstr ""
+msgstr "Prüft auf Fehler im Bezug auf API-Anforderungen"
msgid ""
"Way contains more than {0} nodes. It should be replaced by a multipolygon"
@@ -4205,7 +4205,11 @@ msgid ""
msgid_plural ""
"Multipolygon relation should be tagged with area tags and not the outer ways"
msgstr[0] ""
+"Die Multipolygon-Relation sollte mit den Merkmalen versehen werden und nicht "
+"die äußere Linie"
msgstr[1] ""
+"Die Multipolygon-Relation sollte mit den Merkmalen versehen werden und nicht "
+"die äußeren Linien"
msgid "Style for inner way equals multipolygon"
msgstr "Zeichenstil für innere Linie mit Multipolygon identisch"
@@ -4214,10 +4218,10 @@ msgid "Style for outer way mismatches"
msgstr "Zeichenstil für äußere Linie unterschiedlich"
msgid "Style for outer way mismatches polygon"
-msgstr ""
+msgstr "Zeichenstil für äußere Linie unterscheidet sich von Polygon"
msgid "Area style on outer way"
-msgstr ""
+msgstr "Flächenzeichenstil auf äußerer Linie"
msgid "Multipolygon is not closed"
msgstr "Multipolygon nicht geschlossen"
@@ -6650,37 +6654,37 @@ msgid "Customize the style"
msgstr "Stil anpassen"
msgid "Add comment"
-msgstr ""
+msgstr "Kommentar hinzufügen"
msgid "Comment"
msgstr "Kommentar"
msgid "Add comment to note:"
-msgstr ""
+msgstr "Kommentar zu Hinweis hinzufügen:"
msgid "Close note"
-msgstr ""
+msgstr "Hinweis schließen"
msgid "Close note with message:"
-msgstr ""
+msgstr "Hinweis mit Nachricht schließen:"
msgid "Close Note"
-msgstr ""
+msgstr "Hinweis schließen"
msgid "Create a new note"
-msgstr ""
+msgstr "Neuen Hinweis erstellen"
msgid "Create"
msgstr "Erzeugen"
msgid "Reopen note"
-msgstr ""
+msgstr "Hinweis erneut öffnen"
msgid "Reopen"
-msgstr ""
+msgstr "Erneut öffnen"
msgid "Reopen note with message:"
-msgstr ""
+msgstr "Hinweis mit Nachricht erneut öffnen:"
msgid "Object type:"
msgstr "Objekttyp:"
@@ -8194,13 +8198,13 @@ msgid "Querying name server ..."
msgstr "Suche nach Namen ..."
msgid "Error occured with query ''{0}'': ''{1}''"
-msgstr ""
+msgstr "Fehler trat mit der Suche ''{0}'' auf: ''{1}''"
msgid "Name server returned invalid data. Please try again."
-msgstr ""
+msgstr "Server lieferte ungültige Daten zurück. Bitte erneut versuchen."
msgid "Bad response"
-msgstr ""
+msgstr "Ungültige Antwort"
msgid "Type"
msgstr "Typ"
@@ -11581,6 +11585,8 @@ msgstr "ISO-Daten anzeigen"
msgid "Use native file choosers (nicer, but do not support file filters)"
msgstr ""
+"Natives Dialogfeld für Dateiauswahl verwenden (schöner, aber ohne "
+"Unterstützung für Dateifilter)"
msgid "Show localized name in selection lists, if available"
msgstr "Übersetzten Namen in Auswahllisten anzeigen, sofern verfügbar"
@@ -11608,6 +11614,8 @@ msgid ""
"Use file choosers that behave more like native ones. They look nicer but do "
"not support some features like file filters"
msgstr ""
+"Dialogfeld für Dateiauswahl des Betriebssystems verwenden. Diese sind "
+"schöner, allerdings ohne Zusatzfunktionalitäten wie Dateifilter"
msgid "Look and Feel"
msgstr "Verhalten und Aussehen"
@@ -13816,7 +13824,7 @@ msgid "Contacting Server..."
msgstr "Serververbindung..."
msgid "Downloading OSM notes..."
-msgstr "OSM-Anmerkungen werden heruntergeladen..."
+msgstr "OSM-Hinweise werden heruntergeladen..."
msgid "Failed to open connection to API {0}."
msgstr "Verbindung zu API {0} konnte nicht geöffnet werden."
@@ -14027,6 +14035,12 @@ msgstr "Längengrade müssen zwischen {0} und {1} liegen"
msgid "The minima must be less than the maxima"
msgstr "Die Minima müssen geringer als die Maxima sein"
+msgid "Remote Control has been asked to load the following data:"
+msgstr "Die Fernsteuerung soll die folgenden Daten laden:"
+
+msgid "Loading data"
+msgstr "Daten werden geladen"
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -15336,7 +15350,7 @@ msgstr "Forst"
msgctxt "landuse"
msgid "meadow"
-msgstr ""
+msgstr "Wiese"
msgctxt "landuse"
msgid "farmland"
@@ -16025,6 +16039,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Plugin zum digitalen Signieren von OSM-Daten"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -16560,13 +16577,13 @@ msgid "Fee"
msgstr "Gebühr"
msgid "06:00-20:00"
-msgstr ""
+msgstr "06:00-20:00"
msgid "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
-msgstr ""
+msgstr "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
msgid "May-Sep 09:30-12:30,14:15-19:30"
-msgstr ""
+msgstr "May-Sep 09:30-12:30,14:15-19:30"
msgid "multi-storey"
msgstr "Parkhaus"
@@ -18884,7 +18901,7 @@ msgid "charcoal"
msgstr "Holzkohle"
msgid "Firepit"
-msgstr ""
+msgstr "Feuerstelle"
msgid "Fishing"
msgstr "Angeln"
@@ -19233,7 +19250,7 @@ msgid "urinal"
msgstr "Pissoir"
msgid "Shower"
-msgstr ""
+msgstr "Dusche"
msgid "Post Box"
msgstr "Briefkasten"
@@ -19585,6 +19602,9 @@ msgstr "Schwimmbecken"
msgid "water_park"
msgstr "Wasserpark"
+msgid "Scuba Diving"
+msgstr "Gerätetauchen"
+
msgid "Piste type"
msgstr "Pistentyp"
@@ -19847,7 +19867,7 @@ msgstr "Unterstand"
msgctxt "building"
msgid "cowshed"
-msgstr ""
+msgstr "Kuhstall"
msgctxt "building"
msgid "construction"
@@ -21132,7 +21152,7 @@ msgid "Interior Decoration"
msgstr "Innendekoration"
msgid "Antiques"
-msgstr ""
+msgstr "Antiquitäten"
msgid "Printed Material"
msgstr "Druckerzeugnisse"
@@ -22435,7 +22455,7 @@ msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgid "CUGN Nancy - Orthophoto 2012"
-msgstr ""
+msgstr "CUGN Nancy - Orthophoto 2012"
msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr "Géobretagne - Brest 2010 - 10 cm"
@@ -22551,7 +22571,7 @@ msgid "Drone Imagery (Haiti)"
msgstr "Drone Imagery (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
-msgstr ""
+msgstr "Drone Imagery 2014 (Haiti)"
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -22599,16 +22619,16 @@ msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Litauen)"
msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
+msgstr "Luxembourg Inspire Ortho 2010"
msgid "Luxembourg Inspire Ortho 2013"
-msgstr ""
+msgstr "Luxembourg Inspire Ortho 2013"
msgid "Luxembourg Inspire Railway"
-msgstr ""
+msgstr "Luxembourg Inspire Railway"
msgid "Luxembourg Inspire Roads"
-msgstr ""
+msgstr "Luxembourg Inspire Roads"
msgid "Niger Delta Oct 2012 Landsat"
msgstr "Nigerdelta Okt 2012 Landsat"
@@ -22916,10 +22936,13 @@ msgstr "{0}={1} ist veraltet. Bitte stattdessen ein Multipolygon verwenden."
msgid ""
"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
msgstr ""
+"{0} ist veraltet. Bitte das Intervall mit der opening_hours-Syntax angeben"
msgid ""
"{0} is deprecated. Please delete this object and use a private layer instead"
msgstr ""
+"{0} ist veraltet. Bitte das Objekt löschen und stattdessen eine private "
+"Ebene verwenden"
msgid "{0} on a node"
msgstr "{0} auf einem Punkt"
@@ -24284,15 +24307,6 @@ msgstr "Eine Fläche (z.B. Gebäude) vom unterliegenden Bild auswählen."
msgid "Area Selector"
msgstr "Flächenauswahl"
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr "Fläche erzeugt"
@@ -28681,10 +28695,6 @@ msgstr ""
msgid "Save SDS file"
msgstr "SDS-Datei speichern"
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-"Sicherung der Datei konnte nicht erstellt werden. Der Fehler ist: {0}"
-
msgid "Simplify Area"
msgstr "Fläche vereinfachen"
diff --git a/i18n/po/de_DE.po b/i18n/po/de_DE.po
index b1cf04e..996406b 100644
--- a/i18n/po/de_DE.po
+++ b/i18n/po/de_DE.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2011-07-10 12:32+0000\n"
"Last-Translator: ralekuja <Unknown>\n"
"Language-Team: German (Germany) <de_DE at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:33+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:36+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12559,6 +12559,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14178,6 +14184,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17699,6 +17708,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22220,15 +22232,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26320,9 +26323,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/el.po b/i18n/po/el.po
index 286f399..ec3ad34 100644
--- a/i18n/po/el.po
+++ b/i18n/po/el.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-09-04 14:40+0000\n"
"Last-Translator: aitolos <Unknown>\n"
"Language-Team: Greek <el at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:52+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:54+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: el\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12927,6 +12927,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14569,6 +14575,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -18093,6 +18102,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22618,15 +22630,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26744,9 +26747,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/en_AU.po b/i18n/po/en_AU.po
index 84d0c31..cde04f8 100644
--- a/i18n/po/en_AU.po
+++ b/i18n/po/en_AU.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2013-03-30 14:03+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: English (Australia) <en_AU at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:29+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:34+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -13062,6 +13062,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14799,6 +14805,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -18324,6 +18333,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Piste type"
@@ -22850,15 +22862,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -27016,9 +27019,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Could not back up file. Exception is: {0}"
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/en_CA.po b/i18n/po/en_CA.po
index 1e74b38..81cddb1 100644
--- a/i18n/po/en_CA.po
+++ b/i18n/po/en_CA.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2010-09-24 17:25+0000\n"
"Last-Translator: Johann Beda <Unknown>\n"
"Language-Team: English (Canada) <en_CA at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:33+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:37+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12556,6 +12556,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14172,6 +14178,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17693,6 +17702,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22214,15 +22226,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26310,9 +26313,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/en_GB.po b/i18n/po/en_GB.po
index e83962f..fba0be4 100644
--- a/i18n/po/en_GB.po
+++ b/i18n/po/en_GB.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JOSM\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-09-20 20:07+0000\n"
"Last-Translator: Andi Chandler <Unknown>\n"
"Language-Team: German <josm-dev at openstreetmap.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:29+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:33+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: de\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -13576,6 +13576,12 @@ msgstr "The longitudes must be between {0} and {1}"
msgid "The minima must be less than the maxima"
msgstr "The minima must be less than the maxima"
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -15514,6 +15520,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Plugin to digitally sign OSM-Data"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -19065,6 +19074,9 @@ msgstr ""
msgid "water_park"
msgstr "water_park"
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Piste type"
@@ -23688,15 +23700,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -27860,9 +27863,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Could not back up file. Exception is: {0}"
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/eo.po b/i18n/po/eo.po
index 4a17332..fd2257e 100644
--- a/i18n/po/eo.po
+++ b/i18n/po/eo.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2012-10-03 21:33+0000\n"
"Last-Translator: Michael Moroni <michael.moroni at openmailbox.org>\n"
"Language-Team: Esperanto <eo at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:45+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:47+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: eo\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12556,6 +12556,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14172,6 +14178,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17693,6 +17702,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22214,15 +22226,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26310,9 +26313,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/es.po b/i18n/po/es.po
index 974cb8d..948f4bf 100644
--- a/i18n/po/es.po
+++ b/i18n/po/es.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-10-11 10:31+0000\n"
"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
"Language-Team: Spanish <es at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:19+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:23+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: es\n"
"X-Language: es_ES\n"
"X-Source-Language: C\n"
@@ -14056,6 +14056,12 @@ msgstr "Las longitudes deben estar entre {0} y {1}"
msgid "The minima must be less than the maxima"
msgstr "Los mínimos debe ser inferior a los máximos"
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -16069,6 +16075,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Complemento para firmar digitalmente datos OSM"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -19638,6 +19647,9 @@ msgstr "pileta"
msgid "water_park"
msgstr "parque acuático"
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Tipo de pista de esquí"
@@ -24355,15 +24367,6 @@ msgstr ""
msgid "Area Selector"
msgstr "Selector de Área"
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr "Área creada"
@@ -28775,9 +28778,6 @@ msgstr ""
msgid "Save SDS file"
msgstr "Guardar archivo SDS"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "No se pudo hacer copia de seguridad. La excepción es: {0}"
-
msgid "Simplify Area"
msgstr "Simplificar aŕea"
diff --git a/i18n/po/et.po b/i18n/po/et.po
index 332df14..85fc03b 100644
--- a/i18n/po/et.po
+++ b/i18n/po/et.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
-"PO-Revision-Date: 2014-10-15 20:58+0000\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"PO-Revision-Date: 2014-10-20 21:12+0000\n"
"Last-Translator: AivoK <aivo.kuhlberg at hot.ee>\n"
"Language-Team: Estonian <et at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:46+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:48+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: et\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12758,6 +12758,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14396,6 +14402,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -16627,7 +16636,7 @@ msgid "Public Transport"
msgstr "Ühistransport"
msgid "Public Transport Route"
-msgstr ""
+msgstr "Ühistranspordi marsruut"
msgid "Route type"
msgstr "Marsruudi tüüp"
@@ -16639,10 +16648,10 @@ msgid "monorail"
msgstr ""
msgid "light_rail"
-msgstr ""
+msgstr "kergraudtee"
msgid "trolleybus"
-msgstr ""
+msgstr "troll"
msgid "aerialway"
msgstr "köisraudtee"
@@ -16698,22 +16707,22 @@ msgid "route segment"
msgstr "marsruudi osa"
msgid "stop position"
-msgstr ""
+msgstr "peatuse asukoht"
msgid "stop position (exit only)"
-msgstr ""
+msgstr "peatuse asukoht (ainult väljuv)"
msgid "stop position (entry only)"
-msgstr ""
+msgstr "peatuse asukoht (ainult sisenev)"
msgid "platform"
-msgstr ""
+msgstr "platvorm"
msgid "platform (exit only)"
-msgstr ""
+msgstr "platvorm (ainult väljuv)"
msgid "platform (entry only)"
-msgstr ""
+msgstr "platvorm (ainult sisenev)"
msgid "Route Master"
msgstr ""
@@ -16722,7 +16731,7 @@ msgid "route variant/direction (at least 2)"
msgstr ""
msgid "Stop Area"
-msgstr "Peatuse ala"
+msgstr "Peatuseala"
msgid "UIC reference"
msgstr ""
@@ -16731,16 +16740,16 @@ msgid "UIC name"
msgstr ""
msgid "Stop Position"
-msgstr ""
+msgstr "Peatuse asukoht"
msgid "Platform"
-msgstr ""
+msgstr "Platvorm"
msgid "Station or amenities"
msgstr ""
msgid "Bus"
-msgstr ""
+msgstr "Buss"
msgid "Bus stop (legacy)"
msgstr "Bussipeatus (pärand)"
@@ -16749,7 +16758,7 @@ msgid "Tram stop (legacy)"
msgstr "Trammipeatus (pärand)"
msgid "Train"
-msgstr ""
+msgstr "Rong"
msgid "Railway station (legacy)"
msgstr "Raudteejaam (pärand)"
@@ -16758,16 +16767,16 @@ msgid "Railway halt (legacy)"
msgstr "Raudteepeatus (pärand)"
msgid "Trolleybus"
-msgstr ""
+msgstr "Troll"
msgid "Share taxi"
msgstr ""
msgid "Funicular"
-msgstr ""
+msgstr "Köisraudtee"
msgid "Ferry"
-msgstr ""
+msgstr "Parvlaev"
msgid "Bench"
msgstr "Pink"
@@ -16789,7 +16798,7 @@ msgstr ""
msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Jaam"
msgid "Building"
msgstr "Hoone"
@@ -16804,10 +16813,10 @@ msgid "Reference Number"
msgstr "Viitenumber"
msgid "Public Transport (Legacy)"
-msgstr ""
+msgstr "Ühistransport (Pärand)"
msgid "Public transport route (Legacy)"
-msgstr ""
+msgstr "Ühistranspordi marsruut (Pärand)"
msgid "forward segment"
msgstr "edasisuunaline osa"
@@ -16831,7 +16840,7 @@ msgid "Railway Halt"
msgstr "Raudteepeatus"
msgid "Tram Stop"
-msgstr ""
+msgstr "Trammipeatus"
msgid "Railway Platform"
msgstr "Raudteeplatvorm"
@@ -17919,6 +17928,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Nõlva liik"
@@ -22450,15 +22462,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26558,9 +26561,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/eu.po b/i18n/po/eu.po
index e1a50f4..c35eac5 100644
--- a/i18n/po/eu.po
+++ b/i18n/po/eu.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2013-03-30 13:56+0000\n"
"Last-Translator: Txopi <txopi at sindominio.net>\n"
"Language-Team: Basque <eu at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:37+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:38+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: eu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12761,6 +12761,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14414,6 +14420,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17947,6 +17956,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Eski-pista mota"
@@ -22468,15 +22480,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26569,9 +26572,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/fa.po b/i18n/po/fa.po
index b524e3d..8c8318f 100644
--- a/i18n/po/fa.po
+++ b/i18n/po/fa.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-03-18 07:32+0000\n"
"Last-Translator: Saeed Ghazi Joolaee <Unknown>\n"
"Language-Team: Persian <fa at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:10+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:14+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: fa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12627,6 +12627,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14243,6 +14249,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17764,6 +17773,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22285,15 +22297,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26381,9 +26384,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/fi.po b/i18n/po/fi.po
index a9b8b20..bc3c152 100644
--- a/i18n/po/fi.po
+++ b/i18n/po/fi.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-02-26 18:35+0000\n"
"Last-Translator: Lauri Kytömaa <Unknown>\n"
"Language-Team: Finnish <fi at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:47+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:49+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: fi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -13313,6 +13313,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14990,6 +14996,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -18517,6 +18526,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -23052,15 +23064,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -27185,9 +27188,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/fil.po b/i18n/po/fil.po
index 39c39b9..4c34a65 100644
--- a/i18n/po/fil.po
+++ b/i18n/po/fil.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2011-06-19 14:15+0000\n"
"Last-Translator: Anthony Balico <Unknown>\n"
"Language-Team: Filipino <fil at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:34+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:38+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: fil\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/fr.po b/i18n/po/fr.po
index 628a7cd..4d5337c 100644
--- a/i18n/po/fr.po
+++ b/i18n/po/fr.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
-"PO-Revision-Date: 2014-10-09 13:51+0000\n"
-"Last-Translator: Fred L <frederic.labalte at free.fr>\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"PO-Revision-Date: 2014-10-20 18:32+0000\n"
+"Last-Translator: Don-vip <Unknown>\n"
"Language-Team: Fr <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:48+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:50+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: fr\n"
"X-Poedit-Bookmarks: 1767,-1,-1,2669,-1,-1,-1,-1,-1,-1\n"
@@ -12900,7 +12900,7 @@ msgid "All files (*.*)"
msgstr "Tous les fichiers (*.*)"
msgid "Received error page:"
-msgstr "Page d'erreur reçue:"
+msgstr "Page d''erreur reçue :"
msgid "Min. latitude"
msgstr "Latitude minimale :"
@@ -13938,6 +13938,12 @@ msgstr "Les longitudes doivent être entre {0} et {1}"
msgid "The minima must be less than the maxima"
msgstr "La valeur minimum doit être plus petite que la valeur maximum"
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -15011,10 +15017,10 @@ 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 ""
-"L’existence d’un important risque de sécurité semble être avéré</b>. "
-"<br><br> Vous allez maintenant être invité par Windows à supprimer ce "
-"certificat non sécuritaire. <br> Pour votre propre sécurité, <b> s'il vous "
-"plaît cliquez sur Oui </ b> dans le dialogue suivant."
+"L’existence d’un important risque de sécurité semble être "
+"avéré</b>.<br><br>Vous allez maintenant être invité par Windows à supprimer "
+"ce certificat non sécuritaire.<br>Pour votre propre sécurité, <b>s’il vous "
+"plaît cliquez sur Oui</ b> dans le dialogue suivant."
msgid "Removing insecure certificate from {0} keystore: {1}"
msgstr ""
@@ -15913,6 +15919,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Permet de signer numériquement les données OSM."
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -16448,13 +16457,13 @@ msgid "Fee"
msgstr "Payant"
msgid "06:00-20:00"
-msgstr ""
+msgstr "06:00-20:00"
msgid "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
-msgstr ""
+msgstr "Lu-Ve 09:00-18:00,Sa 08:00-14:00"
msgid "May-Sep 09:30-12:30,14:15-19:30"
-msgstr ""
+msgstr "Mai-Sep 09:30-12:30,14:15-19:30"
msgid "multi-storey"
msgstr "couvert"
@@ -17545,7 +17554,7 @@ msgid "Covered Reservoir"
msgstr "Réservoir couvert"
msgid "A body of standing water, such as a lake or pond."
-msgstr "De l'eau stagnante , comme un lac ou un étang."
+msgstr "De l''eau stagnante, comme un lac ou un étang."
msgid "Water Body"
msgstr "Plan d''eau"
@@ -17576,8 +17585,8 @@ msgstr "Eau salée"
msgid "Is the water body intermittent (disappears seasonally)?"
msgstr ""
-"Est-ce que la masse d'eau est intermittente (disparaît-elle saisonnièrement) "
-"?"
+"Est-ce que la masse d''eau est intermittente (disparaît-elle "
+"saisonnièrement) ?"
msgid "Coastline"
msgstr "Ligne côtière"
@@ -17629,7 +17638,7 @@ msgstr "Plage"
msgid "A flat area of sand, gravel or pebble next to water."
msgstr ""
-"Une surface plane de sable, de graviers ou de galets à côté de l'eau."
+"Une surface plane de sable, de graviers ou de galets à côté de l''eau."
msgid "swimming"
msgstr "nage"
@@ -17643,7 +17652,7 @@ msgstr "Baie"
msgid ""
"A large body of water partially enclosed by land but with a wide mouth."
msgstr ""
-"Un grand plan d'eau partiellement entouré par la terre, qui possède "
+"Un grand plan d''eau partiellement entouré par la terre, qui possède "
"cependant une grande ouverture."
msgid "Cliff"
@@ -18695,6 +18704,8 @@ msgstr "Poteau indicateur"
msgid ""
"A Signpost/Guidepost to indicate the directions to different destinations."
msgstr ""
+"Un panneau de signalisation pour indiquer les directions vers différentes "
+"destinations."
msgid "Information Terminal"
msgstr "Lieu d’informations"
@@ -19421,7 +19432,7 @@ msgid "Archery"
msgstr "Tir à l’arc"
msgid "Track and Field Athletics"
-msgstr "Piste d'athlétisme"
+msgstr "Piste d''athlétisme"
msgid "Climbing"
msgstr "Escalade"
@@ -19475,6 +19486,9 @@ msgstr "piscine"
msgid "water_park"
msgstr "parc aquatique"
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Ski"
@@ -20787,7 +20801,7 @@ msgid "Triple tower"
msgstr ""
msgid "Incomplete tower"
-msgstr ""
+msgstr "Tour incomplète"
msgid "Pole"
msgstr "Pylône basse-tension"
@@ -22377,13 +22391,13 @@ msgid "Bavaria (2 m)"
msgstr "Bavière (2 m)"
msgid "Stuttgart (Luftbild)"
-msgstr ""
+msgstr "Stuttgart (vue aérienne)"
msgid "Erlangen 2013 Luftbild (6,25 cm)"
-msgstr ""
+msgstr "Erlangen 2013 vue aérienne (6,25 cm)"
msgid "Erlangen 2011 Luftbild (5,0 cm)"
-msgstr ""
+msgstr "Erlangen 2011 vue aérienne (5,0 cm)"
msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
@@ -22394,10 +22408,10 @@ msgstr ""
"Vielle carte de Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgid "Physical DE - Physische Karte (Naturräume)"
-msgstr ""
+msgstr "Allemagne physique - Carte Physique (Espaces naturels)"
msgid "Physical DE:Harz - Physische Karte (Naturräume)"
-msgstr ""
+msgstr "Allemagne physique : Harz - Carte Physique (Espaces naturels)"
msgid ""
"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
@@ -22405,7 +22419,7 @@ msgid ""
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
-msgstr ""
+msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgid "NRW-Atlas: Automatisierte Liegenschaftskarte (Vektor)"
msgstr ""
@@ -22663,7 +22677,7 @@ msgid "Bonvillars Orthophoto 2013"
msgstr "Bonvillars Orthophoto 2013"
msgid "Fiez Orthophoto 2013"
-msgstr ""
+msgstr "Fiez Orthophoto 2013"
msgid "MSR Maps Topo"
msgstr ""
@@ -22791,6 +22805,8 @@ msgstr ""
msgid ""
"{0} is deprecated. Please specify ìnterval by using opening_hours syntax"
msgstr ""
+"{0} est déprécié. Veuillez spécifier un intervalle en utilisant la syntaxe "
+"relative aux heures d’ouverture (opening_hours)."
msgid ""
"{0} is deprecated. Please delete this object and use a private layer instead"
@@ -24142,7 +24158,7 @@ msgid "Tag Element"
msgstr "Ajouter des attributs à l’élément"
msgid "Select an item to tag."
-msgstr ""
+msgstr "Sélectionnez un élément à baliser."
msgid "Tag Building"
msgstr "Ajouter des attributs au bâtiment"
@@ -24157,22 +24173,15 @@ msgid "Select an area (e.g. building) from an underlying image."
msgstr ""
msgid "Area Selector"
-msgstr ""
-
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
+msgstr "Sélecteur d’aire"
msgid "Created area"
msgstr ""
msgid "Unable to detect a polygon where you clicked."
msgstr ""
+"La détection d’un polygone s’est avérée impossible à l’endroit où vous avez "
+"cliqué."
msgid "Error Report"
msgstr ""
@@ -25035,7 +25044,7 @@ msgid "Selections must be made for both reference and subject."
msgstr ""
msgid "Incomplete selections"
-msgstr ""
+msgstr "Sélections incomplètes"
msgid "Restore subject selection"
msgstr ""
@@ -25053,7 +25062,7 @@ msgid "Error freezing selection"
msgstr ""
msgid "Nothing is selected, please try again."
-msgstr ""
+msgstr "Rien n’est sélectionné, veuillez essayer une fois de plus."
msgid "Empty selection"
msgstr "Sélection vide"
@@ -25190,7 +25199,7 @@ msgid "Could not get server response, check logs"
msgstr ""
msgid "Failed to login as {0}:"
-msgstr ""
+msgstr "Échec à l’identification de {0} :"
msgid "The server did not return user ID"
msgstr "Le serveur n''a pas renvoyé l''identifiant utilisateur"
@@ -25222,16 +25231,16 @@ msgid "not logged in"
msgstr "non connecté"
msgid "Failed to log in to GeoChat:"
-msgstr ""
+msgstr "Impossible de s’identifier à GeoChat :"
msgid "Failed to send message:"
-msgstr ""
+msgstr "Impossible d’envoyer un message :"
msgid "User {0} has left"
msgstr "L’utilisateur {0} s’est déconnecté"
msgid "User {0} is mapping nearby"
-msgstr ""
+msgstr "L’utilisateur {0} est en train de cartographier dans une zone proche"
msgid "Users mapping nearby:"
msgstr "Des utilisateurs contribuent à proximté"
@@ -25918,6 +25927,7 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
+"Cette chaîne devrait avoir une longueur comprise entre 3 et 200 lettres."
msgid "Adjust imagery"
msgstr "Ajustement de l’imagerie"
@@ -25996,6 +26006,7 @@ msgstr "Fichiers SVG [greffon ImportVec] (*.svg)"
msgid "Please open or create data layer before importing"
msgstr ""
+"Veuillez ouvrir ou créer un calque de données avant de faire l’importation."
msgid "InfoMode"
msgstr "ModeInfo"
@@ -26492,6 +26503,8 @@ msgstr "Télécharger depuis un miroir OSM..."
msgid "This XAPI query seems to be invalid, please doublecheck"
msgstr ""
+"Cette requête XAPI semble être invalide, veuillez effectuer une vérification "
+"supplémentaire"
msgid "Object type: "
msgstr "Type d’objet "
@@ -26652,10 +26665,10 @@ msgid ""
msgstr ""
msgid "Split by municipality"
-msgstr ""
+msgstr "Découper par municipalité"
msgid "Split this data by municipality (admin_level=8)."
-msgstr ""
+msgstr "Découper ces données par municipalité (admin_level=8)."
msgid "Split by sector"
msgstr ""
@@ -26676,7 +26689,7 @@ msgid "License URL not available: {0}"
msgstr "La licence de l’URL n’est pas disponible : {0}"
msgid "OpenData preferences"
-msgstr ""
+msgstr "préférences OpenData"
msgid "License Agreement"
msgstr "Contrat de licence"
@@ -27412,7 +27425,7 @@ msgid "Could not rename file!"
msgstr "Impossible de renommer le fichier !"
msgid "Could not rename file {0} to {1}!"
-msgstr ""
+msgstr "Ne peut pas renommer le fichier {0} en {1} !"
msgid "<html><h3>There are old backup files in the image directory!</h3>"
msgstr ""
@@ -27441,13 +27454,13 @@ msgid "Adjust photos"
msgstr "Ajustage des photos"
msgid "Move and position photos"
-msgstr ""
+msgstr "Déplacer et positionner les photos"
msgid "Click+drag photo or shift+click to position photo."
msgstr ""
msgid "Please load some photos."
-msgstr ""
+msgstr "Veuillez importer quelques photos."
msgid "Toggle the image thumbnail preview"
msgstr ""
@@ -27657,7 +27670,7 @@ msgid "Add new address point"
msgstr ""
msgid "Tags copied to clipboard."
-msgstr ""
+msgstr "Attributs copiés dans le presse-papier"
msgid "New address point added."
msgstr ""
@@ -28482,9 +28495,6 @@ msgstr ""
msgid "Save SDS file"
msgstr "Sauvegarde du fichier SDS"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Impossible de récupérer le fichier. Exception : {0}"
-
msgid "Simplify Area"
msgstr "Simplifier la zone"
@@ -28790,13 +28800,13 @@ msgid "Select parameter"
msgstr "Sélection du paramètre"
msgid "Tracer2: add a way with {0} points"
-msgstr ""
+msgstr "Tracer2 : ajouter un chemin avec {0} points"
msgid "Tracer2: modify way to {0} points"
-msgstr ""
+msgstr "Tracer2 : modifier un chemin avec {0} points"
msgid "Tracer2 error"
-msgstr ""
+msgstr "Erreur Tracer2"
msgid "Parameter for server request"
msgstr "Paramètre pour la requête serveur"
@@ -28832,7 +28842,7 @@ msgid "Add predefined"
msgstr ""
msgid "Select predefined parameter"
-msgstr ""
+msgstr "Sélectionner les paramètres prédéfinis"
msgid "Modify list of parameter for server request."
msgstr ""
@@ -29812,7 +29822,7 @@ msgstr ""
msgid "Unable to undelete relation {0}. Object has likely been redacted"
msgstr ""
-"Impossible de restaurer la relation {0}. L'élément a probablement été édité"
+"Impossible de restaurer la relation {0}. L''élément a probablement été édité"
msgid "Undelete Object"
msgstr "Restaurer l’objet"
@@ -29824,7 +29834,7 @@ msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
"w2''"
msgstr ""
-"Entrer le type et l'ID des objets à restaurer, par exemple, \"n1 w2\""
+"Entrer le type et l''ID des objets à restaurer, par exemple, \"n1 w2\""
msgid "Select if the data should be added into a new layer"
msgstr ""
@@ -30379,7 +30389,7 @@ msgid "Keep centered"
msgstr "Garder centré"
msgid "follows the video icon automatically"
-msgstr ""
+msgstr "suit l’icône de la vidéo automatiquement"
msgid "Subtitles"
msgstr "Sous-titres"
diff --git a/i18n/po/gl.po b/i18n/po/gl.po
index ca56155..2138bbe 100644
--- a/i18n/po/gl.po
+++ b/i18n/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-08-20 14:37+0000\n"
"Last-Translator: Adrián Chaves Fernández <adriyetichaves at gmail.com>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:51+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:53+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: gl\n"
"X-Poedit-Language: Galician\n"
@@ -13036,6 +13036,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14720,6 +14726,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Engadido para asinar dixitalmente Datos de OSM"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -18249,6 +18258,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Tipo de pista de esquí"
@@ -22771,15 +22783,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26894,9 +26897,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Non se puido respaldar o ficheiro. A excepción é: {0}"
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/he.po b/i18n/po/he.po
index e3ab9bd..29375c1 100644
--- a/i18n/po/he.po
+++ b/i18n/po/he.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2013-03-30 13:38+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Hebrew <he at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:53+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:55+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: he\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12591,6 +12591,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14209,6 +14215,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17730,6 +17739,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "סוג מסלול"
@@ -22251,15 +22263,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26351,9 +26354,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/hi.po b/i18n/po/hi.po
index b4f2323..8818294 100644
--- a/i18n/po/hi.po
+++ b/i18n/po/hi.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2009-11-14 16:28+0000\n"
"Last-Translator: nipunreddevil <nipunreddevil at gmail.com>\n"
"Language-Team: Hindi <hi at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:54+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:56+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: hi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/hr.po b/i18n/po/hr.po
index 8f75a65..251ed58 100644
--- a/i18n/po/hr.po
+++ b/i18n/po/hr.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2013-03-05 18:14+0000\n"
"Last-Translator: gogo <trebelnik2 at gmail.com>\n"
"Language-Team: Croatian <hr at li.org>\n"
@@ -11,8 +11,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:16+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:20+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: hr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12707,6 +12707,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14323,6 +14329,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17844,6 +17853,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22365,15 +22377,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26465,9 +26468,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr "Pojednostavi područje"
diff --git a/i18n/po/ht.po b/i18n/po/ht.po
index 252cdbd..5f857f6 100644
--- a/i18n/po/ht.po
+++ b/i18n/po/ht.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2010-03-11 21:17+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Haitian; Haitian Creole <ht at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:53+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:55+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/hu.po b/i18n/po/hu.po
index 9e9c3d0..c468acc 100644
--- a/i18n/po/hu.po
+++ b/i18n/po/hu.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
-"PO-Revision-Date: 2014-09-21 21:07+0000\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"PO-Revision-Date: 2014-10-20 14:45+0000\n"
"Last-Translator: Báthory Péter <bathory86p at gmail.com>\n"
"Language-Team: Hungarian <hu at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:55+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:57+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: hu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1224,7 +1224,7 @@ msgid "Report bug"
msgstr "Hibajelentés"
msgid "Report a ticket to JOSM bugtracker"
-msgstr ""
+msgstr "Hibajegy felvétele a JOSM hibakövetőjébe"
msgid "Restart"
msgstr "Újraindítás"
@@ -1949,19 +1949,19 @@ msgid "Error during download"
msgstr "Hiba a letöltés közben"
msgid "Add a new Note"
-msgstr ""
+msgstr "Új Jegyzet hozzáadása"
msgid "Add note mode"
-msgstr ""
+msgstr "Jegyzet hozzáadása mód"
msgid "Click the location where you wish to create a new note"
-msgstr ""
+msgstr "Kattints arra a helyre, amihez jegyzetet akarsz írni"
msgid "Enter a comment for a new note"
-msgstr ""
+msgstr "Add meg az új jegyzet leírását"
msgid "Create new note"
-msgstr ""
+msgstr "Új jegyzet létrehozása"
msgid "Delete Mode"
msgstr "Törlési mód"
@@ -3865,17 +3865,19 @@ msgid "House number too far from street"
msgstr "Házszám túl távol van az úttól"
msgid "API Capabilities"
-msgstr ""
+msgstr "API képességek"
msgid "Checks for errors against API capabilities"
-msgstr ""
+msgstr "API képességek hibáinak ellenőrzése"
msgid ""
"Way contains more than {0} nodes. It should be replaced by a multipolygon"
msgstr ""
+"A vonalt több, mint {0} pontot tartalmaz. Le kéne cserélni multipoligonra"
msgid "Way contains more than {0} nodes. It should be split or simplified"
msgstr ""
+"A vonalt több, mint {0} pontot tartalmaz. El kéne vágni, vagy egyszerűsíteni"
msgid "Barriers and entrances"
msgstr "Akadályok és bejáratok"
@@ -6345,6 +6347,16 @@ msgid ""
"<tt>°</tt>, <tt>'</tt>, <tt>′</tt>, <tt>"</tt>, "
"<tt>″</tt> are optional.<br/><br/>Some examples:<ul>{0}</ul>"
msgstr ""
+"Add meg az új pont koordinátáit.<br/>A szélességet és hosszúságot "
+"elválaszthatod szóközzel, vesszővel vagy pontosvesszővel.<br/>Használj "
+"pozitív számokat vagy N, E karaktereket az északi és keleti irány "
+"jelöléséhez..<br/>A déli és nyugati irányhoz negatív számokat, vagy S és W "
+"karaktereket tudsz használni.<br/>A koortináták at három formátumban tudod "
+"megadni:<ul><li><i>fok</i><tt>°</tt></li><li><i>fok</i><tt>°</tt> "
+"<i>perc</i><tt>'</tt></li><li><i>fok</i><tt>°</tt> "
+"<i>perc</i><tt>'</tt> <i>másodperc</i><tt>"</tt></li></ul>A "
+"<tt>°</tt>, <tt>'</tt>, <tt>′</tt>, <tt>"</tt>, "
+"<tt>″</tt> szimbólumok opcionálisak.<br/><br/>Néhány példa:<ul>{0}</ul>"
msgid "Projected coordinates:"
msgstr "Vetített koordináták:"
@@ -6521,40 +6533,40 @@ msgid "Style settings"
msgstr "Stílusbeállítások"
msgid "Customize the style"
-msgstr ""
+msgstr "Stílus testreszabása"
msgid "Add comment"
-msgstr ""
+msgstr "Megjegyzés hozzáadása"
msgid "Comment"
msgstr "Megjegyzés"
msgid "Add comment to note:"
-msgstr ""
+msgstr "Megjegyzés hozzáadása a jegyzethez:"
msgid "Close note"
-msgstr ""
+msgstr "Jegyzet lezárása"
msgid "Close note with message:"
-msgstr ""
+msgstr "Jegyzet lezárása üzenettel:"
msgid "Close Note"
-msgstr ""
+msgstr "Jegyzet lezárása"
msgid "Create a new note"
-msgstr ""
+msgstr "Új jegyzet létrehozása"
msgid "Create"
-msgstr ""
+msgstr "Létrehozás"
msgid "Reopen note"
-msgstr ""
+msgstr "Jegyzet újranyitás"
msgid "Reopen"
-msgstr ""
+msgstr "Újra megnyitás"
msgid "Reopen note with message:"
-msgstr ""
+msgstr "Jegyzet újranyitása üzenettel:"
msgid "Object type:"
msgstr "Objektum típus:"
@@ -12147,6 +12159,9 @@ msgid ""
"(https) on localhost.<br>These ports are not configurable because they are "
"referenced by external applications talking to JOSM."
msgstr ""
+"A JOSM mindig figyel a <b>{0} porton</b> (http) és <b>{1} porton</b> "
+"(https), localhoston.<br>Ezek a portszámok nem konfigurálhatóak, mert JOSM-"
+"mel kommunikáló külső alkalmazások ezekre hivatkoznak."
msgid "Enable remote control"
msgstr "Távirányító engedélyezése"
@@ -13641,6 +13656,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -15317,6 +15338,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -18846,6 +18870,9 @@ msgstr "uszoda"
msgid "water_park"
msgstr "akvapark"
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Pálya típusa"
@@ -23371,15 +23398,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -27471,9 +27489,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/hy.po b/i18n/po/hy.po
index cb65422..dbfd96d 100644
--- a/i18n/po/hy.po
+++ b/i18n/po/hy.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2011-04-13 21:51+0000\n"
"Last-Translator: Gev777 <Unknown>\n"
"Language-Team: Armenian <hy at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:34+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:35+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: hy\n"
msgid "Cancel"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/ia.po b/i18n/po/ia.po
index 980959d..94feb34 100644
--- a/i18n/po/ia.po
+++ b/i18n/po/ia.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2011-08-29 01:02+0000\n"
"Last-Translator: Emilio Sepulveda <Unknown>\n"
"Language-Team: Interlingua <ia at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:56+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:59+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: ia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/id.po b/i18n/po/id.po
index a06ee70..1b972c1 100644
--- a/i18n/po/id.po
+++ b/i18n/po/id.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-10-16 10:41+0000\n"
"Last-Translator: Trisno Pamuji <tri.snowman at gmail.com>\n"
"Language-Team: Indonesian <id at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:57+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:59+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: id\n"
"X-Language: id_ID\n"
@@ -13480,6 +13480,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -15327,6 +15333,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Plugin untuk tanda digital OSM-Data"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -18869,6 +18878,9 @@ msgstr "kolam_renang"
msgid "water_park"
msgstr "taman_air"
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Tipe landasan"
@@ -23502,15 +23514,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -27833,9 +27836,6 @@ msgstr "Siman informasi penyimpanan data terpisah saat ini kedalam berkas"
msgid "Save SDS file"
msgstr "Simpan file SDS"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Tidak dapat membuat cadangan file. Pengecualian adalah: {0}"
-
msgid "Simplify Area"
msgstr "Sederhanakan area"
diff --git a/i18n/po/is.po b/i18n/po/is.po
index ee04cc6..419c601 100644
--- a/i18n/po/is.po
+++ b/i18n/po/is.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2013-03-30 13:49+0000\n"
"Last-Translator: Pjetur G. Hjaltason <pjetur at pjetur.net>\n"
"Language-Team: Icelandic <is at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:56+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:58+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: is\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12601,6 +12601,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14221,6 +14227,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17742,6 +17751,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22263,15 +22275,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26359,9 +26362,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/it.po b/i18n/po/it.po
index 41af1c8..9111627 100644
--- a/i18n/po/it.po
+++ b/i18n/po/it.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm 20081003\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
-"PO-Revision-Date: 2014-10-15 19:46+0000\n"
-"Last-Translator: Silvio Brera <Unknown>\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"PO-Revision-Date: 2014-10-19 23:09+0000\n"
+"Last-Translator: Don-vip <Unknown>\n"
"Language-Team: Italian <talk-it at lists.openstreetmap.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:58+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:01+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: it\n"
"X-Language: it_IT\n"
"X-Source-Language: en\n"
@@ -226,7 +226,7 @@ msgid "Please select the target layer."
msgstr "Selezionare il livello di riferimento."
msgid "Select target layer"
-msgstr "Seleziona il livello di riferimento."
+msgstr "Seleziona il livello di riferimento"
msgid "Merge"
msgstr "Unisci"
@@ -1236,7 +1236,7 @@ msgid "Report bug"
msgstr "Segnala bug"
msgid "Report a ticket to JOSM bugtracker"
-msgstr ""
+msgstr "Segnala un errore a bugtracker di JOSM"
msgid "Restart"
msgstr "Riavvia"
@@ -3902,7 +3902,7 @@ msgid "Running test {0}"
msgstr "Esecuzione controllo {0}"
msgid "E-mail address contains non-ascii characters"
-msgstr "L'indirizzo e-mail contiene caratteri non ascii"
+msgstr "L''indirizzo e-mail contiene caratteri non ascii"
msgid "E-mail address is invalid"
msgstr "Indirizzo e-mail non valido"
@@ -3932,7 +3932,7 @@ msgid "URL contains an invalid query: {0}"
msgstr "L\"URL contiene una query non-valida: {0}"
msgid "URL contains an invalid fragment: {0}"
-msgstr ""
+msgstr "L''URL contiene un frammento non valido: {0}"
msgid "Addresses"
msgstr "Indirizzi"
@@ -4537,7 +4537,7 @@ msgid "Could not find warning level"
msgstr "Impossibile trovare il livello di avvertimento"
msgid "Illegal expression ''{0}''"
-msgstr "Espressione illegale \"{0}\""
+msgstr "Espressione illegale ''{0}''"
msgid "Illegal regular expression ''{0}''"
msgstr "Espressione regolare \"{0}\" non valida"
@@ -8291,7 +8291,7 @@ msgid "Querying name server ..."
msgstr "Interrogazione del server dei nomi ..."
msgid "Error occured with query ''{0}'': ''{1}''"
-msgstr ""
+msgstr "Errore con la query ''{0}'': ''{1}''"
msgid "Name server returned invalid data. Please try again."
msgstr ""
@@ -8625,7 +8625,7 @@ msgid "Object still in use"
msgstr "Oggetto ancora in uso"
msgid "Error header \"{0}\" did not match with an expected pattern"
-msgstr "La testata d''errore \"{0}\" non corrisponde con uno schema atteso"
+msgstr "La testata d''errore ''{0}'' non corrisponde con uno schema atteso"
msgid "Upload"
msgstr "Carica"
@@ -14217,6 +14217,12 @@ msgstr "Le longitudini devono essere comprese fra {0} e {1}"
msgid "The minima must be less than the maxima"
msgstr "Il minimo deve essere minore del massimo"
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -16246,6 +16252,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Estensione per firmare digitalmente i dati OSM"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -19810,6 +19819,9 @@ msgstr "piscina"
msgid "water_park"
msgstr "parco acquatico"
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Tipo di pista"
@@ -20728,7 +20740,7 @@ msgid "kaplan_turbine"
msgstr "turbina Kaplan"
msgid "run-of-the-river / water-storage"
-msgstr "a filo d''acqua / stoccaggio d'acqua"
+msgstr "a filo d''acqua / stoccaggio d''acqua"
msgid "pelton_turbine"
msgstr "turbina Pelton"
@@ -21355,7 +21367,7 @@ msgid "Bed"
msgstr "Letto"
msgid "Interior Decoration"
-msgstr "Decorazione d'interni"
+msgstr "Decorazione d''interni"
msgid "Antiques"
msgstr "Antichità"
@@ -21580,10 +21592,10 @@ msgid "Farm"
msgstr "Fattoria"
msgid "A farm within a bigger settlement"
-msgstr ""
+msgstr "Una fattoria all''interno di un insediamento più grande"
msgid "(please use isolated_dwelling for an isolated farm)"
-msgstr ""
+msgstr "(utilizzare isolated_dwelling per una fattoria isolata)"
msgid "Isolated Dwelling"
msgstr "Insediamento rurale isolato"
@@ -21613,12 +21625,14 @@ msgid ""
"A persistent body of dense ice that is constantly moving under its own "
"weight."
msgstr ""
+"Una persistente massa di ghiaccio che si muove costantemente sotto il "
+"proprio peso."
msgid "Volcano"
msgstr "Vulcano"
msgid "A volcano, either dormant, extinct or active."
-msgstr ""
+msgstr "Un vulcano attivo, inattivo, o estinto."
msgid "Current Status"
msgstr "Stato corrente"
@@ -21630,13 +21644,13 @@ msgid "extinct"
msgstr "estinto"
msgid "stratovolcano"
-msgstr ""
+msgstr "stratovulcano"
msgid "shield"
-msgstr ""
+msgstr "a scudo"
msgid "scoria"
-msgstr ""
+msgstr "di scorie"
msgid "Cave Entrance"
msgstr "Ingresso di una grotta"
@@ -21651,10 +21665,10 @@ msgid "Islet"
msgstr "Isoletta"
msgid "Ridge"
-msgstr ""
+msgstr "Cresta / crinale"
msgid "A mountain or hill ridge."
-msgstr ""
+msgstr "Il crinale di un monte o collina."
msgid "Nature"
msgstr "Natura"
@@ -21678,7 +21692,7 @@ msgid "Wood"
msgstr "Bosco"
msgid "Woodland where timber production does not dominate use."
-msgstr ""
+msgstr "Bosco la cui funzione prevalente non è la produzione di legname."
msgid "Forest"
msgstr "Foresta"
@@ -21690,6 +21704,8 @@ msgid ""
"Where vegetation is dominated by grasses (Poaceae) and other herbaceous (non-"
"woody) plants. Excludes cultivated areas and wetlands."
msgstr ""
+"Dove la vegetazione è dominata da graminacee (Poaceae) ed altre essenze "
+"erbacee (non legnose). Esclude le zone coltivate e le zone umide."
msgid "pampas"
msgstr "pampa argentina"
@@ -21725,6 +21741,8 @@ msgid ""
"Bare upper lying uncultivated land principally covered with grass and often "
"grazed."
msgstr ""
+"Terra incolta a quota superiore, essenzialmente coperta da erba e spesso "
+"pascolo."
msgid "Scrub"
msgstr "Boscaglia"
@@ -21732,6 +21750,8 @@ msgstr "Boscaglia"
msgid ""
"Bare lower lying uncultivated land with bushes but little or no tree cover."
msgstr ""
+"Terra incolta a bassa quota con cespugli, ma poca o nessuna copertura "
+"arborea."
msgid "Heath"
msgstr "Brughiera"
@@ -21741,6 +21761,9 @@ msgid ""
"free-draining infertile, acidic soils, and is characterised by open, low-"
"growing woody vegetation."
msgstr ""
+"Terreno incolto a bassa quota, con un habitat a macchia che si trova "
+"principalmente su terreni acidi, drenanti e infertili, caratterizzato da "
+"vegetazione aperta, boschiva a bassa crescita."
msgid "Sand"
msgstr "Sabbia"
@@ -21749,12 +21772,12 @@ msgid "Large area covered with sand."
msgstr "Ampia area coperta di sabbia."
msgid "Bare Rock"
-msgstr ""
+msgstr "Roccia nuda"
msgid ""
"For areas of solid visible rock that is sparsely vegetated or not vegetated "
"at all."
-msgstr ""
+msgstr "Zone di solida roccia visibile con vegetazione rada o inesistente."
msgid "Stone"
msgstr "Sasso"
@@ -21763,6 +21786,8 @@ msgid ""
"A single notable free-standing rock, which may differ from the composition "
"of the terrain it lies in."
msgstr ""
+"Un masso a sé stante, che può differire dalla composizione del terreno in "
+"cui si trova."
msgid "Land use"
msgstr "Uso del terreno"
@@ -21834,7 +21859,7 @@ msgid "Garages"
msgstr "Box per auto multipli"
msgid "Railway Land"
-msgstr ""
+msgstr "Uso ferrovia"
msgid "Military"
msgstr "Militare"
@@ -21891,7 +21916,7 @@ msgid "Street name"
msgstr "Nome Strada"
msgid "Place name"
-msgstr ""
+msgstr "Località"
msgid "City name"
msgstr "Nome città"
@@ -21900,10 +21925,10 @@ msgid "Country code"
msgstr "Codice nazione"
msgid "Optional values for specific countries"
-msgstr ""
+msgstr "Valori opzionali specifici per alcuni paesi"
msgid "Subdistrict"
-msgstr ""
+msgstr "Sottodistretto"
msgid "District"
msgstr "distretto"
@@ -21912,166 +21937,166 @@ msgid "Province"
msgstr "Provincia"
msgid "AL"
-msgstr ""
+msgstr "AL (USA)"
msgid "AK"
-msgstr ""
+msgstr "AK (USA)"
msgid "AZ"
-msgstr ""
+msgstr "AZ (USA)"
msgid "AR"
-msgstr ""
+msgstr "AR (USA)"
msgid "CA"
-msgstr ""
+msgstr "CA (USA)"
msgid "CO"
-msgstr ""
+msgstr "CO (USA)"
msgid "CT"
-msgstr ""
+msgstr "CT (USA)"
msgid "DE"
-msgstr ""
+msgstr "DE (USA)"
msgid "FL"
-msgstr ""
+msgstr "FL (USA)"
msgid "GA"
-msgstr ""
+msgstr "GA (USA)"
msgid "HI"
-msgstr ""
+msgstr "HI (USA)"
msgid "IL"
-msgstr ""
+msgstr "IL (USA)"
msgid "IN"
-msgstr ""
+msgstr "IN (USA)"
msgid "IA"
-msgstr ""
+msgstr "IA (USA)"
msgid "KS"
-msgstr ""
+msgstr "KS (USA)"
msgid "KY"
-msgstr ""
+msgstr "KY (USA)"
msgid "LA"
-msgstr ""
+msgstr "LA (USA)"
msgid "ME"
-msgstr ""
+msgstr "ME (USA)"
msgid "MD"
-msgstr ""
+msgstr "MD (USA)"
msgid "MA"
-msgstr ""
+msgstr "MA (USA)"
msgid "MI"
-msgstr ""
+msgstr "MI (USA)"
msgid "MN"
-msgstr ""
+msgstr "MN (USA)"
msgid "MS"
-msgstr ""
+msgstr "MS (USA)"
msgid "MO"
-msgstr ""
+msgstr "MO (USA)"
msgid "MT"
-msgstr ""
+msgstr "MT (USA)"
msgid "NE"
-msgstr ""
+msgstr "NE (USA)"
msgid "NV"
-msgstr ""
+msgstr "NV (USA)"
msgid "NH"
-msgstr ""
+msgstr "NH (USA)"
msgid "NJ"
-msgstr ""
+msgstr "NJ (USA)"
msgid "NM"
-msgstr ""
+msgstr "NM (USA)"
msgid "NY"
-msgstr ""
+msgstr "NY (USA)"
msgid "NC"
-msgstr ""
+msgstr "NC (USA)"
msgid "ND"
-msgstr ""
+msgstr "ND (USA)"
msgid "OH"
-msgstr ""
+msgstr "OH (USA)"
msgid "OR"
-msgstr ""
+msgstr "OR (USA)"
msgid "PA"
-msgstr ""
+msgstr "PA (USA)"
msgid "RI"
-msgstr ""
+msgstr "RI (USA)"
msgid "SC"
-msgstr ""
+msgstr "SC (USA)"
msgid "SD"
-msgstr ""
+msgstr "SD (USA)"
msgid "TN"
-msgstr ""
+msgstr "TN (USA)"
msgid "TX"
-msgstr ""
+msgstr "TX (USA)"
msgid "UT"
-msgstr ""
+msgstr "UT (USA)"
msgid "VT"
-msgstr ""
+msgstr "VT (USA)"
msgid "VA"
-msgstr ""
+msgstr "VA (USA)"
msgid "WA"
-msgstr ""
+msgstr "WA (USA)"
msgid "WV"
-msgstr ""
+msgstr "WV (USA)"
msgid "WI"
-msgstr ""
+msgstr "WI (USA)"
msgid "DC"
-msgstr ""
+msgstr "DC (USA)"
msgid "AS"
-msgstr ""
+msgstr "AS (USA)"
msgid "GU"
-msgstr ""
+msgstr "GU (USA)"
msgid "MP"
-msgstr ""
+msgstr "MP (USA)"
msgid "PR"
-msgstr ""
+msgstr "PR (USA)"
msgid "UM"
-msgstr ""
+msgstr "UM (USA)"
msgid "VI"
-msgstr ""
+msgstr "VI (USA)"
msgid "Address Interpolation"
msgstr "Interpolazione indirizzo"
@@ -22107,7 +22132,7 @@ msgid "Image"
msgstr "Immagine"
msgid "Contact (Schema with ''contact:*'' Prefix)"
-msgstr ""
+msgstr "Contatto (Schema con ''contatto:*'' Prefisso)"
msgid "outer segment"
msgstr "segmento esterno"
@@ -22284,7 +22309,7 @@ msgid "natural"
msgstr "elemento naturale"
msgid "Piste Route"
-msgstr ""
+msgstr "Piste"
msgid "link segment"
msgstr "segmento di collegamento"
@@ -22305,7 +22330,7 @@ msgid "alpine"
msgstr "alpino"
msgid "Detour Route"
-msgstr ""
+msgstr "Deviazione"
msgid "Destination"
msgstr "Destinazione"
@@ -22317,13 +22342,13 @@ msgid "fork node for alternative routes"
msgstr "nodo del bivio per percorsi alternativi"
msgid "Power Route"
-msgstr ""
+msgstr "Linee elettriche"
msgid "Railway Route"
-msgstr ""
+msgstr "Ferrovia"
msgid "Road Route"
-msgstr ""
+msgstr "Strada"
msgid "Route Network"
msgstr "Rete itinerari"
@@ -22470,308 +22495,311 @@ msgid "Test"
msgstr "Test"
msgid "Landsat"
-msgstr ""
+msgstr "Landsat"
msgid "Yahoo Sat"
-msgstr ""
+msgstr "Yahoo Sat"
msgid "Bing Sat"
msgstr "Bing Sat"
msgid "HDM (Humanitarian OpenStreetMap Team)"
-msgstr ""
+msgstr "HDM (gruppo OSM a scopo umanitario)"
msgid "MapBox Satellite"
-msgstr ""
+msgstr "MapBox Satellite"
msgid "MapQuest Open Aerial"
-msgstr ""
+msgstr "MapQuest Open Aerial"
msgid "OpenStreetMap GPS Traces"
-msgstr ""
+msgstr "Tracce GPS OpenStreetMap"
msgid "OpenStreetMap (Mapnik)"
-msgstr ""
+msgstr "OpenStreetMap (Mapnik)"
msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr ""
+msgstr "OpenStreetMap (Mapnik bianco-nero)"
msgid "OpenStreetMap (Mapnik, no labels)"
-msgstr ""
+msgstr "OpenStreetMap (Mapnik, senza etichette)"
msgid "skobbler"
msgstr ""
msgid "skobbler heatmap"
-msgstr ""
+msgstr "Heatmap di Skobbler(c)"
msgid "OpenCycleMap"
-msgstr ""
+msgstr "OpenCycleMap"
msgid "MapQuest OSM"
-msgstr ""
+msgstr "MapQuest OSM"
msgid "Public Transport (ÖPNV)"
-msgstr ""
+msgstr "Trasporto pubblico locale (TPL)"
msgid "OpenStreetMap (German Style)"
-msgstr ""
+msgstr "OpenStreetMap (Stile tedesco)"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr ""
+msgstr "Cambodia, Laos, Thailand, Vietnam bilingua"
msgid "osmfr"
-msgstr ""
+msgstr "osmfr"
msgid "OpenPT Map (overlay)"
-msgstr ""
+msgstr "OpenPT Map (sovrapposta)"
msgid "Strava cycling heatmap"
-msgstr ""
+msgstr "Mappa per il ciclismo di Strava (c)"
msgid "Strava running heatmap"
-msgstr ""
+msgstr "Mappa per la corsa di Strava (c)"
msgid "AGRI black-and-white 2.5m"
-msgstr ""
+msgstr "AGRI bianco-nero 2.5m"
msgid "Geoimage.at MaxRes"
-msgstr ""
+msgstr "Geoimage.at MaxRes"
msgid "basemap.at"
-msgstr ""
+msgstr "basemap.at"
msgid "Graz: Basiskarte (base map)"
-msgstr ""
+msgstr "Graz: Basiskarte (mappa base)"
msgid "Tiris: DGM (Terrain model)"
-msgstr ""
+msgstr "Tiris: DGM (modello del terreno)"
msgid "Tiris: DOM (Surface model)"
-msgstr ""
+msgstr "Tiris: DOM (modello superficie)"
msgid "Vienna: Mehrzweckkarte (general purpose)"
-msgstr ""
+msgstr "Vienna: Mehrzweckkarte (mappa di vienne uso generico)"
msgid "Vienna: Beschriftungen (annotations)"
-msgstr ""
+msgstr "Vienna: Beschriftungen (annotazioni)"
msgid "Vienna: Orthofoto (aerial image)"
-msgstr ""
+msgstr "Vienna: Orthofoto (immagini aeree)"
msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
-msgstr ""
+msgstr "VoGIS: Immagine a colori veri 2012 (12cm)"
msgid "VoGIS: Flächenwidmungsplan"
-msgstr ""
+msgstr "VoGIS: Piano di destinazione del terreno"
msgid "VoGIS: DGM (Terrain model)"
-msgstr ""
+msgstr "VoGIS: DGM (modello del terreno)"
msgid "VoGIS: DOM (Surface model)"
-msgstr ""
+msgstr "VoGIS: DOM (modello superficie)"
msgid "IBGE Mapa de Setores Urbanos"
-msgstr ""
+msgstr "IBGE Mappa dei Settori Urbani"
msgid "IBGE Mapa de Setores Rurais"
-msgstr ""
+msgstr "IBGE Mappa dei Settori Rurali"
msgid "Geobase Hydrography"
msgstr ""
msgid "Geobase Roads"
-msgstr ""
+msgstr "Geobase strade"
msgid "Canvec"
-msgstr ""
+msgstr "Canvec"
msgid "British Columbia Mosaic"
-msgstr ""
+msgstr "Mosaico British Columbia"
msgid "Czech CUZK:KM"
-msgstr ""
+msgstr "Rep. Ceca CUZK:KM"
msgid "Czech RUIAN budovy"
-msgstr ""
+msgstr "Rep. Ceca RUIAN edificio"
msgid "Czech RUIAN parcely"
-msgstr ""
+msgstr "Rep.Ceca RUIAN terreni"
msgid "Czech pLPIS"
-msgstr ""
+msgstr "Rep. Ceca pLPIS"
msgid "Fugro (Denmark)"
-msgstr ""
+msgstr "Fugro (Danimarca)"
msgid "Geodatastyrelsen (Denmark)"
-msgstr ""
+msgstr "Geodatastyrelsen (Danimarca)"
msgid "Stevns (Denmark)"
-msgstr ""
+msgstr "Stevns (Danimarca)"
msgid "Vejmidte (Denmark)"
-msgstr ""
+msgstr "Vejmidte (Danimarca)"
msgid "Estonia Basemap (Maaamet)"
-msgstr ""
+msgstr "Estonia Basemap (Maaamet)"
msgid "Estonia Ortho (Maaamet)"
-msgstr ""
+msgstr "Estonia Ortho (Maaamet)"
msgid "Estonia Multi (Maaamet)"
-msgstr ""
+msgstr "Estonia Multi (Maaamet)"
msgid "Bordeaux - 2012"
-msgstr ""
+msgstr "Bordeaux - 2012"
msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr ""
+msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr ""
+msgstr "CRAIG - Moulins 2009 - 15 cm"
msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr ""
+msgstr "CRAIG - Montluçon 2009 - 15 cm"
msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr ""
+msgstr "CRAIG - Vichy 2009 - 15 cm"
msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr ""
+msgstr "CRAIG - Le Puy 2010 - 15 cm"
msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
+msgstr "CRIGE PACA Alpei-Marittime 2009 - 40 cm"
msgid "CUGN Nancy - Orthophoto 2012"
-msgstr ""
+msgstr "CUGN Nancy - Ortofoto 2012"
msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr ""
+msgstr "Géobretagne - Brest 2010 - 10 cm"
msgid "Géobretagne - Morbihan 2010"
-msgstr ""
+msgstr "Géobretagne - Morbihan 2010"
msgid "Géolittoral - Orthophotos 2000"
-msgstr ""
+msgstr "Géolittoral - Ortofoto 2000"
msgid "Géolittoral V2 - Orthophotos 2010-2012"
-msgstr ""
+msgstr "Géolittoral V2 - Ortofoto 2010-2012"
msgid "Géolittoral - Sentiers"
-msgstr ""
+msgstr "Géolittoral - Sentieri"
msgid "Grand Lyon - Orthophotographie 2012 - 10cm"
-msgstr ""
+msgstr "Grand Lyon - Ortofoto 2012 - 10cm"
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
-msgstr ""
+msgstr "Loire-Atlantique - Ortofoto 2012 - 20 cm"
msgid "Toulouse - Orthophotoplan 2013"
-msgstr ""
+msgstr "Toulouse - Ortofoto 2013"
msgid "Toulouse - Orthophotoplan 2011"
-msgstr ""
+msgstr "Toulouse - Ortofoto 2011"
msgid "Toulouse - Orthophotoplan 2007"
-msgstr ""
+msgstr "Toulouse - Ortofoto 2007"
msgid "Tours - Orthophotos 2013"
-msgstr ""
+msgstr "Tours - Ortofoto 2013"
msgid "Tours - Orthophotos 2008-2010"
-msgstr ""
+msgstr "Tours - Ortofoto 2008-2010"
msgid "Tours - Orthophotos 2008"
-msgstr ""
+msgstr "Tours - Ortofoto 2008"
msgid ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
"- 1 m"
msgstr ""
+"Vercors - Riserva naturale degli Altipiani di Vercors - Ortofoto 1999 - 1 m"
msgid "Streets NRW Geofabrik.de"
-msgstr ""
+msgstr "Strade NRW Geofabrik.de"
msgid "Hike & Bike"
-msgstr ""
+msgstr "Hike & Bike"
msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
+msgstr "OpenStreetMap (Lingue Sorabe)"
msgid "Hamburg (40 cm)"
-msgstr ""
+msgstr "Amburgo (40 cm)"
msgid "Hamburg (DK5)"
-msgstr ""
+msgstr "Amburgo (DK5)"
msgid "Bavaria (2 m)"
-msgstr ""
+msgstr "Bavaria (2 m)"
msgid "Stuttgart (Luftbild)"
-msgstr ""
+msgstr "Stuttgart (Luftbild)"
msgid "Erlangen 2013 Luftbild (6,25 cm)"
-msgstr ""
+msgstr "Erlangen 2013 Luftbild (6,25 cm)"
msgid "Erlangen 2011 Luftbild (5,0 cm)"
-msgstr ""
+msgstr "Erlangen 2011 Luftbild (5,0 cm)"
msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
-msgstr ""
+msgstr "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgstr ""
+msgstr "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgid "Physical DE - Physische Karte (Naturräume)"
-msgstr ""
+msgstr "Physical DE - Physische Karte (Naturräume)"
msgid "Physical DE:Harz - Physische Karte (Naturräume)"
-msgstr ""
+msgstr "Physical DE:Harz - Physische Karte (Naturräume)"
msgid ""
"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
"nutzen)"
msgstr ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
-msgstr ""
+msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgid "NRW-Atlas: Automatisierte Liegenschaftskarte (Vektor)"
-msgstr ""
+msgstr "NRW-Atlas: Automatisierte Liegenschaftskarte (Vektor)"
msgid "NRW-Atlas: Automatisierte Liegenschaftskarte (Raster)"
-msgstr ""
+msgstr "NRW-Atlas: Automatisierte Liegenschaftskarte (Raster)"
msgid "NRW-Atlas: Digitale GrundKarte 1:5000"
-msgstr ""
+msgstr "NRW-Atlas: Digitale GrundKarte 1:5000"
msgid "NRW-Atlas: Luftbilder"
-msgstr ""
+msgstr "NRW-Atlas: Luftbilder"
msgid "NRW-Atlas: Topographische Karte 1:10000"
-msgstr ""
+msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Drone Imagery (Haiti)"
-msgstr ""
+msgstr "Drone Imagery (Haiti)"
msgid "Drone Imagery 2014 (Haiti)"
-msgstr ""
+msgstr "Drone Imagery 2014 (Haiti)"
msgid "Ireland British War Office 1:25k GSGS 3906"
-msgstr ""
+msgstr "Ireland British War Office 1:25k GSGS 3906"
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
-msgstr ""
+msgstr "Ireland British War Office One-Inch 1941-43 GSGS 4136"
msgid "Ireland Bartholomew Quarter-Inch 1940"
-msgstr ""
+msgstr "Ireland Bartholomew Quarter-Inch 1940"
msgid "Ireland EEA GMES Urban Atlas"
-msgstr ""
+msgstr "Ireland EEA GMES Urban Atlas"
msgid "Ireland EEA CORINE 2006"
-msgstr ""
+msgstr "Ireland EEA CORINE 2006"
msgid "Lodi - Italy"
msgstr "Lodi - Italia"
@@ -22792,274 +22820,274 @@ msgid "PCN 2012 - Italy"
msgstr "PCN 2012 - Italia"
msgid "USSR - Latvia"
-msgstr ""
+msgstr "USSR - Lettonia"
msgid "50cm ortho - Latvia"
-msgstr ""
+msgstr "50cm ortofoto - Lettonia"
msgid "20cm ortho - Latvia - Coastline"
-msgstr ""
+msgstr "20cm ortofoto - Lettonia - Linea costiera"
msgid "ORT10LT (Lithuania)"
-msgstr ""
+msgstr "ORT10LT (Lituania)"
msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
+msgstr "Lussemburgo Inspire Orto 2010"
msgid "Luxembourg Inspire Ortho 2013"
-msgstr ""
+msgstr "Lussemburgo Inspire Orto 2013"
msgid "Luxembourg Inspire Railway"
-msgstr ""
+msgstr "Lussemburgo Inspire Ferrovia"
msgid "Luxembourg Inspire Roads"
-msgstr ""
+msgstr "Lussemburgo Inspire Strade"
msgid "Niger Delta Oct 2012 Landsat"
-msgstr ""
+msgstr "Delta del Niger Ott 2012 Landsat"
msgid "Gaza Strip - Pléiades - 2014/07/06"
-msgstr ""
+msgstr "Gaza Strip - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
-msgstr ""
+msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr ""
+msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
msgid "Geoportal 2: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Geoportal 2: Ortofotomapa (aerial image)"
msgid "Geoportal 2: PRNG (geo names)"
-msgstr ""
+msgstr "Geoportal 2: PRNG (geo names)"
msgid "Będzin: Ortofotomapa 2013 (aerial image)"
-msgstr ""
+msgstr "Będzin: Ortofotomapa 2013 (aerial image)"
msgid "Będzin: Budynki (buildings)"
-msgstr ""
+msgstr "Będzin: Budynki (buildings)"
msgid "Bytom: Ortofotomapa 2012 (aerial image)"
-msgstr ""
+msgstr "Bytom: Ortofotomapa 2012 (aerial image)"
msgid "Bytom: Budynki (buildings)"
-msgstr ""
+msgstr "Bytom: Budynki (buildings)"
msgid "Chorzów: Budynki (buildings)"
-msgstr ""
+msgstr "Chorzów: Budynki (buildings)"
msgid "Częstochowa: Ortofotomapa 2011 (aerial image)"
-msgstr ""
+msgstr "Częstochowa: Ortofotomapa 2011 (aerial image)"
msgid "Gliwice: Ortofotomapa 2013 (aerial image)"
-msgstr ""
+msgstr "Gliwice: Ortofotomapa 2013 (aerial image)"
msgid "Gliwice: Budynki (buildings)"
-msgstr ""
+msgstr "Gliwice: Budynki (buildings)"
msgid "Katowice: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Katowice: Ortofotomapa (aerial image)"
msgid "Łódź: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Łódź: Ortofotomapa (aerial image)"
msgid "Ruda Śląska: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Ruda Śląska: Ortofotomapa (aerial image)"
msgid "Rzeszów: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Rzeszów: Ortofotomapa (aerial image)"
msgid "Rzeszów: Budynki (buildings)"
-msgstr ""
+msgstr "Rzeszów: Budynki (buildings)"
msgid "Siemianowice Śląskie: Ortofotomapa (aerial image)"
-msgstr ""
+msgstr "Siemianowice Śląskie: Ortofotomapa (aerial image)"
msgid "Świętochłowice: Ortofotomapa 2009 (aerial image)"
-msgstr ""
+msgstr "Świętochłowice: Ortofotomapa 2009 (aerial image)"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
-msgstr ""
+msgstr "Zabrze: Ortofotomapa 2011 (aerial image)"
msgid "trail.pl: Szlaki (paths)"
-msgstr ""
+msgstr "trail.pl: Szlaki (paths)"
msgid "ScanEx IRS"
-msgstr ""
+msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
-msgstr ""
+msgstr "ScanEx SPOT"
msgid "Freemap.sk Car"
-msgstr ""
+msgstr "Freemap.sk Car"
msgid "Freemap.sk Hiking"
-msgstr ""
+msgstr "Freemap.sk Hiking"
msgid "Freemap.sk Cyclo"
-msgstr ""
+msgstr "Freemap.sk Cyclo"
msgid "Freemap.sk Ski"
-msgstr ""
+msgstr "Freemap.sk Ski"
msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
+msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
+msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
+msgstr "Slovakia EEA GMES Urban Atlas"
msgid "Slovakia EEA CORINE 2006"
-msgstr ""
+msgstr "Slovakia EEA CORINE 2006"
msgid "Slovakia Historic Maps"
-msgstr ""
+msgstr "Slovakia Historic Maps"
msgid "South Africa CD:NGI Aerial"
-msgstr ""
+msgstr "South Africa CD:NGI Aerial"
msgid "Catastro Spain"
-msgstr ""
+msgstr "Catastro Spain"
msgid "PNOA Spain"
-msgstr ""
+msgstr "PNOA Spagna"
msgid "SIGPAC Spain"
-msgstr ""
+msgstr "SIGPAC Spagna"
msgid "GRAFCAN - Canary Islands"
-msgstr ""
+msgstr "GRAFCAN - Canary Islands"
msgid "ITACyL - Castile and León"
-msgstr ""
+msgstr "ITACyL - Castile and León"
msgid "IDEIB - Balearic Islands"
-msgstr ""
+msgstr "IDEIB - Balearic Islands"
msgid "GRAFCAN Express - Canary Islands"
-msgstr ""
+msgstr "GRAFCAN Express - Canary Islands"
msgid "Kanton Aargau 25cm (AGIS 2011)"
-msgstr ""
+msgstr "Kanton Aargau 25cm (AGIS 2011)"
msgid "Stadt Uster Orthophoto 2008 10cm"
-msgstr ""
+msgstr "Stadt Uster Orthophoto 2008 10cm"
msgid "Stadtplan Zürich"
-msgstr ""
+msgstr "Stadtplan Zürich"
msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
-msgstr ""
+msgstr "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
msgid "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
-msgstr ""
+msgstr "Orthofoto Kanton Solothurn RGB (SOGIS 2011/2012/2013)"
msgid "Orthofoto Kanton Solothurn Infrarot (SOGIS 2011/2012/2013)"
-msgstr ""
+msgstr "Orthofoto Kanton Solothurn Infrarot (SOGIS 2011/2012/2013)"
msgid "Canton de Génève 5cm (SITG 2011)"
-msgstr ""
+msgstr "Canton de Génève 5cm (SITG 2011)"
msgid "Canton de Neuchâtel 50cm (SITN 2006)"
-msgstr ""
+msgstr "Canton de Neuchâtel 50cm (SITN 2006)"
msgid "Canton du Jura 50cm (RCJU 1998)"
-msgstr ""
+msgstr "Canton du Jura 50cm (RCJU 1998)"
msgid "Canton de Fribourg 50cm (2005)"
-msgstr ""
+msgstr "Canton de Fribourg 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr ""
+msgstr "Stadt Bern 10cm/25cm (2008)"
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr ""
+msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
-msgstr ""
+msgstr "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgid "Cartoriviera - Orthophoto 2012"
-msgstr ""
+msgstr "Cartoriviera - Orthophoto 2012"
msgid "SIGIP - Orthophoto 2012"
-msgstr ""
+msgstr "SIGIP - Orthophoto 2012"
msgid "Lausanne - Orthophoto technique 2012"
-msgstr ""
+msgstr "Lausanne - Orthophoto technique 2012"
msgid "Bonvillars Orthophoto 2013"
-msgstr ""
+msgstr "Bonvillars Orthophoto 2013"
msgid "Fiez Orthophoto 2013"
-msgstr ""
+msgstr "Fiez Orthophoto 2013"
msgid "MSR Maps Topo"
-msgstr ""
+msgstr "MSR Maps Topo"
msgid "MSR Maps Urban"
-msgstr ""
+msgstr "MSR Maps Urban"
msgid "USGS Scanned Topographic Maps"
-msgstr ""
+msgstr "USGS Scanned Topographic Maps"
msgid "USGS Large Scale Imagery"
-msgstr ""
+msgstr "USGS Large Scale Imagery"
msgid "OSM US TIGER 2012 Roads Overlay"
-msgstr ""
+msgstr "OSM US TIGER 2012 Roads Overlay"
msgid "New & Misaligned TIGER Roads (TIGER 2013)"
-msgstr ""
+msgstr "New & Misaligned TIGER Roads (TIGER 2013)"
msgid "MassGIS L3 Parcels"
-msgstr ""
+msgstr "MassGIS L3 Parcels"
msgid "NC Latest Orthoimagery"
-msgstr ""
+msgstr "NC Latest Orthoimagery"
msgid "Ukraine - Orthophotomaps 2012"
-msgstr ""
+msgstr "Ukraine - Orthophotomaps 2012"
msgid "7th Series (OS7)"
-msgstr ""
+msgstr "7th Series (OS7)"
msgid "OS New Popular Edition historic"
-msgstr ""
+msgstr "OS New Popular Edition historic"
msgid "OS OpenData StreetView"
-msgstr ""
+msgstr "OS OpenData StreetView"
msgid "OS OpenData Locator"
-msgstr ""
+msgstr "OS OpenData Locator"
msgid "Surrey Air Survey"
-msgstr ""
+msgstr "Surrey Air Survey"
msgid "NLS - OS 6-inch Scotland 1842-82"
-msgstr ""
+msgstr "NLS - OS 6-inch Scotland 1842-82"
msgid "NLS - OS 1:25k 1st Series 1937-61"
-msgstr ""
+msgstr "NLS - OS 1:25k 1st Series 1937-61"
msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr ""
+msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
+msgstr "OS 1:25k historic (OSM-Best)"
msgid "OS 1:25k historic (OSM-Limited)"
-msgstr ""
+msgstr "OS 1:25k historic (OSM-Limited)"
msgid "OS Scottish Popular historic"
-msgstr ""
+msgstr "OS Scottish Popular historic"
msgid "NLS - Bartholomew Half Inch, 1897-1907"
-msgstr ""
+msgstr "NLS - Bartholomew Half Inch, 1897-1907"
msgid "OS Town Plans, Cupar 1854 (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Cupar 1854 (NLS)"
msgid "Decreasing house numbers in addresses interpolation"
msgstr "Decremento numeri civici in interpolazione indirizzi"
@@ -23126,7 +23154,7 @@ msgstr ""
msgid ""
"{0} is deprecated. Please delete this object and use a private layer instead"
msgstr ""
-"{0} è deprecato. Cancellare l'oggetto e utilizzare un livello privato"
+"{0} è deprecato. Cancellare l''oggetto e utilizzare un livello privato"
msgid "{0} on a node"
msgstr "{0} su un nodo"
@@ -23248,7 +23276,7 @@ msgstr "Nodi che duplicano le etichette del percorso a cui appartengono"
msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-"wikipedia-language non fornita, utilizzare ''wikipedia''=''language:page "
+"lingua wikipedia non fornita, utilizzare ''wikipedia''=''language:page "
"title''"
msgid "unknown language prefix in wikipedia tag"
@@ -23264,7 +23292,7 @@ msgid "Hide icons at low zoom"
msgstr "Nascondi icone a bassi livelli di zoom"
msgid "Less obtrusive node symbols at low zoom"
-msgstr ""
+msgstr "Simboli di nodo meno ingombranti a bassi livelli di zoom"
msgid "Display street labels (at high zoom)"
msgstr "Mostra etichette delle strade (ad alta livello di zoom)"
@@ -23336,18 +23364,23 @@ msgid ""
"No command has been found. Would you like to download and install default "
"commands now?"
msgstr ""
+"Non è stato trovato alcun comando. Scaricare e installare i comandi "
+"predefiniti ora?"
msgid "No command found"
msgstr "Nessun comando trovato"
msgid "Default commands have been successfully installed"
-msgstr ""
+msgstr "Comandi predefiniti caricati correttamente"
msgid ""
"Failed to download and install default commands.\n"
"\n"
"Error: {0}"
msgstr ""
+"Scaricamento dei comandi predefiniti fallito.\n"
+"\n"
+"Errore: {0}"
msgid "Processing..."
msgstr "Elaborazione in corso..."
@@ -24477,100 +24510,100 @@ msgid "Name:"
msgstr "Nome:"
msgid "updated building info"
-msgstr ""
+msgstr "informazioni building aggiornate"
msgid "Tag Element"
-msgstr ""
+msgstr "Etichetta per elemento"
msgid "Select an item to tag."
-msgstr ""
+msgstr "Selezionare un oggetto da etichettare."
msgid "Tag Building"
-msgstr ""
+msgstr "Etichetta per edificio"
msgid "Tools: {0}"
msgstr "strumenti: {0}"
msgid "Area Selection"
-msgstr ""
+msgstr "Selezione dell''area"
msgid "Select an area (e.g. building) from an underlying image."
-msgstr ""
+msgstr "Selezionare un''area (es. edificio) da da un''immagine sottostante."
msgid "Area Selector"
-msgstr ""
-
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
+msgstr "Selettore di area"
msgid "Created area"
-msgstr ""
+msgstr "Area creata"
msgid "Unable to detect a polygon where you clicked."
-msgstr ""
+msgstr "Impossibile rilevare poligono dove selezionato."
msgid "Error Report"
-msgstr ""
+msgstr "Rapporto di errore"
msgid "Something went wrong!"
-msgstr ""
+msgstr "Qualcosa è andato storto!"
msgid "Please file a bug report on the github project page under"
msgstr ""
+"Si prega di inviare una segnalazione di errore nella pagina del progetto "
+"GitHub seguente"
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 ""
+"Fateci sapere cosa avete fatto e che cosa è accaduto aggiungendo il seguente "
+"testo al rapporto di errore, in modo che possiamo trovare la fonte del "
+"problema."
msgid "Area detection algorithm settings."
-msgstr ""
+msgstr "Impostazioni algoritmo per le rilevazione dell''area."
msgid "Algorithm Settings"
-msgstr ""
+msgstr "Impostazioni dell''algoritmo"
msgid ""
"The color threshold defines how far the color can be of the original color "
"to be selected (Default: {0})."
msgstr ""
+"La soglia del colore stabilisce di quanto il colore da selezionare può "
+"essere diverso dall''originale (Default: {0})."
msgid "Color Threshold"
-msgstr ""
+msgstr "Soglia colore"
msgid ""
"Maximum distance away each point in the sequence can be from a line, in "
"pixels (Default: {0})."
msgstr ""
+"Distanza massima che ogni punto della sequenza può avere da una linea, in "
+"pixel (default: {0})."
msgid "Tolerance Distance"
-msgstr ""
+msgstr "Distanza di tolleranza"
msgid "Tolerance for fitting angles, in radians (Default {0})."
-msgstr ""
+msgstr "Tolleranza per il raccordo degli angoli, in radianti (Default {0})."
msgid "Tolerance Angle"
-msgstr ""
+msgstr "Angolo di tolleranza"
msgid "Plugin Settings"
-msgstr ""
+msgstr "Impostazione Plugin"
msgid "Show Address Dialog after mapping an area"
-msgstr ""
+msgstr "Mostra una finestra di dialogo Indirizzo dopo aver mappato un''area"
msgid "show address dialog"
-msgstr ""
+msgstr "mostra dialogo indirizzo"
msgid "Merge nodes with neighbors"
-msgstr ""
+msgstr "Unione dei nodi con quelli vicini"
msgid "merge nodes"
-msgstr ""
+msgstr "unione nodi"
msgid "Street Name:"
msgstr "Nome della strada:"
@@ -25296,8 +25329,8 @@ msgstr "Fonde una coppia di oggetti"
msgid "Added {0} object to subject layer"
msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Aggiunto {0} oggetto al livello subordinato"
+msgstr[1] "Aggiunti {0} oggetti al livello subordinato"
msgid "Conflation"
msgstr "Fusione"
@@ -25306,22 +25339,22 @@ msgid "Activates the conflation plugin"
msgstr "Attiva l''estensione di fusione"
msgid "Matches"
-msgstr ""
+msgstr "Corrispondenze"
msgid "Reference only"
-msgstr ""
+msgstr "Solo riferimento"
msgid "Subject only"
-msgstr ""
+msgstr "Solo soggetto"
msgid "Matches ({0})"
-msgstr ""
+msgstr "Corrispondenze ({0})"
msgid "Reference only ({0})"
-msgstr ""
+msgstr "Solo riferimenti ({0})"
msgid "Subject only ({0})"
-msgstr ""
+msgstr "Solo soggetto ({0})"
msgid "Configure conflation options"
msgstr "Configura le opzioni di fusione"
@@ -25330,10 +25363,10 @@ msgid "Delete {0} conflation matches"
msgstr "Elimina {0} corrispondenze fusione"
msgid "Remove {0} unmatched objects"
-msgstr ""
+msgstr "Rimuovi {0} oggeti non corrispondenti"
msgid "Remove selected matches"
-msgstr ""
+msgstr "Rimuovi le corrispondenze selezionate"
msgid "Conflate"
msgstr "Fondi"
@@ -25345,7 +25378,7 @@ msgid "Conflation: {0}"
msgstr "Fusione: {0}"
msgid "Cannot replace geometry."
-msgstr ""
+msgstr "Impossibile rimpiazzare la geometria."
msgid "Zoom to selected primitive(s)"
msgstr ""
@@ -28930,10 +28963,6 @@ msgstr ""
msgid "Save SDS file"
msgstr "Salva file SDS"
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-"Impossibile fare una copia di sicurezza del file. L''eccezione è: {0}"
-
msgid "Simplify Area"
msgstr "Semplifica Area"
diff --git a/i18n/po/ja.po b/i18n/po/ja.po
index f6eb9f4..ac50558 100644
--- a/i18n/po/ja.po
+++ b/i18n/po/ja.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-10-16 15:19+0000\n"
"Last-Translator: fujimoto <fujimoto at internet.ne.jp>\n"
"Language-Team: Japanese <tr at openstreetmap.jp>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:59+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:02+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"X-Poedit-Country: JAPAN\n"
"Language: ja\n"
"X-Poedit-Language: Japanese\n"
@@ -12818,6 +12818,12 @@ msgstr "経度は{0}～{1}の範囲でなければなりません。"
msgid "The minima must be less than the maxima"
msgstr "最小値は最大値より小さくなければなりません。"
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14516,6 +14522,9 @@ msgstr "地図から建物やその他のシェイプをトレースします。
msgid "Plugin to digital sign OSM-Data"
msgstr "OSMデータに電子署名をするプラグイン"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr "右左折レーンの追加、編集、削除用に直感的なGUIを提供します。"
@@ -18045,6 +18054,9 @@ msgstr "遊泳プール"
msgid "water_park"
msgstr "ウォーターパーク"
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "雪道の種類"
@@ -22662,15 +22674,6 @@ msgstr "下の画像から（建物などの）エリアを選択します。"
msgid "Area Selector"
msgstr "エリア選択ツール"
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr "作成されたエリア"
@@ -26856,9 +26859,6 @@ msgstr "現在のSDS情報をファイルに保存"
msgid "Save SDS file"
msgstr "SDSファイルを保存"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "ファイルをバックアップできません。例外: {0}"
-
msgid "Simplify Area"
msgstr "エリアを簡素化"
diff --git a/i18n/po/ka.po b/i18n/po/ka.po
index 9f3a1f4..cf967b8 100644
--- a/i18n/po/ka.po
+++ b/i18n/po/ka.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2011-12-16 00:14+0000\n"
"Last-Translator: datogogishvili <Unknown>\n"
"Language-Team: Georgian <ka at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:49+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:51+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: ka\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12555,6 +12555,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14171,6 +14177,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17692,6 +17701,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22213,15 +22225,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26309,9 +26312,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/km.po b/i18n/po/km.po
index 2887c1b..f7f099f 100644
--- a/i18n/po/km.po
+++ b/i18n/po/km.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
-"PO-Revision-Date: 2014-10-17 03:36+0000\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"PO-Revision-Date: 2014-10-20 09:38+0000\n"
"Last-Translator: Sophea Sok <sksophea at gmail.com>\n"
"Language-Team: Khmer <km at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:00+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:03+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2589,157 +2589,163 @@ msgid "''Baker Street'' in any key"
msgstr "''Baker Street'' in any key"
msgid "basics"
-msgstr ""
+msgstr "មូលដ្ឋាន"
msgid "''valuefragment'' anywhere in ''key''"
-msgstr ""
+msgstr "''valuefragment'' anywhere in ''key''"
msgid "''valuefragment'' nowhere in ''key''"
-msgstr ""
+msgstr "''valuefragment'' nowhere in ''key''"
msgid "''key'' with exactly ''value''"
-msgstr ""
+msgstr "''key'' ជាមួយ ''value'' ជាក់លាក់"
msgid "''key'' with any value"
-msgstr ""
+msgstr "''key'' ជាមួយតម្លៃណាមួយ"
msgid "''value'' in any key"
-msgstr ""
+msgstr "''value'' ក្នុងពាក្យគន្លឹះណាមួយ"
msgid "matches if ''key'' exists"
-msgstr ""
+msgstr "ផ្គូផ្គង បើ ''key'' មានស្រាប់"
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
-msgstr ""
+msgstr "ផ្គូផ្គង បើ ''key'' ធំជាង ''value'' (analogously, less than)"
msgid "combinators"
-msgstr ""
+msgstr "កម្មវិធីផ្សំ"
msgid "logical and (both expressions have to be satisfied)"
-msgstr ""
+msgstr "តក្កវិជ្ជា និង (កន្សោមទាំងពីរត្រូវតែសម)"
msgid "logical or (at least one expression has to be satisfied)"
-msgstr ""
+msgstr "ឈ្នាប់ឬ (យ៉ាងហោចកន្សោមមួយត្រូវតែសម)"
msgid "logical not"
-msgstr ""
+msgstr "ឈ្នាប់មិន"
msgid "use parenthesis to group expressions"
-msgstr ""
+msgstr "ប្រើវង់ក្រចកដើម្បីដាក់កន្សោមជាក្រុម"
msgid ""
"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
"<b>\\\\</b>)."
msgstr ""
+"ដើម្បីស្រង់សញ្ញាប្រមាណវិធី។<br>ជាមួយសញ្ញាសម្រង់ <b>\"</b> និង <b>\\"
+"</b> តួអក្សរចាំបាច់ត្រូវតែនាំមុខដោយ <b>\\</b> (ឧ. <b>\\\"</b> និង <b>\\\\"
+"</b>)។"
msgid "objects"
-msgstr ""
+msgstr "វត្ថុ"
msgid "all ways"
-msgstr ""
+msgstr "ផ្លូវទាំងអស់"
msgid "all relations"
-msgstr ""
+msgstr "ទំនាក់ទំនងទាំងអស់"
msgid "all closed ways"
-msgstr ""
+msgstr "ផ្លូវដែលបានបិទទាំងអស់"
msgid "object without useful tags"
-msgstr ""
+msgstr "វត្ថុដែលគ្មានស្លាកមានប្រយោជន៍"
msgid "metadata"
-msgstr ""
+msgstr "ទិន្នន័យមេតា"
msgid "objects changed by user"
-msgstr ""
+msgstr "បានប្ដូរវត្ថុដោយអ្នកប្រើ"
msgid "objects with given ID"
-msgstr ""
+msgstr "វត្ថុជាមួយលេខសម្គាល់ដែលបានផ្ដល់"
msgid "objects with given version"
-msgstr ""
+msgstr "វត្ថុជាមួយកំណែដែលបានផ្ដល់"
msgid "objects with given changeset ID"
-msgstr ""
+msgstr "វត្ថុជាមួយលេខសម្គាល់ changeset ដែលបានផ្ដល់"
msgid "objects with last modification timestamp within range"
-msgstr ""
+msgstr "វត្ថុជាមួយត្រាពេលវេលាដែលបានប្ដូរចុងក្រោយនៅក្នុងជួរ"
msgid "properties"
-msgstr ""
+msgstr "លក្ខណសម្បត្តិ"
msgid "objects with at least 20 nodes"
-msgstr ""
+msgstr "វត្ថុដែលមានតំណយ៉ាងហោច២០"
msgid "objects having 5 to 10 tags"
-msgstr ""
+msgstr "វត្ថុដែលមានស្លាកពី១០ ទៅ១៥"
msgid "objects with given role in a relation"
-msgstr ""
+msgstr "វត្ថុដែលមានមុខងារបានផ្ដល់នៅក្នុងទំនាក់ទំនង"
msgid "closed ways with an area of 100 m²"
-msgstr ""
+msgstr "ផ្លូវបិទជិតដែលមានក្រឡាផ្ទៃ 100 m²"
msgid "state"
-msgstr ""
+msgstr "ស្ថានភាព"
msgid "all modified objects"
-msgstr ""
+msgstr "វត្ថុដែលបានកែប្រែទាំងអស់"
msgid "all new objects"
-msgstr ""
+msgstr "វត្ថុថ្មីទាំងអស់"
msgid "all selected objects"
-msgstr ""
+msgstr "វត្ថុដែលបានជ្រើសទាំងអស់"
msgid "all incomplete objects"
-msgstr ""
+msgstr "វត្ថុដែលមិនបញ្ចប់ទាំងអស់"
msgid "related objects"
-msgstr ""
+msgstr "វត្ថុដែលពាក់ព័ន្ធ"
msgid "all children of objects matching the expression"
-msgstr ""
+msgstr "វត្ថុកូនទាំងអស់ដែលផ្គូផ្គងជាមួយកន្សោម"
msgid "all parents of objects matching the expression"
-msgstr ""
+msgstr "វត្ថុមេទាំងអស់ដែលផ្គូផ្គងជាមួយកន្សោម"
msgid "n-th member of relation and/or n-th node of way"
-msgstr ""
+msgstr "ធាតុ n-th របស់ទំនាក់ទំនង និង/ឬតំណ n-th របស់ផ្លូវ"
msgid "every n-th member of relation and/or every n-th node of way"
-msgstr ""
+msgstr "រាល់ធាតុ n-th របស់ទំនាក់ទំនង និង/ឬរាល់តំណ n-th របស់ផ្លូវ"
msgid "view"
-msgstr ""
+msgstr "ទិដ្ខភាព"
msgid "objects in current view"
-msgstr ""
+msgstr "វត្ថុនៅក្នុងទិដ្ឋភាពបច្ចុប្បន្ន"
msgid "objects (and all its way nodes / relation members) in current view"
msgstr ""
+"វត្ថុ (និងតំណផ្លូវ/ធាតុទំនាក់ទំនងរបស់វាទាំងអស់) "
+"នៅក្នុងទិដ្ឋភាពបច្ចុប្បន្ន"
msgid "objects in downloaded area"
-msgstr ""
+msgstr "វត្ថុនៅក្នុងតំបន់ទាញយក"
msgid "objects (and all its way nodes / relation members) in downloaded area"
msgstr ""
+"វត្ថុ (និងតំណផ្លូវ/ធាតុទំនាក់ទំនងរបស់វាទាំងអស់) នៅក្នុងតំបន់ទាញយក"
msgid "No match found for ''{0}''"
-msgstr ""
+msgstr "រកមិនឃើញការផ្គូផ្គងសម្រាប់ ''{0}''"
msgid "Nothing added to selection by searching for ''{0}''"
-msgstr ""
+msgstr "មិនបានបន្ថែមអ្វីទៅជម្រើសតាមរយៈការស្វែងរកសម្រាប់ ''{0}''"
msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr ""
+msgstr "មិនបានលុបអ្វីចេញពីជម្រើសតាមរយៈការស្វែងរកសម្រាប់ ''{0}''"
msgid "Nothing found in selection by searching for ''{0}''"
-msgstr ""
+msgstr "រកមិនឃើញអ្វីតាមរយៈការស្វែងរកសម្រាប់ ''{0}''"
msgid "Found {0} matches"
-msgstr ""
+msgstr "បានរកឃើញការផ្គូផ្គង {0}"
msgctxt "search"
msgid "CS"
@@ -12730,6 +12736,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14346,6 +14358,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17867,6 +17882,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22388,15 +22406,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26484,9 +26493,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/ko.po b/i18n/po/ko.po
index 443a638..0d64d73 100644
--- a/i18n/po/ko.po
+++ b/i18n/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-09-26 15:59+0000\n"
"Last-Translator: Myeongjin <aranet100 at gmail.com>\n"
"Language-Team: Korean <ko at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:01+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:05+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: ko\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12546,6 +12546,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14162,6 +14168,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17683,6 +17692,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22204,15 +22216,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26300,9 +26303,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/ky.po b/i18n/po/ky.po
index 19e741d..8fd080f 100644
--- a/i18n/po/ky.po
+++ b/i18n/po/ky.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2012-12-18 02:36+0000\n"
"Last-Translator: chyngyz <Unknown>\n"
"Language-Team: Kirghiz <ky at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:00+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:04+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -12549,6 +12549,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14165,6 +14171,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17686,6 +17695,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22207,15 +22219,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26303,9 +26306,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/lo.po b/i18n/po/lo.po
index 82d788e..bc50585 100644
--- a/i18n/po/lo.po
+++ b/i18n/po/lo.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2009-09-15 10:06+0000\n"
"Last-Translator: Anousone <Unknown>\n"
"Language-Team: Lao <lo at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:02+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:06+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/lt.po b/i18n/po/lt.po
index 754780e..b46124b 100644
--- a/i18n/po/lt.po
+++ b/i18n/po/lt.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-06-17 02:41+0000\n"
"Last-Translator: Mantas Kriaučiūnas <mantas at akl.lt>\n"
"Language-Team: Lithuanian <lt at li.org>\n"
@@ -11,8 +11,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:04+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:07+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: lt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12615,6 +12615,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14232,6 +14238,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17754,6 +17763,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22277,15 +22289,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26373,9 +26376,6 @@ msgstr ""
msgid "Save SDS file"
msgstr "Išsaugoti SDS failą"
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr "Supaprastinti Sritį"
diff --git a/i18n/po/lv.po b/i18n/po/lv.po
index a6373f1..2b33efc 100644
--- a/i18n/po/lv.po
+++ b/i18n/po/lv.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2012-10-03 22:16+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Latvian <lv at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:03+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:07+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: lv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12564,6 +12564,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14180,6 +14186,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17701,6 +17710,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22222,15 +22234,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26318,9 +26321,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/mk.po b/i18n/po/mk.po
index c565ae2..4879640 100644
--- a/i18n/po/mk.po
+++ b/i18n/po/mk.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2013-05-11 04:37+0000\n"
"Last-Translator: Bojan Jankuloski <bojan.jankuloski at gmail.com>\n"
"Language-Team: Macedonian <mk at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:05+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:08+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: mk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12554,6 +12554,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14170,6 +14176,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17691,6 +17700,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22212,15 +22224,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26308,9 +26311,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/ms.po b/i18n/po/ms.po
index 85f4572..30de45c 100644
--- a/i18n/po/ms.po
+++ b/i18n/po/ms.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2011-12-11 22:14+0000\n"
"Last-Translator: abuyop <Unknown>\n"
"Language-Team: Malay <ms at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:06+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:09+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: ms\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/nb.po b/i18n/po/nb.po
index 10c6c87..7207245 100644
--- a/i18n/po/nb.po
+++ b/i18n/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-03-19 14:25+0000\n"
"Last-Translator: Magnus Meyer Hustveit <Unknown>\n"
"Language-Team: Norwegian Bokmal <nb at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:08+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:11+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: nb\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12707,6 +12707,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14351,6 +14357,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17872,6 +17881,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Løypetype"
@@ -22395,15 +22407,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26526,9 +26529,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/nds.po b/i18n/po/nds.po
index 8966b3b..733dee7 100644
--- a/i18n/po/nds.po
+++ b/i18n/po/nds.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2009-11-29 09:01+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: German, Low <nds at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:07+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:10+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12549,6 +12549,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14165,6 +14171,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17686,6 +17695,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22207,15 +22219,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26303,9 +26306,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/nl.po b/i18n/po/nl.po
index 8820724..221009e 100644
--- a/i18n/po/nl.po
+++ b/i18n/po/nl.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-06-10 11:21+0000\n"
"Last-Translator: Jan Cnops <jan.cnops at scarlet.be>\n"
"Language-Team: Dutch\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:44+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:46+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: nl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -13979,6 +13979,12 @@ msgstr "De longituden moeten liggen tussen {0} en {1}"
msgid "The minima must be less than the maxima"
msgstr "De minima moeten kleiner zijn dan de maxima"
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -15947,6 +15953,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Plug-in om gegevens voor OSM digitaal te ondertekenen"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -19502,6 +19511,9 @@ msgstr "zwembad"
msgid "water_park"
msgstr "water_park"
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Soort piste"
@@ -24173,15 +24185,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -28566,9 +28569,6 @@ msgstr ""
msgid "Save SDS file"
msgstr "Sla het SDS-bestand op"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Kon geen back-up maken van het bestand. Exceptie is: {0}"
-
msgid "Simplify Area"
msgstr "Gebied vereenvoudigen"
diff --git a/i18n/po/nn.po b/i18n/po/nn.po
index d8b07cd..ca5c2b1 100644
--- a/i18n/po/nn.po
+++ b/i18n/po/nn.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2009-07-15 12:49+0000\n"
"Last-Translator: Skippern <Unknown>\n"
"Language-Team: Norwegian Nynorsk <nn at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:07+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:11+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: nn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/oc.po b/i18n/po/oc.po
index bdbb325..8cc173a 100644
--- a/i18n/po/oc.po
+++ b/i18n/po/oc.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2012-10-03 22:14+0000\n"
"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary at yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:09+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:12+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12561,6 +12561,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14177,6 +14183,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17698,6 +17707,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22219,15 +22231,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26315,9 +26318,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/pa.po b/i18n/po/pa.po
index c6ab4b9..9c786e6 100644
--- a/i18n/po/pa.po
+++ b/i18n/po/pa.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2011-05-06 15:52+0000\n"
"Last-Translator: A S Alam <aalam at users.sf.net>\n"
"Language-Team: Punjabi <pa at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:10+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:13+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: pa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/pl.po b/i18n/po/pl.po
index 28a4cb5..c0fe20e 100644
--- a/i18n/po/pl.po
+++ b/i18n/po/pl.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-10-06 21:02+0000\n"
"Last-Translator: Zbigniew Czernik <Unknown>\n"
"Language-Team: Polish <josm-lang-pl at googlegroups.com>\n"
@@ -11,8 +11,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: 2014-10-17 05:11+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:15+0000\n"
+"X-Generator: Launchpad (build 17203)\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"
@@ -13562,6 +13562,12 @@ msgstr "Długości geograficzne muszą być pomiędzy {0} a {1}"
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -15285,6 +15291,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -18801,6 +18810,9 @@ msgstr "basen"
msgid "water_park"
msgstr "park wodny"
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Rodzaj trasy"
@@ -23332,15 +23344,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -27453,9 +27456,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Nie można wykonać kopii bezpieczeństwa pliku. Wyjątek: {0}"
-
msgid "Simplify Area"
msgstr "Uprość obszar"
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index 38ff8b6..c629e77 100644
--- a/i18n/po/pt.po
+++ b/i18n/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-06-18 13:52+0000\n"
"Last-Translator: Ricardo Martins <rikhard.martins at gmail.com>\n"
"Language-Team: Portuguese <pt at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:12+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:16+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: pt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -13804,6 +13804,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -15739,6 +15745,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Módulo para assinar digitalmente dados do OpenStreetMap"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -19304,6 +19313,9 @@ msgstr "piscina"
msgid "water_park"
msgstr "parque aquático"
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Tipo de pista"
@@ -23969,15 +23981,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -28334,9 +28337,6 @@ msgstr "Gravar a informação Separate Data Store atual para um ficheiro."
msgid "Save SDS file"
msgstr "Gravar ficheiro Separate Data Store"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Não foi possessível fazer a cópia de seguranças. Exceção: {0}"
-
msgid "Simplify Area"
msgstr "Simplificar Área"
diff --git a/i18n/po/pt_BR.po b/i18n/po/pt_BR.po
index 10e785f..f3c1f80 100644
--- a/i18n/po/pt_BR.po
+++ b/i18n/po/pt_BR.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
-"PO-Revision-Date: 2014-10-15 17:40+0000\n"
-"Last-Translator: jgpacker <john.packer7 at gmail.com>\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"PO-Revision-Date: 2014-10-20 03:12+0000\n"
+"Last-Translator: Nelson A. de Oliveira <naoliv at debian.org>\n"
"Language-Team: Português Brasileiro <gnome-pt_br-list at gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:28+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:32+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: pt_BR\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,7 +148,7 @@ msgid "Homepage"
msgstr "Página inicial"
msgid "Bug Reports"
-msgstr "Relatórios de erros"
+msgstr "Relatar erro"
msgid "Info"
msgstr "Info"
@@ -1224,7 +1224,7 @@ msgid "Report bug"
msgstr "Relatar erro"
msgid "Report a ticket to JOSM bugtracker"
-msgstr ""
+msgstr "Relatar um erro ao bugtracker do JOSM"
msgid "Restart"
msgstr "Reiniciar"
@@ -1236,7 +1236,7 @@ msgid "Click to restart later."
msgstr "Clique para reiniciar mais tarde."
msgid "Reverse way"
-msgstr "Caminho reverso"
+msgstr "Reverter caminho"
msgid "Reverse Ways"
msgstr "Reverter Caminhos"
@@ -1303,7 +1303,7 @@ msgid "Data Error"
msgstr "Erro de Dados"
msgid "IO Error"
-msgstr "Erro de IO"
+msgstr "Erro de E/S"
msgid "<html>Could not load session file ''{0}''.<br>Error is:<br>{1}</html>"
msgstr ""
@@ -1343,18 +1343,19 @@ msgid "No exporter for this layer"
msgstr "Não exportar para esta camada"
msgid "Show Status Report"
-msgstr "Mostrar relatório atual"
+msgstr "Exibir Relatório de Status"
msgid ""
"Show status report with useful information that can be attached to bugs"
msgstr ""
-"Mostrar relatório atual com informações úteis que podem ser anexadas aos bugs"
+"Mostrar relatório de status com informações úteis que podem ser anexadas aos "
+"bugs"
msgid "Help: {0}"
msgstr "Ajuda: {0}"
msgid "Status Report"
-msgstr "Relatório Atual"
+msgstr "Relatório de Status"
msgid "Copy to clipboard and close"
msgstr "Copiar para área de transferência e fechar"
@@ -1375,7 +1376,7 @@ msgid "Yes"
msgstr "Sim"
msgid "Simplify all selected ways"
-msgstr "Simplifque todos os caminhos selecionados"
+msgstr "Simplificar todos os caminhos selecionados"
msgid "Cancel operation"
msgstr "Cancelar operação"
@@ -1949,10 +1950,10 @@ msgid "Error during download"
msgstr "Erro durante o download"
msgid "Add a new Note"
-msgstr ""
+msgstr "Adicionar uma nova Nota"
msgid "Add note mode"
-msgstr ""
+msgstr "Modo de adição de notas"
msgid "Click the location where you wish to create a new note"
msgstr "Clique no lugar que você deseja criar uma Nota nova"
@@ -6603,13 +6604,13 @@ msgid "Close Note"
msgstr "Fechar Nota"
msgid "Create a new note"
-msgstr ""
+msgstr "Criar uma nova nota"
msgid "Create"
msgstr "Criar"
msgid "Reopen note"
-msgstr ""
+msgstr "Reabrir nota"
msgid "Reopen"
msgstr "Reabrir"
@@ -8123,13 +8124,13 @@ msgid "Querying name server ..."
msgstr "Consultando o servidor de nomes ..."
msgid "Error occured with query ''{0}'': ''{1}''"
-msgstr ""
+msgstr "Erro ocorrido com consulta ''{0}'': ''{1}''"
msgid "Name server returned invalid data. Please try again."
-msgstr ""
+msgstr "O servidor retornou dados inválidos. Tente novamente."
msgid "Bad response"
-msgstr ""
+msgstr "Resposta inválida"
msgid "Type"
msgstr "Tipo"
@@ -9982,16 +9983,16 @@ msgid "Click to cancel"
msgstr "Clique para cancelar"
msgid "Download from OSM along this track"
-msgstr "Descarregar do OSM ao largo desta via"
+msgstr "Descarregar do OSM ao longo desta via"
msgid "Calculating Download Area"
msgstr "Calculando área para baixar"
msgid "Precache imagery tiles along this track"
-msgstr "Precache quadros das imagnes ao longo deste caminho"
+msgstr "Pré-carregar quadros das imagens ao longo deste caminho"
msgid "Precaching WMS"
-msgstr "Precaching WMS"
+msgstr "Pré-carregando WMS"
msgid "Please select the imagery layer."
msgstr "Por favor, selecione a camada de imagem."
@@ -13877,6 +13878,12 @@ msgstr "As longitudes deve estar entre {0} e {1}"
msgid "The minima must be less than the maxima"
msgstr "Os mínimos devem ser menor do que a máxima"
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -15499,7 +15506,7 @@ msgstr ""
"openstreetmap.org."
msgid "Downloads OSM data along a way"
-msgstr "Baixa os dados OSM ao longo de uma via"
+msgstr "Baixa dados OSM ao longo de uma via"
msgid ""
"Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -15847,6 +15854,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Plugin para sinal digital do OSM-Data"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -16380,13 +16390,13 @@ msgid "Fee"
msgstr "Taxa"
msgid "06:00-20:00"
-msgstr ""
+msgstr "06:00-20:00"
msgid "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
-msgstr ""
+msgstr "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
msgid "May-Sep 09:30-12:30,14:15-19:30"
-msgstr ""
+msgstr "May-Sep 09:30-12:30,14:15-19:30"
msgid "multi-storey"
msgstr "com vários andares"
@@ -19405,6 +19415,9 @@ msgstr "piscina olímpica"
msgid "water_park"
msgstr "water_park"
+msgid "Scuba Diving"
+msgstr "Mergulho"
+
msgid "Piste type"
msgstr "Tipo da pista"
@@ -24099,15 +24112,6 @@ msgstr ""
msgid "Area Selector"
msgstr "Seletor de área"
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr "Criar área"
@@ -25042,19 +25046,19 @@ msgid "TCX Files (*.tcx)"
msgstr "Arquivo TCX (*.tcx)"
msgid "Download along..."
-msgstr "Baixar junto..."
+msgstr "Baixar ao longo..."
msgid "Download OSM data along the selected ways."
-msgstr "Baixar dados do OSM junto da via selecionada."
+msgstr "Baixar dados do OSM ao longo da via selecionada."
msgid "Download Along"
-msgstr "Baixar Junto"
+msgstr "Baixar ao longo"
msgid "Please select 1 or more ways to download along"
msgstr "Por favor, selecione 1 ou mais vias para baixar junto"
msgid "Download from OSM along selected ways"
-msgstr "Baixando do OSM por caminhos selecionados"
+msgstr "Baixar do OSM ao longo dos caminhos selecionados"
msgid "{0} intermediate nodes to download."
msgstr "{0} nós intermediários para baixar."
@@ -28479,9 +28483,6 @@ msgstr ""
msgid "Save SDS file"
msgstr "Salvar arquivo SDS"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Não foi possível criar cópia de segurança. A exceção foi: {0}"
-
msgid "Simplify Area"
msgstr "Área simplificada"
diff --git a/i18n/po/rm.po b/i18n/po/rm.po
index 7d60e33..a96a3dc 100644
--- a/i18n/po/rm.po
+++ b/i18n/po/rm.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2009-06-21 19:14+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Raeto-Romance <rm at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n !=1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:13+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:17+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/ro.po b/i18n/po/ro.po
index 787d02c..e4c5b65 100644
--- a/i18n/po/ro.po
+++ b/i18n/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JOSM\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2012-10-03 22:38+0000\n"
"Last-Translator: Ciprian <c1pr1an_43v3r at yahoo.com>\n"
"Language-Team: Romanian <gnomero-list at lists.sourceforge.net>\n"
@@ -11,8 +11,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
"== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:14+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:18+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"X-Poedit-Country: ROMANIA\n"
"Language: ro\n"
"X-Poedit-Language: Romanian\n"
@@ -12578,6 +12578,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14194,6 +14200,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17715,6 +17724,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22236,15 +22248,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26332,9 +26335,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/ru.po b/i18n/po/ru.po
index e9b5bfd..a7eb225 100644
--- a/i18n/po/ru.po
+++ b/i18n/po/ru.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
-"PO-Revision-Date: 2014-10-16 04:27+0000\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"PO-Revision-Date: 2014-10-20 06:06+0000\n"
"Last-Translator: Nkolay Parukhin <parukhin at gmail.com>\n"
"Language-Team: Koptev Oleg <koptev.oleg at gmail.com>\n"
"MIME-Version: 1.0\n"
@@ -11,8 +11,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:15+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:19+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: ru_RU\n"
msgid "Use Basic Authentication"
@@ -1247,7 +1247,7 @@ msgid "Report bug"
msgstr "Сообщить об ошибке"
msgid "Report a ticket to JOSM bugtracker"
-msgstr ""
+msgstr "Создать карточку в системе отслеживания ошибок JOSM"
msgid "Restart"
msgstr "Перезапустить"
@@ -8186,13 +8186,13 @@ msgid "Querying name server ..."
msgstr "Запрос на сервер имён ..."
msgid "Error occured with query ''{0}'': ''{1}''"
-msgstr ""
+msgstr "Произошла ошибка при запросе ''{0}'': ''{1}''"
msgid "Name server returned invalid data. Please try again."
-msgstr ""
+msgstr "Сервер имён вернул неверные данные. Попробуйте снова."
msgid "Bad response"
-msgstr ""
+msgstr "Неверный отклик"
msgid "Type"
msgstr "Тип"
@@ -13978,6 +13978,12 @@ msgstr "Долгота должна быть между {0} и {1}"
msgid "The minima must be less than the maxima"
msgstr "Минимум должен быть меньше максимума"
+msgid "Remote Control has been asked to load the following data:"
+msgstr "Удалённое управление запросило загрузку следующих данных:"
+
+msgid "Loading data"
+msgstr "Загрузка данных"
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -15971,6 +15977,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Модуль для цифровой подписи данных OSM"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -19526,6 +19535,9 @@ msgstr "плавательный бассейн"
msgid "water_park"
msgstr "аквапарк"
+msgid "Scuba Diving"
+msgstr "Подводное плавание"
+
msgid "Piste type"
msgstr "Тип лыжни"
@@ -22533,16 +22545,16 @@ msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Литва)"
msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
+msgstr "Luxembourg Inspire: ортофото 2010"
msgid "Luxembourg Inspire Ortho 2013"
-msgstr ""
+msgstr "Luxembourg Inspire: ортофото 2013"
msgid "Luxembourg Inspire Railway"
-msgstr ""
+msgstr "Luxembourg Inspire: железные дороги"
msgid "Luxembourg Inspire Roads"
-msgstr ""
+msgstr "Luxembourg Inspire: дороги"
msgid "Niger Delta Oct 2012 Landsat"
msgstr "Дельта Нигера, окт. 2012 Landsat"
@@ -24213,15 +24225,6 @@ msgstr ""
msgid "Area Selector"
msgstr "Автовыделение областей"
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr "Создана область"
@@ -28575,9 +28578,6 @@ msgstr "Сохранить текущую информацию SDS в файл"
msgid "Save SDS file"
msgstr "Сохранить SDS-файл"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Ошибка создания резервного файла. Текст ошибки: {0}"
-
msgid "Simplify Area"
msgstr "Упростить полигон"
diff --git a/i18n/po/sk.po b/i18n/po/sk.po
index 3a46333..8499ac3 100644
--- a/i18n/po/sk.po
+++ b/i18n/po/sk.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-10-11 21:46+0000\n"
"Last-Translator: aceman444 <Unknown>\n"
"Language-Team: Slovak <>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:17+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:21+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: sk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -13923,6 +13923,12 @@ msgstr "Zemepisná dĺžka musí byť medzi {0} a {1}"
msgid "The minima must be less than the maxima"
msgstr "Minimá musia byť menšie ako maximá"
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -15904,6 +15910,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Plugin na digitálne podpísanie OSM dát"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr "GUI rozhranie pre pridávanie, úpravu a mazanie odbočovacích pruhov."
@@ -19462,6 +19471,9 @@ msgstr "bazén"
msgid "water_park"
msgstr "aquapark"
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Typ lyžiarskej dráhy"
@@ -24027,15 +24039,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -28232,9 +28235,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Nemôžem zálohovať súbor. Výnimka je: {0}"
-
msgid "Simplify Area"
msgstr "Zjednodušiť oblasť"
diff --git a/i18n/po/sl.po b/i18n/po/sl.po
index d68a63e..ed8d2a3 100644
--- a/i18n/po/sl.po
+++ b/i18n/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2013-03-30 13:06+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Slovenian <sl at li.org>\n"
@@ -11,8 +11,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
"n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:18+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:22+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: sl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12612,6 +12612,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14232,6 +14238,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17753,6 +17762,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22274,15 +22286,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26372,9 +26375,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/sq.po b/i18n/po/sq.po
index d65bf6c..9bbbb2b 100644
--- a/i18n/po/sq.po
+++ b/i18n/po/sq.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2011-11-04 19:43+0000\n"
"Last-Translator: StefanPrifti <Unknown>\n"
"Language-Team: FLOSS Kosova\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 04:32+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 04:32+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/sr.po b/i18n/po/sr.po
index f1d868f..48408d5 100644
--- a/i18n/po/sr.po
+++ b/i18n/po/sr.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2012-07-13 07:57+0000\n"
"Last-Translator: Никола Смоленски <Unknown>\n"
"Language-Team: Serbian <sr at li.org>\n"
@@ -11,8 +11,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:15+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:19+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: sr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12552,6 +12552,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14168,6 +14174,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17689,6 +17698,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22210,15 +22222,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26306,9 +26309,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/sv.po b/i18n/po/sv.po
index 4b44200..c675a62 100644
--- a/i18n/po/sv.po
+++ b/i18n/po/sv.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-09-15 14:19+0000\n"
"Last-Translator: Tomas Marklund <tomasmarklund75 at gmail.com>\n"
"Language-Team: Swedish <sv at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:20+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:24+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: sv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -13057,6 +13057,12 @@ msgstr "Longituderna måste vara mellan {0} och {1}"
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14781,6 +14787,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -18304,6 +18313,9 @@ msgstr "swimmingpool"
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "Skidspårstyp"
@@ -22825,15 +22837,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26957,9 +26960,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr "Förenkla yta"
diff --git a/i18n/po/ta.po b/i18n/po/ta.po
index f8cb670..50133a1 100644
--- a/i18n/po/ta.po
+++ b/i18n/po/ta.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2012-10-03 22:36+0000\n"
"Last-Translator: நவீன் குமார்(கெம்ளின்) <naveenmtp at gmail.com>\n"
"Language-Team: Tamil <ta at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:21+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:25+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"X-Poedit-Country: INDIA\n"
"Language: ta\n"
"X-Poedit-Language: Tamil\n"
@@ -12587,6 +12587,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14203,6 +14209,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17724,6 +17733,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22245,15 +22257,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26347,9 +26350,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/te.po b/i18n/po/te.po
index b7ef02c..ca70786 100644
--- a/i18n/po/te.po
+++ b/i18n/po/te.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2011-05-13 08:50+0000\n"
"Last-Translator: Praveen Illa <mail2ipn at gmail.com>\n"
"Language-Team: Telugu <te at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:22+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:26+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: te\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/th.po b/i18n/po/th.po
index 333d1be..12c6813 100644
--- a/i18n/po/th.po
+++ b/i18n/po/th.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2009-03-23 02:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Thai <th at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:22+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:27+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: th\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/tr.po b/i18n/po/tr.po
index a0d6e8e..7949220 100644
--- a/i18n/po/tr.po
+++ b/i18n/po/tr.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-05-16 05:31+0000\n"
"Last-Translator: katpatuka <email at katpatuka.org>\n"
"Language-Team: Türkçe <>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:23+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:27+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12655,6 +12655,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14278,6 +14284,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17799,6 +17808,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22320,15 +22332,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26430,9 +26433,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr "Alanı sadeleştir"
diff --git a/i18n/po/ug.po b/i18n/po/ug.po
index 2166184..709c12d 100644
--- a/i18n/po/ug.po
+++ b/i18n/po/ug.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2012-07-14 16:22+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Uyghur <ug at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:24+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:28+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/uk.po b/i18n/po/uk.po
index 27696ad..918f747 100644
--- a/i18n/po/uk.po
+++ b/i18n/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
-"PO-Revision-Date: 2014-10-14 19:47+0000\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
+"PO-Revision-Date: 2014-10-19 06:20+0000\n"
"Last-Translator: andygol <Unknown>\n"
"Language-Team: Ukrainian <uk at li.org>\n"
"MIME-Version: 1.0\n"
@@ -11,8 +11,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:25+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:29+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: uk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1241,7 +1241,7 @@ msgid "Report bug"
msgstr "Звіт про збій програми"
msgid "Report a ticket to JOSM bugtracker"
-msgstr ""
+msgstr "Надіслати повідомлення до системи відстежування помилок JOSM"
msgid "Restart"
msgstr "Перезапустити"
@@ -8176,13 +8176,13 @@ msgid "Querying name server ..."
msgstr "Запит до сервера імен…"
msgid "Error occured with query ''{0}'': ''{1}''"
-msgstr ""
+msgstr "Виникла помилка в запиті ''{0}'': ''{1}''"
msgid "Name server returned invalid data. Please try again."
-msgstr ""
+msgstr "Сервер імен повернув помилкові дані. Спробуйте знов."
msgid "Bad response"
-msgstr ""
+msgstr "Невірна відповідь"
msgid "Type"
msgstr "Тип"
@@ -13952,6 +13952,12 @@ msgstr "Довгота повинна бути між {0} і {1}"
msgid "The minima must be less than the maxima"
msgstr "Мінімум має бути менше максимуму"
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -15949,6 +15955,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "Втулок для накладення цифрового підпису на дані OSM"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -19501,6 +19510,9 @@ msgstr "басейн"
msgid "water_park"
msgstr "аквапарк"
+msgid "Scuba Diving"
+msgstr "Підводне плавання з аквалангом"
+
msgid "Piste type"
msgstr "Тип лижні"
@@ -22514,16 +22526,16 @@ msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Литва)"
msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
+msgstr "Люксембург Inspire Орто 2010"
msgid "Luxembourg Inspire Ortho 2013"
-msgstr ""
+msgstr "Люксембург Inspire Орто 2013"
msgid "Luxembourg Inspire Railway"
-msgstr ""
+msgstr "Люксембург Inspire Залізниця"
msgid "Luxembourg Inspire Roads"
-msgstr ""
+msgstr "Люксембург Inspire Дороги"
msgid "Niger Delta Oct 2012 Landsat"
msgstr "Дельта Нігера, жовт. 2012 Landsat"
@@ -24199,15 +24211,6 @@ msgstr "Виділіть полігон (напр. будинок) на фоно
msgid "Area Selector"
msgstr "Виділення ділянки"
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr "Створена ділянка"
@@ -28556,9 +28559,6 @@ msgstr "Зберегти поточні дані SDS у файл."
msgid "Save SDS file"
msgstr "Зберегти файл SDS"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Не можу створити резервний файл. Помилка: {0}"
-
msgid "Simplify Area"
msgstr "Спростити полігон"
diff --git a/i18n/po/ur.po b/i18n/po/ur.po
index 25542bd..f2ede1a 100644
--- a/i18n/po/ur.po
+++ b/i18n/po/ur.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2010-05-13 04:15+0000\n"
"Last-Translator: Shoaib Mirza <Unknown>\n"
"Language-Team: Urdu <ur at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:26+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:29+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: ur\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12550,6 +12550,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14166,6 +14172,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17687,6 +17696,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22208,15 +22220,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26304,9 +26307,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/vi.po b/i18n/po/vi.po
index 8a381ae..756e66f 100644
--- a/i18n/po/vi.po
+++ b/i18n/po/vi.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2013-03-13 05:33+0000\n"
"Last-Translator: Minh Nguyễn <mxn at 1ec5.org>\n"
"Language-Team: Vietnamese <vi at li.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:26+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:30+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: vi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12574,6 +12574,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14190,6 +14196,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr ""
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
@@ -17711,6 +17720,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22232,15 +22244,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26328,9 +26331,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "Simplify Area"
msgstr ""
diff --git a/i18n/po/zh_CN.po b/i18n/po/zh_CN.po
index d8e6479..f48b08b 100644
--- a/i18n/po/zh_CN.po
+++ b/i18n/po/zh_CN.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-10-03 16:07+0000\n"
"Last-Translator: rc1028 <q371320247 at live.com>\n"
"Language-Team: 汉语 <>\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:32+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:36+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: zh_CN\n"
msgid "yard"
@@ -12670,6 +12670,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14299,6 +14305,9 @@ msgstr "在地图上描出绘制建筑物和其他形状。需要运行 Tracer2S
msgid "Plugin to digital sign OSM-Data"
msgstr "用来数字签名 OSM-数据的插件"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr "提供一个简单的图形界面，用来添加、编辑和删除转弯车道。"
@@ -17817,6 +17826,9 @@ msgstr "游泳池"
msgid "water_park"
msgstr "水上公园"
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr "滑雪方式"
@@ -22416,15 +22428,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26557,9 +26560,6 @@ msgstr "保存当前的独立数据存储信息到文件。"
msgid "Save SDS file"
msgstr "保存 SDS 文件"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "无法备份文件。异常为：{0}"
-
msgid "Simplify Area"
msgstr "简化区域"
diff --git a/i18n/po/zh_TW.po b/i18n/po/zh_TW.po
index 8b54af5..e18c29b 100644
--- a/i18n/po/zh_TW.po
+++ b/i18n/po/zh_TW.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 03:41+0200\n"
+"POT-Creation-Date: 2014-10-21 03:38+0200\n"
"PO-Revision-Date: 2014-08-01 13:06+0000\n"
"Last-Translator: yellowsoar <Unknown>\n"
"Language-Team: Traditional Chinese\n"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-10-17 05:31+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-21 05:35+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
"Language: zh_TW\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -12612,6 +12612,12 @@ msgstr ""
msgid "The minima must be less than the maxima"
msgstr ""
+msgid "Remote Control has been asked to load the following data:"
+msgstr ""
+
+msgid "Loading data"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -14241,6 +14247,9 @@ msgstr ""
msgid "Plugin to digital sign OSM-Data"
msgstr "用來數位簽署 OSM-Data 的外掛程式"
+msgid "${plugin.description}"
+msgstr ""
+
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr "提供直覺的 GUI 以加入、編輯和刪除轉彎車道。"
@@ -17762,6 +17771,9 @@ msgstr ""
msgid "water_park"
msgstr ""
+msgid "Scuba Diving"
+msgstr ""
+
msgid "Piste type"
msgstr ""
@@ -22316,15 +22328,6 @@ msgstr ""
msgid "Area Selector"
msgstr ""
-msgid "Detecting area"
-msgstr ""
-
-msgid "Starting detection"
-msgstr ""
-
-msgid "The background image is beeing processed"
-msgstr ""
-
msgid "Created area"
msgstr ""
@@ -26453,9 +26456,6 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr "無法備份檔案。例外為：{0}"
-
msgid "Simplify Area"
msgstr "簡化區域"
diff --git a/images/cursor/modifier/create_note.png b/images/cursor/modifier/create_note.png
new file mode 100644
index 0000000..88e7179
Binary files /dev/null and b/images/cursor/modifier/create_note.png differ
diff --git a/images/notes/note_closed_24x24.png b/images/dialogs/notes/note_closed.png
similarity index 100%
rename from images/notes/note_closed_24x24.png
rename to images/dialogs/notes/note_closed.png
diff --git a/images/dialogs/notes/note_comment.png b/images/dialogs/notes/note_comment.png
new file mode 100644
index 0000000..6e8e885
Binary files /dev/null and b/images/dialogs/notes/note_comment.png differ
diff --git a/images/notes/note_new_24x24.png b/images/dialogs/notes/note_new.png
similarity index 100%
copy from images/notes/note_new_24x24.png
copy to images/dialogs/notes/note_new.png
diff --git a/images/notes/note_open_24x24.png b/images/dialogs/notes/note_open.png
similarity index 100%
rename from images/notes/note_open_24x24.png
rename to images/dialogs/notes/note_open.png
diff --git a/images/dialogs/pin.png b/images/dialogs/pin.png
new file mode 100644
index 0000000..d4c27a7
Binary files /dev/null and b/images/dialogs/pin.png differ
diff --git a/images/notes/note_new_24x24.png b/images/mapmode/addnote.png
similarity index 100%
rename from images/notes/note_new_24x24.png
rename to images/mapmode/addnote.png
diff --git a/images/notes/note_closed_16x16.png b/images/notes/note_closed_16x16.png
deleted file mode 100644
index c398317..0000000
Binary files a/images/notes/note_closed_16x16.png and /dev/null differ
diff --git a/images/notes/note_new_16x16.png b/images/notes/note_new_16x16.png
deleted file mode 100644
index b239bf3..0000000
Binary files a/images/notes/note_new_16x16.png and /dev/null differ
diff --git a/images/notes/note_open_16x16.png b/images/notes/note_open_16x16.png
deleted file mode 100644
index ec2b274..0000000
Binary files a/images/notes/note_open_16x16.png and /dev/null differ
diff --git a/src/org/openstreetmap/josm/Main.java b/src/org/openstreetmap/josm/Main.java
index 09f95b8..ba2d43c 100644
--- a/src/org/openstreetmap/josm/Main.java
+++ b/src/org/openstreetmap/josm/Main.java
@@ -44,6 +44,7 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTextArea;
import javax.swing.KeyStroke;
+import javax.swing.LookAndFeel;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
@@ -94,6 +95,7 @@ import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.io.FileWatcher;
import org.openstreetmap.josm.io.OnlineResource;
import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.plugins.PluginHandler;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.I18n;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -825,8 +827,26 @@ public abstract class Main {
UIManager.setLookAndFeel(laf);
}
catch (final NoClassDefFoundError | ClassNotFoundException e) {
- info("Look and Feel not found: " + laf);
- Main.pref.put("laf", defaultlaf);
+ // Try to find look and feel in plugin classloaders
+ Class<?> klass = null;
+ for (ClassLoader cl : PluginHandler.getResourceClassLoaders()) {
+ try {
+ klass = cl.loadClass(laf);
+ break;
+ } catch (ClassNotFoundException ex) {
+ // Do nothing
+ }
+ }
+ if (klass != null && LookAndFeel.class.isAssignableFrom(klass)) {
+ try {
+ UIManager.setLookAndFeel((LookAndFeel) klass.newInstance());
+ } catch (Exception ex) {
+ warn("Cannot set Look and Feel: " + laf + ": "+ex.getMessage());
+ }
+ } else {
+ info("Look and Feel not found: " + laf);
+ Main.pref.put("laf", defaultlaf);
+ }
}
catch (final UnsupportedLookAndFeelException e) {
info("Look and Feel not supported: " + laf);
diff --git a/src/org/openstreetmap/josm/actions/ReportBugAction.java b/src/org/openstreetmap/josm/actions/ReportBugAction.java
new file mode 100644
index 0000000..7d86663
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/ReportBugAction.java
@@ -0,0 +1,49 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+
+import org.openstreetmap.josm.tools.BugReportExceptionHandler;
+import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * Reports a ticket to JOSM bugtracker.
+ * @since 7624
+ */
+public class ReportBugAction extends JosmAction {
+
+ /**
+ * Constructs a new {@code ReportBugAction}.
+ */
+ public ReportBugAction() {
+ super(tr("Report bug"), "bug.png", tr("Report a ticket to JOSM bugtracker"),
+ Shortcut.registerShortcut("reportbug", tr("Report a ticket to JOSM bugtracker"),
+ KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), true);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ reportBug();
+ }
+
+ /**
+ * Reports a ticket to JOSM bugtracker.
+ */
+ public static void reportBug() {
+ reportBug(ShowStatusReportAction.getReportHeader());
+ }
+
+ /**
+ * Reports a ticket to JOSM bugtracker with given status report.
+ * @param report Status report header containing technical, non-personal information
+ */
+ public static void reportBug(String report) {
+ OpenBrowser.displayUrl(BugReportExceptionHandler.getBugReportUrl(
+ Utils.strip(report)).toExternalForm());
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
index 182da2e..fc7c49e 100644
--- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
+++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
@@ -28,8 +28,6 @@ import org.openstreetmap.josm.data.osm.DatasetConsistencyTest;
import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.plugins.PluginHandler;
-import org.openstreetmap.josm.tools.BugReportExceptionHandler;
-import org.openstreetmap.josm.tools.OpenBrowser;
import org.openstreetmap.josm.tools.PlatformHookUnixoid;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.Utils;
@@ -201,8 +199,7 @@ public final class ShowStatusReportAction extends JosmAction {
switch (ed.showDialog().getValue()) {
case 1: Utils.copyToClipboard(text.toString()); break;
- case 2: OpenBrowser.displayUrl(BugReportExceptionHandler.getBugReportUrl(
- Utils.strip(reportHeader)).toExternalForm()) ; break;
+ case 2: ReportBugAction.reportBug(reportHeader) ; break;
}
}
}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
index 21750de..f49eaf0 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
@@ -67,7 +67,9 @@ public class DownloadGpsTask extends AbstractDownloadTask {
@Override
public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
CheckParameterUtil.ensureParameterNotNull(url, "url");
- if (url.matches(PATTERN_TRACE_ID) || url.matches(PATTERN_EXTERNAL_GPX_SCRIPT) || url.matches(PATTERN_EXTERNAL_GPX_FILE)) {
+ if (url.matches(PATTERN_TRACE_ID)
+ || url.matches(PATTERN_EXTERNAL_GPX_SCRIPT)
+ || url.matches(PATTERN_EXTERNAL_GPX_FILE)) {
downloadTask = new DownloadTask(newLayer,
new OsmServerLocationReader(url), progressMonitor);
// Extract .gpx filename from URL to set the new layer name
@@ -100,7 +102,7 @@ public class DownloadGpsTask extends AbstractDownloadTask {
private final boolean newLayer;
public DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) {
- super(tr("Downloading GPS data"));
+ super(tr("Downloading GPS data"), progressMonitor, false);
this.reader = reader;
this.newLayer = newLayer;
}
@@ -131,7 +133,8 @@ public class DownloadGpsTask extends AbstractDownloadTask {
return;
String name = newLayerName != null ? newLayerName : tr("Downloaded GPX Data");
- GpxImporterData layers = GpxImporter.loadLayers(rawData, reader.isGpxParsedProperly(), name, tr("Markers from {0}", name));
+ GpxImporterData layers = GpxImporter.loadLayers(rawData, reader.isGpxParsedProperly(), name,
+ tr("Markers from {0}", name));
GpxLayer gpxLayer = addOrMergeLayer(layers.getGpxLayer(), findGpxMergeLayer());
addOrMergeLayer(layers.getMarkerLayer(), findMarkerMergeLayer(gpxLayer));
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
index 71248c6..b1ed0fc 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
@@ -71,11 +71,10 @@ public class DownloadNotesTask extends AbstractDownloadTask {
protected List<Note> notesData;
public DownloadTask(OsmServerReader reader, ProgressMonitor progressMonitor) {
- super(tr("Downloading Notes"));
+ super(tr("Downloading Notes"), progressMonitor, false);
this.reader = reader;
}
-
@Override
protected void finish() {
Main.debug("finish called in DownloadNotesTask");
@@ -96,7 +95,7 @@ public class DownloadNotesTask extends AbstractDownloadTask {
NoteLayer layer;
if (noteLayers != null && noteLayers.size() > 0) {
layer = noteLayers.get(0);
- layer.addNotes(notesData);
+ layer.getNoteData().addNotes(notesData);
} else {
layer = new NoteLayer(notesData, "Notes");
Main.main.addLayer(layer);
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
index 5c2784b..041f05b 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
@@ -45,8 +45,6 @@ public class DownloadOsmTask extends AbstractDownloadTask {
protected DataSet downloadedData;
protected DownloadTask downloadTask;
- protected OsmDataLayer targetLayer;
-
protected String newLayerName = null;
@Override
@@ -170,41 +168,42 @@ public class DownloadOsmTask extends AbstractDownloadTask {
}
}
- protected class DownloadTask extends PleaseWaitRunnable {
- protected OsmServerReader reader;
+ /**
+ * Superclass of internal download task.
+ * @since 7636
+ */
+ public static abstract class AbstractInternalTask extends PleaseWaitRunnable {
+
+ protected final boolean newLayer;
protected DataSet dataSet;
- protected boolean newLayer;
- public DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) {
- super(tr("Downloading data"), progressMonitor, false);
- this.reader = reader;
+ /**
+ * Constructs a new {@code AbstractInternalTask}.
+ *
+ * @param newLayer if {@code true}, force download to a new layer
+ * @param title message for the user
+ * @param ignoreException If true, exception will be propagated to calling code. If false then
+ * exception will be thrown directly in EDT. When this runnable is executed using executor framework
+ * then use false unless you read result of task (because exception will get lost if you don't)
+ */
+ public AbstractInternalTask(boolean newLayer, String title, boolean ignoreException) {
+ super(title, ignoreException);
this.newLayer = newLayer;
}
- protected DataSet parseDataSet() throws OsmTransferException {
- return reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
- }
-
- @Override public void realRun() throws IOException, SAXException, OsmTransferException {
- try {
- if (isCanceled())
- return;
- dataSet = parseDataSet();
- } catch(Exception e) {
- if (isCanceled()) {
- Main.info(tr("Ignoring exception because download has been canceled. Exception was: {0}", e.toString()));
- return;
- }
- if (e instanceof OsmTransferCanceledException) {
- setCanceled(true);
- return;
- } else if (e instanceof OsmTransferException) {
- rememberException(e);
- } else {
- rememberException(new OsmTransferException(e));
- }
- DownloadOsmTask.this.setFailed(true);
- }
+ /**
+ * Constructs a new {@code AbstractInternalTask}.
+ *
+ * @param newLayer if {@code true}, force download to a new layer
+ * @param title message for the user
+ * @param progressMonitor progress monitor
+ * @param ignoreException If true, exception will be propagated to calling code. If false then
+ * exception will be thrown directly in EDT. When this runnable is executed using executor framework
+ * then use false unless you read result of task (because exception will get lost if you don't)
+ */
+ public AbstractInternalTask(boolean newLayer, String title, ProgressMonitor progressMonitor, boolean ignoreException) {
+ super(title, progressMonitor, ignoreException);
+ this.newLayer = newLayer;
}
protected OsmDataLayer getEditLayer() {
@@ -245,56 +244,105 @@ public class DownloadOsmTask extends AbstractDownloadTask {
return createNewLayer(null);
}
- @Override protected void finish() {
- if (isFailed() || isCanceled())
- return;
- if (dataSet == null)
- return; // user canceled download or error occurred
- if (dataSet.allPrimitives().isEmpty()) {
- rememberErrorMessage(tr("No data found in this area."));
- // need to synthesize a download bounds lest the visual indication of downloaded
- // area doesn't work
- dataSet.dataSources.add(new DataSource(currentBounds != null ? currentBounds : new Bounds(new LatLon(0, 0)), "OpenStreetMap server"));
+ protected void computeBboxAndCenterScale(Bounds bounds) {
+ BoundingXYVisitor v = new BoundingXYVisitor();
+ if (bounds != null) {
+ v.visit(bounds);
+ } else {
+ v.computeBoundingBox(dataSet.getNodes());
}
+ Main.map.mapView.recalculateCenterScale(v);
+ }
- rememberDownloadedData(dataSet);
+ protected OsmDataLayer addNewLayerIfRequired(String newLayerName, Bounds bounds) {
int numDataLayers = getNumDataLayers();
if (newLayer || numDataLayers == 0 || (numDataLayers > 1 && getEditLayer() == null)) {
// the user explicitly wants a new layer, we don't have any layer at all
// or it is not clear which layer to merge to
//
- targetLayer = createNewLayer(newLayerName);
+ final OsmDataLayer layer = createNewLayer(newLayerName);
final boolean isDisplayingMapView = Main.isDisplayingMapView();
- Main.main.addLayer(targetLayer);
+ Main.main.addLayer(layer);
// If the mapView is not there yet, we cannot calculate the bounds (see constructor of MapView).
// Otherwise jump to the current download.
if (isDisplayingMapView) {
- computeBboxAndCenterScale();
+ computeBboxAndCenterScale(bounds);
}
- } else {
- targetLayer = getEditLayer();
- if (targetLayer == null) {
- targetLayer = getFirstDataLayer();
+ return layer;
+ }
+ return null;
+ }
+
+ protected void loadData(String newLayerName, Bounds bounds) {
+ OsmDataLayer layer = addNewLayerIfRequired(newLayerName, bounds);
+ if (layer == null) {
+ layer = getEditLayer();
+ if (layer == null) {
+ layer = getFirstDataLayer();
}
- targetLayer.mergeFrom(dataSet);
- computeBboxAndCenterScale();
- targetLayer.onPostDownloadFromServer();
+ layer.mergeFrom(dataSet);
+ computeBboxAndCenterScale(bounds);
+ layer.onPostDownloadFromServer();
}
}
+ }
- protected void computeBboxAndCenterScale() {
- BoundingXYVisitor v = new BoundingXYVisitor();
- if (currentBounds != null) {
- v.visit(currentBounds);
- } else {
- v.computeBoundingBox(dataSet.getNodes());
+ protected class DownloadTask extends AbstractInternalTask {
+ protected final OsmServerReader reader;
+
+ public DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) {
+ super(newLayer, tr("Downloading data"), progressMonitor, false);
+ this.reader = reader;
+ }
+
+ protected DataSet parseDataSet() throws OsmTransferException {
+ return reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+ }
+
+ @Override
+ public void realRun() throws IOException, SAXException, OsmTransferException {
+ try {
+ if (isCanceled())
+ return;
+ dataSet = parseDataSet();
+ } catch(Exception e) {
+ if (isCanceled()) {
+ Main.info(tr("Ignoring exception because download has been canceled. Exception was: {0}", e.toString()));
+ return;
+ }
+ if (e instanceof OsmTransferCanceledException) {
+ setCanceled(true);
+ return;
+ } else if (e instanceof OsmTransferException) {
+ rememberException(e);
+ } else {
+ rememberException(new OsmTransferException(e));
+ }
+ DownloadOsmTask.this.setFailed(true);
}
- Main.map.mapView.recalculateCenterScale(v);
}
- @Override protected void cancel() {
+ @Override
+ protected void finish() {
+ if (isFailed() || isCanceled())
+ return;
+ if (dataSet == null)
+ return; // user canceled download or error occurred
+ if (dataSet.allPrimitives().isEmpty()) {
+ rememberErrorMessage(tr("No data found in this area."));
+ // need to synthesize a download bounds lest the visual indication of downloaded
+ // area doesn't work
+ dataSet.dataSources.add(new DataSource(currentBounds != null ? currentBounds : new Bounds(new LatLon(0, 0)), "OpenStreetMap server"));
+ }
+
+ rememberDownloadedData(dataSet);
+ loadData(newLayerName, currentBounds);
+ }
+
+ @Override
+ protected void cancel() {
setCanceled(true);
if (reader != null) {
reader.cancel();
diff --git a/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java b/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java
new file mode 100644
index 0000000..8bd07a7
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java
@@ -0,0 +1,90 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.mapmode;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.MouseEvent;
+
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.NoteData;
+import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.Notification;
+import org.openstreetmap.josm.gui.dialogs.NoteDialog;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * Map mode to add a new note. Listens for a mouse click and then
+ * prompts the user for text and adds a note to the note layer
+ */
+public class AddNoteAction extends MapMode {
+
+ private NoteData noteData;
+
+ /**
+ * Construct a new map mode.
+ * @param mapFrame Map frame to pass to the superconstructor
+ * @param data Note data container. Must not be null
+ */
+ public AddNoteAction(MapFrame mapFrame, NoteData data) {
+ super(tr("Add a new Note"), "addnote.png",
+ tr("Add note mode"),
+ mapFrame, ImageProvider.getCursor("crosshair", "create_note"));
+ if (data == null) {
+ throw new IllegalArgumentException("Note data must not be null");
+ }
+ noteData = data;
+ }
+
+ @Override
+ public String getModeHelpText() {
+ return tr("Click the location where you wish to create a new note");
+ }
+
+ @Override
+ public void enterMode() {
+ super.enterMode();
+ Main.map.mapView.addMouseListener(this);
+ }
+
+ @Override
+ public void exitMode() {
+ super.exitMode();
+ Main.map.mapView.removeMouseListener(this);
+ }
+
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ Main.map.selectMapMode(Main.map.mapModeSelect);
+ LatLon latlon = Main.map.mapView.getLatLon(e.getPoint().x, e.getPoint().y);
+ JLabel label = new JLabel(tr("Enter a comment for a new note"));
+ JTextArea textArea = new JTextArea();
+ textArea.setRows(6);
+ textArea.setColumns(30);
+ textArea.setLineWrap(true);
+ JScrollPane scrollPane = new JScrollPane(textArea);
+
+ Object[] components = new Object[]{label, scrollPane};
+ int option = JOptionPane.showConfirmDialog(Main.map,
+ components,
+ tr("Create new note"),
+ JOptionPane.OK_CANCEL_OPTION,
+ JOptionPane.PLAIN_MESSAGE,
+ NoteDialog.ICON_NEW);
+ if (option == JOptionPane.OK_OPTION) {
+ String input = textArea.getText();
+ if (input != null && !input.isEmpty()) {
+ noteData.createNote(latlon, input);
+ } else {
+ Notification notification = new Notification("You must enter a comment to create a new note");
+ notification.setIcon(JOptionPane.WARNING_MESSAGE);
+ notification.show();
+ }
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
index 130445b..f22877e 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
@@ -1141,8 +1141,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
* Draws given reference segment.
* @param g2 the Graphics2D object used to draw on
* @param mv
- * @param p1en segment's first point
- * @param p2en segment's second point
+ * @param seg the reference segment
*/
private void drawReferenceSegment(Graphics2D g2, MapView mv, ReferenceSegment seg)
{
diff --git a/src/org/openstreetmap/josm/data/APIDataSet.java b/src/org/openstreetmap/josm/data/APIDataSet.java
index b98f243..1958e69 100644
--- a/src/org/openstreetmap/josm/data/APIDataSet.java
+++ b/src/org/openstreetmap/josm/data/APIDataSet.java
@@ -28,11 +28,10 @@ import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.tools.Utils;
/**
- * Represents a collection of {@link OsmPrimitive}s which should be uploaded to the
- * API.
+ * Represents a collection of {@link OsmPrimitive}s which should be uploaded to the API.
* The collection is derived from the modified primitives of an {@link DataSet} and it provides methods
* for sorting the objects in upload order.
- *
+ * @since 2025
*/
public class APIDataSet {
private List<OsmPrimitive> toAdd;
@@ -64,9 +63,6 @@ public class APIDataSet {
toDelete.clear();
for (OsmPrimitive osm :primitives) {
- if (osm.get("josm/ignore") != null) {
- continue;
- }
if (osm.isNewOrUndeleted() && !osm.isDeleted()) {
toAdd.add(osm);
} else if (osm.isModified() && !osm.isDeleted()) {
diff --git a/src/org/openstreetmap/josm/data/osm/NoteData.java b/src/org/openstreetmap/josm/data/osm/NoteData.java
new file mode 100644
index 0000000..75fcf8a
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/osm/NoteData.java
@@ -0,0 +1,168 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.notes.Note;
+import org.openstreetmap.josm.data.notes.Note.State;
+import org.openstreetmap.josm.data.notes.NoteComment;
+import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+
+/**
+ * Class to hold and perform operations on a set of notes
+ */
+public class NoteData {
+
+ private long newNoteId = -1;
+
+ private final List<Note> noteList;
+ private Note selectedNote = null;
+
+ /**
+ * Construct a new note container with an empty note list
+ */
+ public NoteData() {
+ noteList = new ArrayList<>();
+ }
+
+ /**
+ * Construct a new note container with a given list of notes
+ * @param notes The list of notes to populate the container with
+ */
+ public NoteData(List<Note> notes) {
+ noteList = notes;
+ }
+
+ /**
+ * Returns the notes stored in this layer
+ * @return List of Note objects
+ */
+ public List<Note> getNotes() {
+ return noteList;
+ }
+
+ /** Returns the currently selected note
+ * @return currently selected note
+ */
+ public Note getSelectedNote() {
+ return selectedNote;
+ }
+
+ /** Set a selected note. Causes the dialog to select the note and
+ * the note layer to draw the selected note's comments.
+ * @param note Selected note. Null indicates no selection
+ */
+ public void setSelectedNote(Note note) {
+ selectedNote = note;
+ Main.map.noteDialog.selectionChanged();
+ Main.map.mapView.repaint();
+ }
+
+ /**
+ * Add notes to the data set. It only adds a note if the ID is not already present
+ * @param newNotes A list of notes to add
+ */
+ public void addNotes(List<Note> newNotes) {
+ for (Note newNote : newNotes) {
+ if (!noteList.contains(newNote)) {
+ noteList.add(newNote);
+ }
+ if (newNote.getId() <= newNoteId) {
+ newNoteId = newNote.getId() - 1;
+ }
+ }
+ dataUpdated();
+ Main.debug("notes in current set: " + noteList.size());
+ }
+
+ /**
+ * Create a new note
+ * @param location Location of note
+ * @param text Required comment with which to open the note
+ */
+ public void createNote(LatLon location, String text) {
+ if(text == null || text.isEmpty()) {
+ throw new IllegalArgumentException("Comment can not be blank when creating a note");
+ }
+ Note note = new Note(location);
+ note.setCreatedAt(new Date());
+ note.setState(State.open);
+ note.setId(newNoteId--);
+ NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.opened, true);
+ note.addComment(comment);
+ Main.debug("Created note {0} with comment: {1}", note.getId(), text);
+ noteList.add(note);
+ dataUpdated();
+ }
+
+ /**
+ * Add a new comment to an existing note
+ * @param note Note to add comment to. Must already exist in the layer
+ * @param text Comment to add
+ */
+ public void addCommentToNote(Note note, String text) {
+ if (!noteList.contains(note)) {
+ throw new IllegalArgumentException("Note to modify must be in layer");
+ }
+ if (note.getState() == State.closed) {
+ throw new IllegalStateException("Cannot add a comment to a closed note");
+ }
+ Main.debug("Adding comment to note {0}: {1}", note.getId(), text);
+ NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.commented, true);
+ note.addComment(comment);
+ dataUpdated();
+ }
+
+ /**
+ * Close note with comment
+ * @param note Note to close. Must already exist in the layer
+ * @param text Comment to attach to close action, if desired
+ */
+ public void closeNote(Note note, String text) {
+ if (!noteList.contains(note)) {
+ throw new IllegalArgumentException("Note to close must be in layer");
+ }
+ if (note.getState() != State.open) {
+ throw new IllegalStateException("Cannot close a note that isn't open");
+ }
+ Main.debug("closing note {0} with comment: {1}", note.getId(), text);
+ NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.closed, true);
+ note.addComment(comment);
+ note.setState(State.closed);
+ note.setClosedAt(new Date());
+ dataUpdated();
+ }
+
+ /**
+ * Reopen a closed note.
+ * @param note Note to reopen. Must already exist in the layer
+ * @param text Comment to attach to the reopen action, if desired
+ */
+ public void reOpenNote(Note note, String text) {
+ if (!noteList.contains(note)) {
+ throw new IllegalArgumentException("Note to reopen must be in layer");
+ }
+ if (note.getState() != State.closed) {
+ throw new IllegalStateException("Cannot reopen a note that isn't closed");
+ }
+ Main.debug("reopening note {0} with comment: {1}", note.getId(), text);
+ NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.reopened, true);
+ note.addComment(comment);
+ note.setState(State.open);
+ dataUpdated();
+ }
+
+ private void dataUpdated() {
+ Main.map.noteDialog.setNoteList(noteList);
+ Main.map.mapView.repaint();
+ }
+
+ private User getCurrentUser() {
+ JosmUserIdentityManager userMgr = JosmUserIdentityManager.getInstance();
+ return User.createOsmUser(userMgr.getUserId(), userMgr.getUserName());
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
index 62d5f90..c76d3f1 100644
--- a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
@@ -589,6 +589,10 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
return dataSet != null && dataSet.isSelected(this);
}
+ /**
+ * Determines if this primitive is a member of a selected relation.
+ * @return {@code true} if this primitive is a member of a selected relation, {@code false} otherwise
+ */
public boolean isMemberOfSelected() {
if (referrers == null)
return false;
@@ -601,6 +605,35 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
return false;
}
+ /**
+ * Determines if this primitive is an outer member of a selected multipolygon relation.
+ * @return {@code true} if this primitive is an outer member of a selected multipolygon relation, {@code false} otherwise
+ * @since 7621
+ */
+ public boolean isOuterMemberOfSelected() {
+ if (referrers == null)
+ return false;
+ if (referrers instanceof OsmPrimitive) {
+ return isOuterMemberOfMultipolygon((OsmPrimitive) referrers);
+ }
+ for (OsmPrimitive ref : (OsmPrimitive[]) referrers) {
+ if (isOuterMemberOfMultipolygon(ref))
+ return true;
+ }
+ return false;
+ }
+
+ private boolean isOuterMemberOfMultipolygon(OsmPrimitive ref) {
+ if (ref instanceof Relation && ref.isSelected() && ((Relation)ref).isMultipolygon()) {
+ for (RelationMember rm : ((Relation)ref).getMembersFor(Collections.singleton(this))) {
+ if ("outer".equals(rm.getRole())) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
public void setHighlighted(boolean highlighted) {
if (isHighlighted() != highlighted) {
updateFlags(FLAG_HIGHLIGHTED, highlighted);
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 34f4901..955eee8 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
@@ -290,6 +290,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
private static final int FLAG_DISABLED = 1;
private static final int FLAG_MEMBER_OF_SELECTED = 2;
private static final int FLAG_SELECTED = 4;
+ private static final int FLAG_OUTERMEMBER_OF_SELECTED = 8;
private static final double PHI = Math.toRadians(20);
private static final double cosPHI = Math.cos(PHI);
@@ -1513,6 +1514,8 @@ public class StyledMapRenderer extends AbstractMapRenderer {
add(w, FLAG_DISABLED);
} else if (w.isSelected()) {
add(w, FLAG_SELECTED);
+ } else if (w.isOuterMemberOfSelected()) {
+ add(w, FLAG_OUTERMEMBER_OF_SELECTED);
} else if (w.isMemberOfSelected()) {
add(w, FLAG_MEMBER_OF_SELECTED);
} else {
@@ -1526,6 +1529,8 @@ public class StyledMapRenderer extends AbstractMapRenderer {
add(r, FLAG_DISABLED);
} else if (r.isSelected()) {
add(r, FLAG_SELECTED);
+ } else if (r.isOuterMemberOfSelected()) {
+ add(r, FLAG_OUTERMEMBER_OF_SELECTED);
} else if (r.isMemberOfSelected()) {
add(r, FLAG_MEMBER_OF_SELECTED);
} else {
@@ -1653,6 +1658,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
paintSettings,
StyledMapRenderer.this,
(r.flags & FLAG_SELECTED) != 0,
+ (r.flags & FLAG_OUTERMEMBER_OF_SELECTED) != 0,
(r.flags & FLAG_MEMBER_OF_SELECTED) != 0
);
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
index 738f333..6bfe1ee 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
@@ -27,6 +27,7 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.command.ChangePropertyCommand;
import org.openstreetmap.josm.command.ChangePropertyKeyCommand;
import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.DeleteCommand;
import org.openstreetmap.josm.command.SequenceCommand;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmUtils;
@@ -36,6 +37,7 @@ import org.openstreetmap.josm.data.validation.Severity;
import org.openstreetmap.josm.data.validation.Test;
import org.openstreetmap.josm.data.validation.TestError;
import org.openstreetmap.josm.gui.mappaint.Environment;
+import org.openstreetmap.josm.gui.mappaint.Keyword;
import org.openstreetmap.josm.gui.mappaint.MultiCascade;
import org.openstreetmap.josm.gui.mappaint.mapcss.Condition;
import org.openstreetmap.josm.gui.mappaint.mapcss.Expression;
@@ -138,6 +140,7 @@ public class MapCSSTagChecker extends Test.TagTest {
protected final List<String> alternatives = new ArrayList<>();
protected final Map<Instruction.AssignmentInstruction, Severity> errors = new HashMap<>();
protected final Map<String, Boolean> assertions = new HashMap<>();
+ protected boolean deletion = false;
TagCheck(GroupedMapCSSRule rule) {
this.rule = rule;
@@ -209,6 +212,8 @@ public class MapCSSTagChecker extends Test.TagTest {
? (String) ((Expression) ai.val).evaluate(new Environment())
: ai.val instanceof String
? (String) ai.val
+ : ai.val instanceof Keyword
+ ? ((Keyword) ai.val).val
: null;
if (ai.key.startsWith("throw")) {
try {
@@ -237,6 +242,9 @@ public class MapCSSTagChecker extends Test.TagTest {
CheckParameterUtil.ensureThat(val.contains("=>"), "Separate old from new key by '=>'!");
final String[] x = val.split("=>", 2);
check.keyChange.put(Tag.removeWhiteSpaces(x[0]), Tag.removeWhiteSpaces(x[1]));
+ } else if ("fixDeleteObject".equals(ai.key) && val != null) {
+ CheckParameterUtil.ensureThat(val.equals("this"), "fixDeleteObject must be followed by 'this'");
+ check.deletion = true;
} else if ("suggestAlternative".equals(ai.key) && val != null) {
check.alternatives.add(val);
} else if ("assertMatch".equals(ai.key) && val != null) {
@@ -387,7 +395,7 @@ public class MapCSSTagChecker extends Test.TagTest {
* @return the fix or {@code null}
*/
Command fixPrimitive(OsmPrimitive p) {
- if (change.isEmpty() && keyChange.isEmpty()) {
+ if (change.isEmpty() && keyChange.isEmpty() && !deletion) {
return null;
}
final Selector matchingSelector = whichSelectorMatchesPrimitive(p);
@@ -403,6 +411,9 @@ public class MapCSSTagChecker extends Test.TagTest {
final String newKey = insertArguments(matchingSelector, i.getValue());
cmds.add(new ChangePropertyKeyCommand(p, oldKey, newKey));
}
+ if (deletion) {
+ cmds.add(new DeleteCommand(p));
+ }
return new SequenceCommand(tr("Fix of {0}", getDescriptionForMatchingSelector(p, matchingSelector)), cmds);
}
diff --git a/src/org/openstreetmap/josm/gui/MainMenu.java b/src/org/openstreetmap/josm/gui/MainMenu.java
index ac67ad6..6694cfe 100644
--- a/src/org/openstreetmap/josm/gui/MainMenu.java
+++ b/src/org/openstreetmap/josm/gui/MainMenu.java
@@ -72,6 +72,7 @@ import org.openstreetmap.josm.actions.PreferenceToggleAction;
import org.openstreetmap.josm.actions.PreferencesAction;
import org.openstreetmap.josm.actions.PurgeAction;
import org.openstreetmap.josm.actions.RedoAction;
+import org.openstreetmap.josm.actions.ReportBugAction;
import org.openstreetmap.josm.actions.RestartAction;
import org.openstreetmap.josm.actions.ReverseWayAction;
import org.openstreetmap.josm.actions.SaveAction;
@@ -295,6 +296,8 @@ public class MainMenu extends JMenuBar {
public final AboutAction about = new AboutAction();
/** Help / Show Status Report */
public final ShowStatusReportAction statusreport = new ShowStatusReportAction();
+ /** Help / Report bug */
+ public final ReportBugAction reportbug = new ReportBugAction();
/**
* fileMenu contains I/O actions
@@ -762,6 +765,8 @@ public class MainMenu extends JMenuBar {
});
helpMenu.add(statusreport);
+ helpMenu.add(reportbug);
+ helpMenu.addSeparator();
current = helpMenu.add(help); // FIXME why is help not a JosmAction?
current.setAccelerator(Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1,
diff --git a/src/org/openstreetmap/josm/gui/MapFrame.java b/src/org/openstreetmap/josm/gui/MapFrame.java
index 1a0ff1e..d1a0035 100644
--- a/src/org/openstreetmap/josm/gui/MapFrame.java
+++ b/src/org/openstreetmap/josm/gui/MapFrame.java
@@ -66,6 +66,7 @@ import org.openstreetmap.josm.gui.dialogs.FilterDialog;
import org.openstreetmap.josm.gui.dialogs.HistoryDialog;
import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
import org.openstreetmap.josm.gui.dialogs.MapPaintDialog;
+import org.openstreetmap.josm.gui.dialogs.NoteDialog;
import org.openstreetmap.josm.gui.dialogs.RelationListDialog;
import org.openstreetmap.josm.gui.dialogs.SelectionListDialog;
import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
@@ -132,6 +133,7 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
public ValidatorDialog validatorDialog;
public SelectionListDialog selectionListDialog;
public PropertiesDialog propertiesDialog;
+ public NoteDialog noteDialog;
// Map modes
public final SelectAction mapModeSelect;
@@ -242,6 +244,10 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
addToggleDialog(filterDialog = new FilterDialog());
addToggleDialog(new ChangesetDialog(), true);
addToggleDialog(new MapPaintDialog());
+ //TODO: remove this if statement once note support is complete
+ if(Main.pref.getBoolean("osm.notes.enableDownload", false)) {
+ addToggleDialog(noteDialog = new NoteDialog());
+ }
toolBarToggle.setFloatable(false);
// status line below the map
diff --git a/src/org/openstreetmap/josm/gui/MapMover.java b/src/org/openstreetmap/josm/gui/MapMover.java
index 7c3ec94..09c5c4e 100644
--- a/src/org/openstreetmap/josm/gui/MapMover.java
+++ b/src/org/openstreetmap/josm/gui/MapMover.java
@@ -115,15 +115,18 @@ public class MapMover extends MouseAdapter implements MouseMotionListener, Mouse
"MapMover.Zoomer.down");
contentPane.getActionMap().put("MapMover.Zoomer.down", new ZoomerAction("down"));
- contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
- Shortcut.registerShortcut("view:zoominalternate", tr("Map: {0}", tr("Zoom in")), KeyEvent.VK_COMMA, Shortcut.CTRL).getKeyStroke(),
- "MapMover.Zoomer.in");
- contentPane.getActionMap().put("MapMover.Zoomer.in", new ZoomerAction(","));
+ // see #10592 - Disable these alternate shortcuts on OS X because of conflict with system shortcut
+ if (!Main.isPlatformOsx()) {
+ contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
+ Shortcut.registerShortcut("view:zoominalternate", tr("Map: {0}", tr("Zoom in")), KeyEvent.VK_COMMA, Shortcut.CTRL).getKeyStroke(),
+ "MapMover.Zoomer.in");
+ contentPane.getActionMap().put("MapMover.Zoomer.in", new ZoomerAction(","));
- contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
- Shortcut.registerShortcut("view:zoomoutalternate", tr("Map: {0}", tr("Zoom out")), KeyEvent.VK_PERIOD, Shortcut.CTRL).getKeyStroke(),
- "MapMover.Zoomer.out");
- contentPane.getActionMap().put("MapMover.Zoomer.out", new ZoomerAction("."));
+ contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
+ Shortcut.registerShortcut("view:zoomoutalternate", tr("Map: {0}", tr("Zoom out")), KeyEvent.VK_PERIOD, Shortcut.CTRL).getKeyStroke(),
+ "MapMover.Zoomer.out");
+ contentPane.getActionMap().put("MapMover.Zoomer.out", new ZoomerAction("."));
+ }
}
}
@@ -137,7 +140,7 @@ public class MapMover extends MouseAdapter implements MouseMotionListener, Mouse
boolean stdMovement = (e.getModifiersEx() & (MouseEvent.BUTTON3_DOWN_MASK | offMask)) == MouseEvent.BUTTON3_DOWN_MASK;
boolean macMovement = Main.isPlatformOsx() && e.getModifiersEx() == macMouseMask;
boolean allowedMode = !Main.map.mapModeSelect.equals(Main.map.mapMode)
- || Main.map.mapModeSelect.getMode().equals(SelectAction.Mode.SELECT);
+ || SelectAction.Mode.SELECT.equals(Main.map.mapModeSelect.getMode());
if (stdMovement || (macMovement && allowedMode)) {
if (mousePosMove == null)
startMovement(e);
diff --git a/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java b/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
index 2038daf..709e6e4 100644
--- a/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
+++ b/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
@@ -31,10 +31,12 @@ public abstract class PleaseWaitRunnable implements Runnable, CancelListener {
/**
* Create the runnable object with a given message for the user.
+ * @param title message for the user
*/
public PleaseWaitRunnable(String title) {
this(title, false);
}
+
/**
* Create the runnable object with a given message for the user.
*
@@ -64,6 +66,15 @@ public abstract class PleaseWaitRunnable implements Runnable, CancelListener {
this.ignoreException = ignoreException;
}
+ /**
+ * Create the runnable object with a given message for the user
+ *
+ * @param title message for the user
+ * @param progressMonitor progress monitor
+ * @param ignoreException If true, exception will be propagated to calling code. If false then
+ * exception will be thrown directly in EDT. When this runnable is executed using executor framework
+ * then use false unless you read result of task (because exception will get lost if you don't)
+ */
public PleaseWaitRunnable(String title, ProgressMonitor progressMonitor, boolean ignoreException) {
this.title = title;
this.progressMonitor = progressMonitor == null?new PleaseWaitProgressMonitor(title):progressMonitor;
@@ -174,6 +185,10 @@ public abstract class PleaseWaitRunnable implements Runnable, CancelListener {
*/
protected abstract void finish();
+ /**
+ * Relies the progress monitor.
+ * @return the progress monitor
+ */
public ProgressMonitor getProgressMonitor() {
return progressMonitor;
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
index 3859a64..4089e2e 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
@@ -84,7 +84,7 @@ public class TagConflictResolverModel extends DefaultTableModel {
* initializes the model from the current tags
*
*/
- protected void rebuild() {
+ public void rebuild() {
if (tags == null) return;
for(String key: tags.getKeys()) {
MultiValueResolutionDecision decision = new MultiValueResolutionDecision(tags.getTagsFor(key));
@@ -190,11 +190,10 @@ public class TagConflictResolverModel extends DefaultTableModel {
/**
* Replies true if each {@link MultiValueResolutionDecision} is decided.
*
- * @return true if each {@link MultiValueResolutionDecision} is decided; false
- * otherwise
+ * @return true if each {@link MultiValueResolutionDecision} is decided; false otherwise
*/
public boolean isResolvedCompletely() {
- return numConflicts == 0;
+ return numConflicts == 0 && keysWithConflicts != null && keysWithConflicts.isEmpty();
}
public int getNumConflicts() {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
index c11345e..8b9f63a 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
@@ -192,7 +192,6 @@ public class LayerListDialog extends ToggleDialog {
layerList.getColumnModel().getColumn(2).setCellEditor(new LayerNameCellEditor(new DisableShortcutsOnFocusGainedTextField()));
// Disable some default JTable shortcuts to use JOSM ones (see #5678, #10458)
for (KeyStroke ks : new KeyStroke[] {
- KeyStroke.getKeyStroke(KeyEvent.VK_A, GuiHelper.getMenuShortcutKeyMaskEx()),
KeyStroke.getKeyStroke(KeyEvent.VK_C, GuiHelper.getMenuShortcutKeyMaskEx()),
KeyStroke.getKeyStroke(KeyEvent.VK_V, GuiHelper.getMenuShortcutKeyMaskEx()),
KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.SHIFT_DOWN_MASK),
diff --git a/src/org/openstreetmap/josm/gui/dialogs/NoteDialog.java b/src/org/openstreetmap/josm/gui/dialogs/NoteDialog.java
new file mode 100644
index 0000000..a765f75
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/NoteDialog.java
@@ -0,0 +1,356 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Image;
+import java.awt.event.ActionEvent;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.swing.AbstractAction;
+import javax.swing.AbstractListModel;
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ListCellRenderer;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.mapmode.AddNoteAction;
+import org.openstreetmap.josm.data.notes.Note;
+import org.openstreetmap.josm.data.notes.Note.State;
+import org.openstreetmap.josm.data.osm.NoteData;
+import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
+import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.NoteLayer;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * Dialog to display and manipulate notes
+ */
+public class NoteDialog extends ToggleDialog implements LayerChangeListener {
+
+
+ /** Small icon size for use in graphics calculations */
+ public static final int ICON_SMALL_SIZE = 16;
+ /** Large icon size for use in graphics calculations */
+ public static final int ICON_LARGE_SIZE = 24;
+ /** 24x24 icon for unresolved notes */
+ public static final ImageIcon ICON_OPEN = ImageProvider.get("dialogs/notes", "note_open.png");
+ /** 16x16 icon for unresolved notes */
+ public static final ImageIcon ICON_OPEN_SMALL =
+ new ImageIcon(ICON_OPEN.getImage().getScaledInstance(ICON_SMALL_SIZE, ICON_SMALL_SIZE, Image.SCALE_SMOOTH));
+ /** 24x24 icon for resolved notes */
+ public static final ImageIcon ICON_CLOSED = ImageProvider.get("dialogs/notes", "note_closed.png");
+ /** 16x16 icon for resolved notes */
+ public static final ImageIcon ICON_CLOSED_SMALL =
+ new ImageIcon(ICON_CLOSED.getImage().getScaledInstance(ICON_SMALL_SIZE, ICON_SMALL_SIZE, Image.SCALE_SMOOTH));
+ /** 24x24 icon for new notes */
+ public static final ImageIcon ICON_NEW = ImageProvider.get("dialogs/notes", "note_new.png");
+ /** 16x16 icon for new notes */
+ public static final ImageIcon ICON_NEW_SMALL =
+ new ImageIcon(ICON_NEW.getImage().getScaledInstance(ICON_SMALL_SIZE, ICON_SMALL_SIZE, Image.SCALE_SMOOTH));
+ /** Icon for note comments */
+ public static final ImageIcon ICON_COMMENT = ImageProvider.get("dialogs/notes", "note_comment.png");
+
+ private NoteTableModel model;
+ private JList<Note> displayList;
+ private final AddCommentAction addCommentAction;
+ private final CloseAction closeAction;
+ private final NewAction newAction;
+ private final ReopenAction reopenAction;
+
+ private NoteData noteData;
+
+ /** Creates a new toggle dialog for notes */
+ public NoteDialog() {
+ super("Notes", "notes/note_open.png", "List of notes", null, 150);
+ Main.debug("constructed note dialog");
+
+ addCommentAction = new AddCommentAction();
+ closeAction = new CloseAction();
+ newAction = new NewAction();
+ reopenAction = new ReopenAction();
+ buildDialog();
+ }
+
+ @Override
+ public void showDialog() {
+ super.showDialog();
+ }
+
+ private void buildDialog() {
+ model = new NoteTableModel();
+ displayList = new JList<Note>(model);
+ displayList.setCellRenderer(new NoteRenderer());
+ displayList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ displayList.addListSelectionListener(new ListSelectionListener() {
+ @Override
+ public void valueChanged(ListSelectionEvent e) {
+ if (noteData != null) { //happens when layer is deleted while note selected
+ noteData.setSelectedNote(displayList.getSelectedValue());
+ }
+ updateButtonStates();
+ }});
+
+ JPanel pane = new JPanel(new BorderLayout());
+ pane.add(new JScrollPane(displayList), BorderLayout.CENTER);
+
+ createLayout(pane, false, Arrays.asList(new SideButton[]{
+ new SideButton(newAction, false),
+ new SideButton(addCommentAction, false),
+ new SideButton(closeAction, false),
+ new SideButton(reopenAction, false)}));
+ updateButtonStates();
+ }
+
+ private void updateButtonStates() {
+ if (noteData == null || noteData.getSelectedNote() == null) {
+ closeAction.setEnabled(false);
+ addCommentAction.setEnabled(false);
+ reopenAction.setEnabled(false);
+ } else if (noteData.getSelectedNote().getState() == State.open){
+ closeAction.setEnabled(true);
+ addCommentAction.setEnabled(true);
+ reopenAction.setEnabled(false);
+ } else { //note is closed
+ closeAction.setEnabled(false);
+ addCommentAction.setEnabled(false);
+ reopenAction.setEnabled(true);
+ }
+ }
+
+ @Override
+ public void showNotify() {
+ MapView.addLayerChangeListener(this);
+ }
+
+ @Override
+ public void hideNotify() {
+ MapView.removeLayerChangeListener(this);
+ }
+
+ @Override
+ public void activeLayerChange(Layer oldLayer, Layer newLayer) { }
+
+ @Override
+ public void layerAdded(Layer newLayer) {
+ Main.debug("layer added: " + newLayer);
+ if (newLayer instanceof NoteLayer) {
+ Main.debug("note layer added");
+ noteData = ((NoteLayer)newLayer).getNoteData();
+ model.setData(noteData.getNotes());
+ }
+ }
+
+ @Override
+ public void layerRemoved(Layer oldLayer) {
+ if (oldLayer instanceof NoteLayer) {
+ Main.debug("note layer removed. Clearing everything");
+ noteData = null;
+ model.clearData();
+ if (Main.map.mapMode instanceof AddNoteAction) {
+ Main.map.selectMapMode(Main.map.mapModeSelect);
+ }
+ }
+ }
+
+ /**
+ * Sets the list of notes to be displayed in the dialog.
+ * The dialog should match the notes displayed in the note layer.
+ * @param noteList List of notes to display
+ */
+ public void setNoteList(List<Note> noteList) {
+ model.setData(noteList);
+ updateButtonStates();
+ this.repaint();
+ }
+
+ /**
+ * Notify the dialog that the note selection has changed.
+ * Causes it to update or clear its selection in the UI.
+ */
+ public void selectionChanged() {
+ if (noteData == null || noteData.getSelectedNote() == null) {
+ displayList.clearSelection();
+ } else {
+ displayList.setSelectedValue(noteData.getSelectedNote(), true);
+ }
+ updateButtonStates();
+ }
+
+ private class NoteRenderer implements ListCellRenderer<Note> {
+
+ private DefaultListCellRenderer defaultListCellRenderer = new DefaultListCellRenderer();
+ private final SimpleDateFormat sdf = new SimpleDateFormat("dd MMM yyyy kk:mm");
+
+ @Override
+ public Component getListCellRendererComponent(JList<? extends Note> list, Note note, int index,
+ boolean isSelected, boolean cellHasFocus) {
+ Component comp = defaultListCellRenderer.getListCellRendererComponent(list, note, index, isSelected, cellHasFocus);
+ if (note != null && comp instanceof JLabel) {
+ String text = note.getFirstComment().getText();
+ String userName = note.getFirstComment().getUser().getName();
+ if (userName == null || userName.isEmpty()) {
+ userName = "<Anonymous>";
+ }
+ String toolTipText = userName + " @ " + sdf.format(note.getCreatedAt());
+ JLabel jlabel = (JLabel)comp;
+ jlabel.setText(text);
+ ImageIcon icon;
+ if (note.getId() < 0) {
+ icon = ICON_NEW_SMALL;
+ } else if (note.getState() == State.closed) {
+ icon = ICON_CLOSED_SMALL;
+ } else {
+ icon = ICON_OPEN_SMALL;
+ }
+ jlabel.setIcon(icon);
+ jlabel.setToolTipText(toolTipText);
+ }
+ return comp;
+ }
+ }
+
+ class NoteTableModel extends AbstractListModel<Note> {
+ private List<Note> data;
+
+ public NoteTableModel() {
+ data = new ArrayList<Note>();
+ }
+
+ @Override
+ public int getSize() {
+ if (data == null) {
+ return 0;
+ }
+ return data.size();
+ }
+
+ @Override
+ public Note getElementAt(int index) {
+ return data.get(index);
+ }
+
+ public void setData(List<Note> noteList) {
+ data.clear();
+ data.addAll(noteList);
+ fireContentsChanged(this, 0, noteList.size());
+ }
+
+ public void clearData() {
+ displayList.clearSelection();
+ data.clear();
+ fireIntervalRemoved(this, 0, getSize());
+ }
+ }
+
+ class AddCommentAction extends AbstractAction {
+
+ public AddCommentAction() {
+ putValue(SHORT_DESCRIPTION,tr("Add comment"));
+ putValue(NAME, tr("Comment"));
+ putValue(SMALL_ICON, ICON_COMMENT);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ Note note = displayList.getSelectedValue();
+ if (note == null) {
+ JOptionPane.showMessageDialog(Main.map,
+ "You must select a note first",
+ "No note selected",
+ JOptionPane.ERROR_MESSAGE);
+ return;
+ }
+ Object userInput = JOptionPane.showInputDialog(Main.map,
+ tr("Add comment to note:"),
+ tr("Add comment"),
+ JOptionPane.QUESTION_MESSAGE,
+ ICON_COMMENT,
+ null,null);
+ if (userInput == null) { //user pressed cancel
+ return;
+ }
+ noteData.addCommentToNote(note, userInput.toString());
+ }
+ }
+
+ class CloseAction extends AbstractAction {
+
+ public CloseAction() {
+ putValue(SHORT_DESCRIPTION,tr("Close note"));
+ putValue(NAME, tr("Close"));
+ putValue(SMALL_ICON, ICON_CLOSED);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ Object userInput = JOptionPane.showInputDialog(Main.map,
+ tr("Close note with message:"),
+ tr("Close Note"),
+ JOptionPane.QUESTION_MESSAGE,
+ ICON_CLOSED,
+ null,null);
+ if (userInput == null) { //user pressed cancel
+ return;
+ }
+ Note note = displayList.getSelectedValue();
+ noteData.closeNote(note, userInput.toString());
+ }
+ }
+
+ class NewAction extends AbstractAction {
+
+ public NewAction() {
+ putValue(SHORT_DESCRIPTION,tr("Create a new note"));
+ putValue(NAME, tr("Create"));
+ putValue(SMALL_ICON, ICON_NEW);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (noteData == null) { //there is no notes layer. Create one first
+ Main.map.mapView.addLayer(new NoteLayer());
+ }
+ Main.map.selectMapMode(new AddNoteAction(Main.map, noteData));
+ }
+ }
+
+ class ReopenAction extends AbstractAction {
+
+ public ReopenAction() {
+ putValue(SHORT_DESCRIPTION,tr("Reopen note"));
+ putValue(NAME, tr("Reopen"));
+ putValue(SMALL_ICON, ICON_OPEN);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ Object userInput = JOptionPane.showInputDialog(Main.map,
+ tr("Reopen note with message:"),
+ tr("Reopen note"),
+ JOptionPane.QUESTION_MESSAGE,
+ ICON_OPEN,
+ null,null);
+ if (userInput == null) { //user pressed cancel
+ return;
+ }
+ Note note = displayList.getSelectedValue();
+ noteData.reOpenNote(note, userInput.toString());
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
index 6992c56..864331b 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
@@ -437,13 +437,12 @@ public class GenericRelationEditor extends RelationEditor {
* @return panel with current selection
*/
protected JPanel buildSelectionTablePanel() {
- JPanel pnl = new JPanel();
- pnl.setLayout(new BorderLayout());
+ JPanel pnl = new JPanel(new BorderLayout());
+ MemberRoleCellEditor ce = (MemberRoleCellEditor)memberTable.getColumnModel().getColumn(0).getCellEditor();
selectionTable = new SelectionTable(selectionTableModel, new SelectionTableColumnModel(memberTableModel));
selectionTable.setMemberTableModel(memberTableModel);
- selectionTable.setRowHeight(tfRole.getPreferredSize().height);
- JScrollPane pane = new JScrollPane(selectionTable);
- pnl.add(pane, BorderLayout.CENTER);
+ selectionTable.setRowHeight(ce.getEditor().getPreferredSize().height);
+ pnl.add(new JScrollPane(selectionTable), BorderLayout.CENTER);
return pnl;
}
diff --git a/src/org/openstreetmap/josm/gui/download/PlaceSelection.java b/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
index aba8b7d..63000e9 100644
--- a/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
+++ b/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
@@ -30,6 +30,7 @@ import javax.swing.BorderFactory;
import javax.swing.DefaultListSelectionModel;
import javax.swing.JButton;
import javax.swing.JLabel;
+import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
@@ -49,7 +50,9 @@ import javax.xml.parsers.SAXParserFactory;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.gui.ExceptionDialogUtil;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
import org.openstreetmap.josm.gui.widgets.JosmComboBox;
import org.openstreetmap.josm.io.OsmTransferException;
@@ -60,6 +63,7 @@ import org.openstreetmap.josm.tools.Utils;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
public class PlaceSelection implements DownloadSelection {
@@ -378,13 +382,28 @@ public class PlaceSelection implements DownloadSelection {
SAXParserFactory.newInstance().newSAXParser().parse(inputSource, parser);
this.data = parser.getResult();
}
- } catch(Exception e) {
- if (canceled)
- // ignore exception
- return;
- OsmTransferException ex = new OsmTransferException(e);
- ex.setUrl(urlString);
- lastException = ex;
+ } catch (SAXParseException e) {
+ if (!canceled) {
+ // Nominatim sometimes returns garbage, see #5934, #10643
+ Main.warn(tr("Error occured with query ''{0}'': ''{1}''", urlString, e.getMessage()));
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override
+ public void run() {
+ HelpAwareOptionPane.showOptionDialog(
+ Main.parent,
+ tr("Name server returned invalid data. Please try again."),
+ tr("Bad response"),
+ JOptionPane.WARNING_MESSAGE, null
+ );
+ }
+ });
+ }
+ } catch (Exception e) {
+ if (!canceled) {
+ OsmTransferException ex = new OsmTransferException(e);
+ ex.setUrl(urlString);
+ lastException = ex;
+ }
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java b/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java
index 056f397..cd7e7b7 100644
--- a/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java
+++ b/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java
@@ -78,7 +78,7 @@ public class DownloadPrimitivesWithReferrersTask extends PleaseWaitRunnable {
/**
* Cancel recursively the task. Do not call directly
- * @see DownloadPrimitivesWithReferrersTask#operationCancel
+ * @see DownloadPrimitivesWithReferrersTask#operationCanceled()
*/
@Override
protected void cancel() {
diff --git a/src/org/openstreetmap/josm/gui/layer/NoteLayer.java b/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
index 574906b..3b108fb 100644
--- a/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
@@ -3,32 +3,40 @@ package org.openstreetmap.josm.gui.layer;
import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.Point;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import javax.swing.Action;
import javax.swing.Icon;
import javax.swing.ImageIcon;
+import javax.swing.JToolTip;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.notes.Note;
import org.openstreetmap.josm.data.notes.Note.State;
import org.openstreetmap.josm.data.notes.NoteComment;
+import org.openstreetmap.josm.data.osm.NoteData;
import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
-import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.gui.dialogs.NoteDialog;
+import org.openstreetmap.josm.io.XmlWriter;
+import org.openstreetmap.josm.tools.ColorHelper;
/**
* A layer to hold Note objects
*/
-public class NoteLayer extends AbstractModifiableLayer {
+public class NoteLayer extends AbstractModifiableLayer implements MouseListener {
- private final List<Note> notes;
+ private final NoteData noteData;
/**
* Create a new note layer with a set of notes
@@ -37,12 +45,34 @@ public class NoteLayer extends AbstractModifiableLayer {
*/
public NoteLayer(List<Note> notes, String name) {
super(name);
- this.notes = notes;
+ noteData = new NoteData(notes);
+ init();
+ }
+
+ /** Convenience constructor that creates a layer with an empty note list */
+ public NoteLayer() {
+ super(tr("Notes"));
+ noteData = new NoteData();
+ init();
+ }
+
+ private void init() {
+ if (Main.map != null && Main.map.mapView != null) {
+ Main.map.mapView.addMouseListener(this);
+ }
+ }
+
+ /**
+ * Returns the note data store being used by this layer
+ * @return noteData containing layer notes
+ */
+ public NoteData getNoteData() {
+ return noteData;
}
@Override
public boolean isModified() {
- for (Note note : notes) {
+ for (Note note : noteData.getNotes()) {
if (note.getId() < 0) { //notes with negative IDs are new
return true;
}
@@ -62,31 +92,77 @@ public class NoteLayer extends AbstractModifiableLayer {
@Override
public void paint(Graphics2D g, MapView mv, Bounds box) {
- for (Note note : notes) {
+ for (Note note : noteData.getNotes()) {
Point p = mv.getPoint(note.getLatLon());
ImageIcon icon = null;
if (note.getId() < 0) {
- icon = ImageProvider.get("notes", "note_new_16x16.png");
+ icon = NoteDialog.ICON_NEW_SMALL;
} else if (note.getState() == State.closed) {
- icon = ImageProvider.get("notes", "note_closed_16x16.png");
+ icon = NoteDialog.ICON_CLOSED_SMALL;
} else {
- icon = ImageProvider.get("notes", "note_open_16x16.png");
+ icon = NoteDialog.ICON_OPEN_SMALL;
}
int width = icon.getIconWidth();
int height = icon.getIconHeight();
g.drawImage(icon.getImage(), p.x - (width / 2), p.y - height, Main.map.mapView);
}
+ if (noteData.getSelectedNote() != null) {
+ StringBuilder sb = new StringBuilder("<html>");
+ List<NoteComment> comments = noteData.getSelectedNote().getComments();
+ String sep = "";
+ SimpleDateFormat dayFormat = new SimpleDateFormat("MMM d, yyyy");
+ for (NoteComment comment : comments) {
+ String commentText = comment.getText();
+ //closing a note creates an empty comment that we don't want to show
+ if (commentText != null && commentText.trim().length() > 0) {
+ sb.append(sep);
+ String userName = comment.getUser().getName();
+ if (userName == null || userName.trim().length() == 0) {
+ userName = "<Anonymous>";
+ }
+ sb.append(userName);
+ sb.append(" on ");
+ sb.append(dayFormat.format(comment.getCommentTimestamp()));
+ sb.append(":<br/>");
+ String htmlText = XmlWriter.encode(comment.getText(), true);
+ htmlText = htmlText.replace("
", "<br/>"); //encode method leaves us with entity instead of \n
+ sb.append(htmlText);
+ }
+ sep = "<hr/>";
+ }
+ sb.append("</html>");
+ JToolTip toolTip = new JToolTip();
+ toolTip.setTipText(sb.toString());
+ Point p = mv.getPoint(noteData.getSelectedNote().getLatLon());
+
+ g.setColor(ColorHelper.html2color(Main.pref.get("color.selected")));
+ g.drawRect(p.x - (NoteDialog.ICON_SMALL_SIZE / 2), p.y - NoteDialog.ICON_SMALL_SIZE, NoteDialog.ICON_SMALL_SIZE - 1, NoteDialog.ICON_SMALL_SIZE - 1);
+
+ int tx = p.x + (NoteDialog.ICON_SMALL_SIZE / 2) + 5;
+ int ty = p.y - NoteDialog.ICON_SMALL_SIZE - 1;
+ g.translate(tx, ty);
+
+ //Carried over from the OSB plugin. Not entirely sure why it is needed
+ //but without it, the tooltip doesn't get sized correctly
+ for (int x = 0; x < 2; x++) {
+ Dimension d = toolTip.getUI().getPreferredSize(toolTip);
+ d.width = Math.min(d.width, (mv.getWidth() * 1 / 2));
+ toolTip.setSize(d);
+ toolTip.paint(g);
+ }
+ g.translate(-tx, -ty);
+ }
}
@Override
public Icon getIcon() {
- return ImageProvider.get("notes", "note_open_16x16.png");
+ return NoteDialog.ICON_OPEN_SMALL;
}
@Override
public String getToolTipText() {
- return notes.size() + " " + tr("Notes");
+ return noteData.getNotes().size() + " " + tr("Notes");
}
@Override
@@ -110,7 +186,7 @@ public class NoteLayer extends AbstractModifiableLayer {
sb.append("\n");
sb.append(tr("Total notes:"));
sb.append(" ");
- sb.append(notes.size());
+ sb.append(noteData.getNotes().size());
sb.append("\n");
sb.append(tr("Changes need uploading?"));
sb.append(" ");
@@ -127,25 +203,37 @@ public class NoteLayer extends AbstractModifiableLayer {
return actions.toArray(new Action[actions.size()]);
}
- /**
- * Returns the notes stored in this layer
- * @return List of Note objects
- */
- public List<Note> getNotes() {
- return notes;
- }
-
- /**
- * Add notes to the layer. It only adds a note if the ID is not already present
- * @param newNotes A list of notes to add
- */
- public void addNotes(List<Note> newNotes) {
- for (Note newNote : newNotes) {
- if (!notes.contains(newNote)) {
- notes.add(newNote);
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ if (e.getButton() != MouseEvent.BUTTON1) {
+ return;
+ }
+ Point clickPoint = e.getPoint();
+ double snapDistance = 10;
+ double minDistance = Double.MAX_VALUE;
+ Note closestNote = null;
+ for (Note note : noteData.getNotes()) {
+ Point notePoint = Main.map.mapView.getPoint(note.getLatLon());
+ //move the note point to the center of the icon where users are most likely to click when selecting
+ notePoint.setLocation(notePoint.getX(), notePoint.getY() - NoteDialog.ICON_SMALL_SIZE / 2);
+ double dist = clickPoint.distanceSq(notePoint);
+ if (minDistance > dist && clickPoint.distance(notePoint) < snapDistance ) {
+ minDistance = dist;
+ closestNote = note;
}
}
- Main.map.mapView.repaint();
- Main.debug("notes in layer: " + notes.size());
+ noteData.setSelectedNote(closestNote);
}
+
+ @Override
+ public void mousePressed(MouseEvent e) { }
+
+ @Override
+ public void mouseReleased(MouseEvent e) { }
+
+ @Override
+ public void mouseEntered(MouseEvent e) { }
+
+ @Override
+ public void mouseExited(MouseEvent e) { }
}
diff --git a/src/org/openstreetmap/josm/gui/layer/WMSLayer.java b/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
index b9b698b..2d58f35 100644
--- a/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
@@ -97,6 +97,7 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
}
// Fake reference to keep build scripts from removing ObjectFactory class. This class is not used directly but it's necessary for jaxb to work
+ @SuppressWarnings("unused")
private static final ObjectFactory OBJECT_FACTORY = null;
// these values correspond to the zoom levels used throughout OSM and are in meters/pixel from zoom level 0 to 18.
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
index 5da528b..57c62a0 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
@@ -363,7 +363,9 @@ public final class ImageViewerDialog extends ToggleDialog implements LayerChange
@Override
public void activeLayerChange(Layer oldLayer, Layer newLayer) {
- // Ignored
+ if (currentLayer == null && newLayer instanceof GeoImageLayer) {
+ ((GeoImageLayer)newLayer).showFirstPhoto();
+ }
}
@Override
@@ -377,5 +379,9 @@ public final class ImageViewerDialog extends ToggleDialog implements LayerChange
if (currentLayer != null && currentLayer.equals(oldLayer)) {
showImage(null, null);
}
+ // Check buttons state in case of layer merging
+ if (currentLayer != null && oldLayer instanceof GeoImageLayer) {
+ currentLayer.checkPreviousNextButtons();
+ }
}
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java
index 8cdc988..f349a69 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java
@@ -85,19 +85,20 @@ public class AreaElemStyle extends ElemStyle {
}
@Override
- public void paintPrimitive(OsmPrimitive osm, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member) {
+ public void paintPrimitive(OsmPrimitive osm, MapPaintSettings paintSettings, StyledMapRenderer painter,
+ boolean selected, boolean outermember, boolean member) {
Color myColor = color;
if (osm instanceof Way) {
if (color != null) {
if (selected) {
myColor = paintSettings.getSelectedColor(color.getAlpha());
- } else if (member) {
+ } else if (outermember) {
myColor = paintSettings.getRelationSelectedColor(color.getAlpha());
}
}
painter.drawArea((Way) osm, myColor, fillImage, text);
} else if (osm instanceof Relation) {
- if (color != null && (selected || (member && ((Relation) osm).isMultipolygon()))) {
+ if (color != null && (selected || outermember)) {
myColor = paintSettings.getRelationSelectedColor(color.getAlpha());
}
painter.drawArea((Relation) osm, myColor, fillImage, text);
diff --git a/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java
index 530f486..c7fe518 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java
@@ -178,7 +178,8 @@ public class BoxTextElemStyle extends ElemStyle {
}
@Override
- public void paintPrimitive(OsmPrimitive osm, MapPaintSettings settings, StyledMapRenderer painter, boolean selected, boolean member) {
+ public void paintPrimitive(OsmPrimitive osm, MapPaintSettings settings, StyledMapRenderer painter,
+ boolean selected, boolean outermember, boolean member) {
if (osm instanceof Node) {
painter.drawBoxText((Node) osm, this);
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
index ce544d6..de5eda5 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
@@ -42,9 +42,11 @@ public abstract class ElemStyle implements StyleKeys {
* @param paintSettings
* @param painter
* @param selected true, if primitive is selected
+ * @param outermember true, if primitive is not selected and outer member of a selected multipolygon relation
* @param member true, if primitive is not selected and member of a selected relation
*/
- public abstract void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member);
+ public abstract void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter,
+ boolean selected, boolean outermember, boolean member);
public boolean isProperLineStyle() {
return false;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java b/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
index 8cb1425..d4c93d6 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
@@ -5,7 +5,6 @@ import java.awt.Color;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java
index d6b6ef7..939fc54 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java
@@ -263,7 +263,8 @@ public class LineElemStyle extends ElemStyle {
}
@Override
- public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member) {
+ public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter,
+ boolean selected, boolean outermember, boolean member) {
Way w = (Way)primitive;
/* show direction arrows, if draw.segment.relevant_directions_only is not set,
the way is tagged with a direction key
@@ -296,7 +297,7 @@ public class LineElemStyle extends ElemStyle {
Color myColor = color;
if (selected) {
myColor = paintSettings.getSelectedColor(color.getAlpha());
- } else if (member) {
+ } else if (member || outermember) {
myColor = paintSettings.getRelationSelectedColor(color.getAlpha());
} else if(w.isDisabled()) {
myColor = paintSettings.getInactiveColor();
diff --git a/src/org/openstreetmap/josm/gui/mappaint/LineTextElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/LineTextElemStyle.java
index dbe5e6b..5db2edf 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/LineTextElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/LineTextElemStyle.java
@@ -31,7 +31,8 @@ public class LineTextElemStyle extends ElemStyle {
}
@Override
- public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member) {
+ public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter,
+ boolean selected, boolean outermember, boolean member) {
Way w = (Way)primitive;
painter.drawTextOnPath(w, text);
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java b/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
index ef3b9be..8e23a69 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
@@ -32,7 +32,7 @@ public class MapPaintMenu extends JMenu implements MapPaintSylesUpdateListener {
private JCheckBoxMenuItem button;
public MapPaintAction(StyleSource style) {
- super(style.getDisplayString(), style.icon == null ? null : ImageProvider.getIfAvailable(style.icon),
+ super(style.getDisplayString(), style.getIcon(),
tr("Select the map painting styles"), null, true, "mappaint/" + style.getDisplayString(), true);
this.button = new StayOpenCheckBoxMenuItem(this);
this.style = style;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java
index 47a0a6c..0746f8f 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java
@@ -240,7 +240,8 @@ public class NodeElemStyle extends ElemStyle implements StyleKeys {
}
@Override
- public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings settings, StyledMapRenderer painter, boolean selected, boolean member) {
+ public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings settings, StyledMapRenderer painter,
+ boolean selected, boolean outermember, boolean member) {
if (primitive instanceof Node) {
Node n = (Node) primitive;
if (mapImage != null && painter.isShowIcons()) {
diff --git a/src/org/openstreetmap/josm/gui/mappaint/RepeatImageElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/RepeatImageElemStyle.java
index 212c93d..ed46616 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/RepeatImageElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/RepeatImageElemStyle.java
@@ -49,7 +49,8 @@ public class RepeatImageElemStyle extends ElemStyle implements StyleKeys {
}
@Override
- public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member) {
+ public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter,
+ boolean selected, boolean outermember, boolean member) {
Way w = (Way) primitive;
painter.drawRepeatImage(w, pattern.getImage(), offset, spacing, phase, align);
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java b/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
index 8ab96d5..33437c0 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
@@ -69,9 +69,6 @@ public abstract class StyleSource extends SourceEntry {
* @param mc the current MultiCascade, empty for the first StyleSource
* @param osm the primitive
* @param scale the map scale
- * @param multipolyOuterWay support for a very old multipolygon tagging style
- * where you add the tags both to the outer and the inner way.
- * However, independent inner way style is also possible.
* @param pretendWayIsClosed For styles that require the way to be closed,
* we pretend it is. This is useful for generating area styles from the (segmented)
* outer ways of a multipolygon.
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
index bfa5880..25d873e 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
@@ -27,7 +27,6 @@ import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.mappaint.Cascade;
import org.openstreetmap.josm.gui.mappaint.Environment;
import org.openstreetmap.josm.io.XmlWriter;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java b/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java
index e1ab891..afa6dee 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java
@@ -13,7 +13,6 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.Node;
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
index a414bf6..997bf34 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
@@ -498,7 +498,7 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
* Constructs a new {@code ToolbarButtonAction}.
*/
public ToolbarButtonAction() {
- super("", ImageProvider.get("styles/standard/waypoint","pin"));
+ super("", ImageProvider.get("dialogs", "pin"));
putValue(SHORT_DESCRIPTION, tr("Add or remove toolbar button"));
LinkedList<String> t = new LinkedList<>(ToolbarPreferences.getToolString());
toolbarIndex = t.indexOf(getToolbarString());
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
index fe11d3b..309c03e 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
@@ -253,8 +253,10 @@ public final class TaggingPresetItems {
KEY("key"),
/** Positive if key matches, negative otherwise. */
KEY_REQUIRED("key!"),
+ /** Positive if key and value matches, neutral otherwise. */
+ KEY_VALUE("keyvalue"),
/** Positive if key and value matches, negative otherwise. */
- KEY_VALUE("keyvalue");
+ KEY_VALUE_REQUIRED("keyvalue!");
private final String value;
@@ -549,7 +551,9 @@ public final class TaggingPresetItems {
case KEY_REQUIRED:
return tags.containsKey(key);
case KEY_VALUE:
- return tags.containsKey(key) && (getValues().contains(tags.get(key)));
+ return tags.containsKey(key) && getValues().contains(tags.get(key)) ? true : null;
+ case KEY_VALUE_REQUIRED:
+ return tags.containsKey(key) && getValues().contains(tags.get(key));
default:
throw new IllegalStateException();
}
@@ -583,7 +587,7 @@ public final class TaggingPresetItems {
@Override
public MatchType getDefaultMatch() {
- return MatchType.KEY_VALUE;
+ return MatchType.KEY_VALUE_REQUIRED;
}
@Override
@@ -626,7 +630,9 @@ public final class TaggingPresetItems {
} else {
initAutoCompletionField(textField, key);
}
- textField.setHint(key);
+ if (Main.pref.getBoolean("taggingpreset.display-keys-as-hint", true)) {
+ textField.setHint(key);
+ }
if (length != null && !length.isEmpty()) {
textField.setMaxChars(Integer.valueOf(length));
}
@@ -1256,7 +1262,9 @@ public final class TaggingPresetItems {
combo.reinitialize(lhm.values());
AutoCompletingTextField tf = new AutoCompletingTextField();
initAutoCompletionField(tf, key);
- tf.setHint(key);
+ if (Main.pref.getBoolean("taggingpreset.display-keys-as-hint", true)) {
+ tf.setHint(key);
+ }
if (length != null && !length.isEmpty()) {
tf.setMaxChars(Integer.valueOf(length));
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
index a1e4d54..0f2055b 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
@@ -27,7 +27,9 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.widgets.JosmComboBox;
/**
+ * Auto-completing ComboBox.
* @author guilhem.bonnefille at gmail.com
+ * @since 272
*/
public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem> {
@@ -38,29 +40,35 @@ public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem>
/**
* Auto-complete a JosmComboBox.
- *
- * Inspired by http://www.orbital-computer.de/JComboBox/
+ * <br>
+ * Inspired by <a href="http://www.orbital-computer.de/JComboBox">Thomas Bierhance example</a>.
*/
class AutoCompletingComboBoxDocument extends PlainDocument {
private JosmComboBox<AutoCompletionListItem> comboBox;
private boolean selecting = false;
+ /**
+ * Constructs a new {@code AutoCompletingComboBoxDocument}.
+ * @param comboBox the combobox
+ */
public AutoCompletingComboBoxDocument(final JosmComboBox<AutoCompletionListItem> comboBox) {
this.comboBox = comboBox;
}
- @Override public void remove(int offs, int len) throws BadLocationException {
+ @Override
+ public void remove(int offs, int len) throws BadLocationException {
if (selecting)
return;
super.remove(offs, len);
}
- @Override public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
+ @Override
+ public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
if (selecting || (offs == 0 && str.equals(getText(0, getLength()))))
return;
if (maxTextLength > -1 && str.length()+getLength() > maxTextLength)
return;
- boolean initial = (offs == 0 && getLength() == 0 && str.length() > 1);
+ boolean initial = offs == 0 && getLength() == 0 && str.length() > 1;
super.insertString(offs, str, a);
// return immediately when selecting an item
@@ -103,8 +111,7 @@ public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem>
}
if (item != null) {
String newText = ((AutoCompletionListItem) item).getValue();
- if (!newText.equals(curText))
- {
+ if (!newText.equals(curText)) {
selecting = true;
super.remove(0, size);
super.insertString(0, newText, a);
@@ -138,10 +145,9 @@ public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem>
AutoCompletionListItem currentItem = model.getElementAt(i);
if (currentItem.getValue().equals(pattern))
return currentItem;
- if (!match && currentItem.getValue().startsWith(pattern)) {
- if (bestItem == null || currentItem.getPriority().compareTo(bestItem.getPriority()) > 0) {
- bestItem = currentItem;
- }
+ if (!match && currentItem.getValue().startsWith(pattern)
+ && (bestItem == null || currentItem.getPriority().compareTo(bestItem.getPriority()) > 0)) {
+ bestItem = currentItem;
}
}
return bestItem; // may be null
@@ -157,8 +163,8 @@ public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem>
/**
* Creates a <code>AutoCompletingComboBox</code> with the specified prototype display value.
- * @param prototype the <code>Object</code> used to compute the maximum number of elements to be displayed at once before displaying a scroll bar.
- * It also affects the initial width of the combo box.
+ * @param prototype the <code>Object</code> used to compute the maximum number of elements to be displayed at once
+ * before displaying a scroll bar. It also affects the initial width of the combo box.
* @since 5520
*/
public AutoCompletingComboBox(String prototype) {
@@ -170,9 +176,15 @@ public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem>
new FocusListener() {
@Override
public void focusLost(FocusEvent e) {
+ if (Main.map != null) {
+ Main.map.keyDetector.setEnabled(true);
+ }
}
@Override
public void focusGained(FocusEvent e) {
+ if (Main.map != null) {
+ Main.map.keyDetector.setEnabled(false);
+ }
// save unix system selection (middle mouse paste)
Clipboard sysSel = Toolkit.getDefaultToolkit().getSystemSelection();
if(sysSel != null) {
@@ -187,6 +199,10 @@ public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem>
);
}
+ /**
+ * Sets the maximum text length.
+ * @param length the maximum text length in number of characters
+ */
public void setMaxTextLength(int length) {
this.maxTextLength = length;
}
@@ -235,7 +251,8 @@ public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem>
}
/**
- * sets the items of the combobox to the given strings
+ * Sets the items of the combobox to the given {@code String}s.
+ * @param elems String items
*/
public void setPossibleItems(Collection<String> elems) {
DefaultComboBoxModel<AutoCompletionListItem> model = (DefaultComboBoxModel<AutoCompletionListItem>)this.getModel();
@@ -251,7 +268,8 @@ public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem>
}
/**
- * sets the items of the combobox to the given AutoCompletionListItems
+ * Sets the items of the combobox to the given {@code AutoCompletionListItem}s.
+ * @param elems AutoCompletionListItem items
*/
public void setPossibleACItems(Collection<AutoCompletionListItem> elems) {
DefaultComboBoxModel<AutoCompletionListItem> model = (DefaultComboBoxModel<AutoCompletionListItem>)this.getModel();
@@ -265,7 +283,11 @@ public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem>
this.getEditor().setItem(editorOldValue);
}
- protected boolean isAutocompleteEnabled() {
+ /**
+ * Determines if autocompletion is enabled.
+ * @return {@code true} if autocompletion is enabled, {@code false} otherwise.
+ */
+ public final boolean isAutocompleteEnabled() {
return autocompleteEnabled;
}
@@ -276,6 +298,7 @@ public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem>
/**
* If the locale is fixed, English keyboard layout will be used by default for this combobox
* all other components can still have different keyboard layout selected
+ * @param f fixed locale
*/
public void setFixedLocale(boolean f) {
useFixedLocale = f;
@@ -313,8 +336,7 @@ public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem>
AutoCompletionListItem item,
int index,
boolean isSelected,
- boolean cellHasFocus)
- {
+ boolean cellHasFocus) {
if (isSelected) {
setBackground(list.getSelectionBackground());
setForeground(list.getSelectionForeground());
diff --git a/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java b/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
index 36b2c50..7e138fa 100644
--- a/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
+++ b/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
@@ -87,8 +87,10 @@ public class AdvancedKeyPressDetector implements AWTEventListener {
timer.stop();
if (set.remove(releaseEvent.getKeyCode()) && enabled) {
synchronized (AdvancedKeyPressDetector.this) {
- for (KeyPressReleaseListener q: keyListeners) {
- q.doKeyReleased(releaseEvent);
+ if (isFocusInMainWindow()) {
+ for (KeyPressReleaseListener q: keyListeners) {
+ q.doKeyReleased(releaseEvent);
+ }
}
}
}
@@ -124,8 +126,10 @@ public class AdvancedKeyPressDetector implements AWTEventListener {
timer.stop();
} else if (set.add((e.getKeyCode())) && enabled) {
synchronized (this) {
- for (KeyPressReleaseListener q: keyListeners) {
- q.doKeyPressed(e);
+ if (isFocusInMainWindow()) {
+ for (KeyPressReleaseListener q: keyListeners) {
+ q.doKeyPressed(e);
+ }
}
}
}
@@ -134,8 +138,10 @@ public class AdvancedKeyPressDetector implements AWTEventListener {
timer.stop();
if (set.remove(e.getKeyCode()) && enabled) {
synchronized (this) {
- for (KeyPressReleaseListener q: keyListeners) {
- q.doKeyReleased(e);
+ if (isFocusInMainWindow()) {
+ for (KeyPressReleaseListener q: keyListeners) {
+ q.doKeyReleased(e);
+ }
}
}
}
@@ -164,11 +170,7 @@ public class AdvancedKeyPressDetector implements AWTEventListener {
}
}
- // check if key press is done in main window, not in dialogs
- Component focused = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
- if (SwingUtilities.getWindowAncestor(focused) instanceof JFrame) {
- processKeyEvent(ke);
- }
+ processKeyEvent(ke);
}
/**
@@ -189,4 +191,9 @@ public class AdvancedKeyPressDetector implements AWTEventListener {
public final void setEnabled(boolean enabled) {
this.enabled = enabled;
}
+
+ private boolean isFocusInMainWindow() {
+ Component focused = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
+ return focused != null && SwingUtilities.getWindowAncestor(focused) instanceof JFrame;
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java b/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java
index 7ae39e1..b83dbbb 100644
--- a/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java
+++ b/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java
@@ -2,7 +2,6 @@
package org.openstreetmap.josm.gui.widgets;
import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.HashSet;
@@ -26,7 +25,7 @@ import org.openstreetmap.josm.tools.Shortcut;
* This allows to include text fields in toggle dialogs (needed for relation filter).
* @since 5696
*/
-public class DisableShortcutsOnFocusGainedTextField extends JosmTextField implements FocusListener {
+public class DisableShortcutsOnFocusGainedTextField extends JosmTextField {
/**
* Constructs a new <code>TextField</code>. A default model is created,
@@ -34,7 +33,6 @@ public class DisableShortcutsOnFocusGainedTextField extends JosmTextField implem
* and the number of columns is set to 0.
*/
public DisableShortcutsOnFocusGainedTextField() {
- init();
}
/**
@@ -46,7 +44,6 @@ public class DisableShortcutsOnFocusGainedTextField extends JosmTextField implem
*/
public DisableShortcutsOnFocusGainedTextField(String text) {
super(text);
- init();
}
/**
@@ -62,7 +59,6 @@ public class DisableShortcutsOnFocusGainedTextField extends JosmTextField implem
*/
public DisableShortcutsOnFocusGainedTextField(int columns) {
super(columns);
- init();
}
/**
@@ -77,7 +73,6 @@ public class DisableShortcutsOnFocusGainedTextField extends JosmTextField implem
*/
public DisableShortcutsOnFocusGainedTextField(String text, int columns) {
super(text, columns);
- init();
}
/**
@@ -98,26 +93,21 @@ public class DisableShortcutsOnFocusGainedTextField extends JosmTextField implem
*/
public DisableShortcutsOnFocusGainedTextField(Document doc, String text, int columns) {
super(doc, text, columns);
- init();
}
private final List<Pair<Action,Shortcut>> unregisteredActionShortcuts = new ArrayList<>();
private final Set<JosmAction> disabledMenuActions = new HashSet<>();
- protected final void init() {
- addFocusListener(this);
- }
-
@Override
public void focusGained(FocusEvent e) {
+ super.focusGained(e);
disableMenuActions();
unregisterActionShortcuts();
- Main.map.keyDetector.setEnabled(false);
}
@Override
public void focusLost(FocusEvent e) {
- Main.map.keyDetector.setEnabled(true);
+ super.focusLost(e);
restoreActionShortcuts();
restoreMenuActions();
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java b/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
index 5d79a9d..72ee18e 100644
--- a/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
+++ b/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
@@ -2,6 +2,8 @@
package org.openstreetmap.josm.gui.widgets;
import java.awt.event.ActionEvent;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
import java.beans.PropertyChangeListener;
import javax.swing.Action;
@@ -15,13 +17,12 @@ import org.openstreetmap.josm.Main;
/**
* A subclass of {@link JPasswordField} to implement a workaround to
* <a href="https://bugs.openjdk.java.net/browse/JDK-6322854">JDK bug 6322854</a>.
- * This class can be deleted after Oracle decides to fix this bug...
*
* @since 5752
* @see <a href="https://josm.openstreetmap.de/ticket/8404">https://josm.openstreetmap.de/ticket/8404</a>
* @see <a href="https://hg.netbeans.org/main/rev/33cb2e81b640">https://hg.netbeans.org/main/rev/33cb2e81b640</a>
*/
-public class JosmPasswordField extends JPasswordField {
+public class JosmPasswordField extends JPasswordField implements FocusListener {
/**
* Constructs a new <code>JosmPasswordField</code>,
@@ -30,6 +31,7 @@ public class JosmPasswordField extends JPasswordField {
*/
public JosmPasswordField() {
workaroundJdkBug6322854(this);
+ addFocusListener(this);
}
/**
@@ -50,6 +52,7 @@ public class JosmPasswordField extends JPasswordField {
public JosmPasswordField(Document doc, String txt, int columns) {
super(doc, txt, columns);
workaroundJdkBug6322854(this);
+ addFocusListener(this);
}
/**
@@ -62,6 +65,7 @@ public class JosmPasswordField extends JPasswordField {
public JosmPasswordField(int columns) {
super(columns);
workaroundJdkBug6322854(this);
+ addFocusListener(this);
}
/**
@@ -75,6 +79,7 @@ public class JosmPasswordField extends JPasswordField {
public JosmPasswordField(String text, int columns) {
super(text, columns);
workaroundJdkBug6322854(this);
+ addFocusListener(this);
}
/**
@@ -87,10 +92,26 @@ public class JosmPasswordField extends JPasswordField {
public JosmPasswordField(String text) {
super(text);
workaroundJdkBug6322854(this);
+ addFocusListener(this);
+ }
+
+ @Override
+ public void focusGained(FocusEvent e) {
+ if (Main.map != null) {
+ Main.map.keyDetector.setEnabled(false);
+ }
+ }
+
+ @Override
+ public void focusLost(FocusEvent e) {
+ if (Main.map != null) {
+ Main.map.keyDetector.setEnabled(true);
+ }
}
/**
* Implements a workaround to <a href="https://bugs.openjdk.java.net/browse/JDK-6322854">JDK bug 6322854</a>.
+ * This method can be deleted after Oracle decides to fix this bug...
* @param text The {@link JTextComponent} to protect.
*/
public static final void workaroundJdkBug6322854(final JTextComponent text) {
diff --git a/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java b/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java
index ea4c37d..4fc170b 100644
--- a/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java
+++ b/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java
@@ -1,14 +1,19 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.widgets;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+
import javax.swing.JTextArea;
import javax.swing.text.Document;
+import org.openstreetmap.josm.Main;
+
/**
* Subclass of {@link JTextArea} that adds a "native" context menu (cut/copy/paste/select all).
* @since 5886
*/
-public class JosmTextArea extends JTextArea {
+public class JosmTextArea extends JTextArea implements FocusListener {
/**
* Constructs a new {@code JosmTextArea}. A default model is set, the initial string
@@ -81,5 +86,20 @@ public class JosmTextArea extends JTextArea {
public JosmTextArea(Document doc, String text, int rows, int columns) {
super(doc, text, rows, columns);
TextContextualPopupMenu.enableMenuFor(this);
+ addFocusListener(this);
+ }
+
+ @Override
+ public void focusGained(FocusEvent e) {
+ if (Main.map != null) {
+ Main.map.keyDetector.setEnabled(false);
+ }
+ }
+
+ @Override
+ public void focusLost(FocusEvent e) {
+ if (Main.map != null) {
+ Main.map.keyDetector.setEnabled(true);
+ }
}
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java b/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java
index 584c41d..84d8803 100644
--- a/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java
+++ b/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java
@@ -13,9 +13,14 @@ import java.awt.event.FocusListener;
import javax.swing.JTextField;
import javax.swing.text.Document;
+import org.openstreetmap.josm.Main;
+
/**
- * Subclass of {@link JTextField} that adds a "native" context menu (cut/copy/paste/select all)
- * and an optional "hint" displayed when no text has been entered.
+ * Subclass of {@link JTextField} that:<ul>
+ * <li>adds a "native" context menu (cut/copy/paste/select all)</li>
+ * <li>adds an optional "hint" displayed when no text has been entered</li>
+ * <li>disables the global advanced key press detector when focused</li>
+ * <br>This class must be used everywhere in core and plugins instead of {@code JTextField}.
* @since 5886
*/
public class JosmTextField extends JTextField implements FocusListener {
@@ -135,11 +140,17 @@ public class JosmTextField extends JTextField implements FocusListener {
@Override
public void focusGained(FocusEvent e) {
+ if (Main.map != null) {
+ Main.map.keyDetector.setEnabled(false);
+ }
repaint();
}
@Override
public void focusLost(FocusEvent e) {
+ if (Main.map != null) {
+ Main.map.keyDetector.setEnabled(true);
+ }
repaint();
}
}
diff --git a/src/org/openstreetmap/josm/io/FileImporter.java b/src/org/openstreetmap/josm/io/FileImporter.java
index b175cc9..a36b642 100644
--- a/src/org/openstreetmap/josm/io/FileImporter.java
+++ b/src/org/openstreetmap/josm/io/FileImporter.java
@@ -47,6 +47,7 @@ public abstract class FileImporter implements Comparable<FileImporter>, LayerCha
/**
* A batch importer is a file importer that prefers to read multiple files at the same time.
+ * @return {@code true} if this importer is a batch importer
*/
public boolean isBatchImporter() {
return false;
@@ -54,6 +55,10 @@ public abstract class FileImporter implements Comparable<FileImporter>, LayerCha
/**
* Needs to be implemented if isBatchImporter() returns false.
+ * @param file file to import
+ * @param progressMonitor progress monitor
+ * @throws IOException if any I/O error occurs
+ * @throws IllegalDataException if invalid data is read
*/
public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
throw new IOException(tr("Could not import ''{0}''.", file.getName()));
@@ -61,6 +66,10 @@ public abstract class FileImporter implements Comparable<FileImporter>, LayerCha
/**
* Needs to be implemented if isBatchImporter() returns true.
+ * @param files files to import
+ * @param progressMonitor progress monitor
+ * @throws IOException if any I/O error occurs
+ * @throws IllegalDataException if invalid data is read
*/
public void importData(List<File> files, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
throw new IOException(tr("Could not import files."));
diff --git a/src/org/openstreetmap/josm/io/NmeaReader.java b/src/org/openstreetmap/josm/io/NmeaReader.java
index 0180d79..9605175 100644
--- a/src/org/openstreetmap/josm/io/NmeaReader.java
+++ b/src/org/openstreetmap/josm/io/NmeaReader.java
@@ -2,6 +2,7 @@
package org.openstreetmap.josm.io;
import java.io.BufferedReader;
+import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
@@ -164,7 +165,7 @@ public class NmeaReader {
return ps.success;
}
- public NmeaReader(InputStream source) {
+ public NmeaReader(InputStream source) throws IOException {
// create the data tree
data = new GpxData();
@@ -200,7 +201,7 @@ public class NmeaReader {
currentTrack.add(ps.waypoints);
data.tracks.add(new ImmutableGpxTrack(currentTrack, Collections.<String, Object>emptyMap()));
- } catch (Exception e) {
+ } catch (IllegalDataException e) {
Main.warn(e);
}
}
diff --git a/src/org/openstreetmap/josm/io/NoteImporter.java b/src/org/openstreetmap/josm/io/NoteImporter.java
index d31e519..f635fbb 100644
--- a/src/org/openstreetmap/josm/io/NoteImporter.java
+++ b/src/org/openstreetmap/josm/io/NoteImporter.java
@@ -51,7 +51,7 @@ public class NoteImporter extends FileImporter {
}
if (noteLayers != null && noteLayers.size() > 0) {
NoteLayer layer = noteLayers.get(0);
- layer.addNotes(fileNotes);
+ layer.getNoteData().addNotes(fileNotes);
} else {
GuiHelper.runInEDT(new Runnable() {
@Override
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java b/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java
index 91bb065..4e99352 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java
@@ -187,7 +187,7 @@ public class DNSName implements GeneralNameInterface {
* order zero bit.
* <p>
* @param inputName to be checked for being constrained
- * @returns constraint type above
+ * @return constraint type above
* @throws UnsupportedOperationException if name is not exact match, but narrowing and widening are
* not supported for this name type.
*/
@@ -228,7 +228,7 @@ public class DNSName implements GeneralNameInterface {
* NameConstraints minimum and maximum bounds and for calculating
* path lengths in name subtrees.
*
- * @returns distance of name from root
+ * @return distance of name from root
* @throws UnsupportedOperationException if not supported for this name type
*/
@Override
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java
index 95c5c9e..53b05c3 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java
@@ -32,7 +32,7 @@ public class RemoteControl {
* changes.
*/
static final int protocolMajorVersion = 1;
- static final int protocolMinorVersion = 5;
+ static final int protocolMinorVersion = 6;
/**
* Starts the remote control server
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java b/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
index 0da99c7..a669032 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
@@ -30,6 +30,7 @@ import org.openstreetmap.josm.io.remotecontrol.handler.FeaturesHandler;
import org.openstreetmap.josm.io.remotecontrol.handler.ImageryHandler;
import org.openstreetmap.josm.io.remotecontrol.handler.ImportHandler;
import org.openstreetmap.josm.io.remotecontrol.handler.LoadAndZoomHandler;
+import org.openstreetmap.josm.io.remotecontrol.handler.LoadDataHandler;
import org.openstreetmap.josm.io.remotecontrol.handler.LoadObjectHandler;
import org.openstreetmap.josm.io.remotecontrol.handler.OpenFileHandler;
import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler;
@@ -125,6 +126,7 @@ public class RequestProcessor extends Thread {
static {
addRequestHandlerClass(LoadAndZoomHandler.command, LoadAndZoomHandler.class, true);
addRequestHandlerClass(LoadAndZoomHandler.command2, LoadAndZoomHandler.class, true);
+ addRequestHandlerClass(LoadDataHandler.command, LoadDataHandler.class, true);
addRequestHandlerClass(ImageryHandler.command, ImageryHandler.class, true);
addRequestHandlerClass(AddNodeHandler.command, AddNodeHandler.class, true);
addRequestHandlerClass(AddWayHandler.command, AddWayHandler.class, true);
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadDataHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadDataHandler.java
new file mode 100644
index 0000000..462aeda
--- /dev/null
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadDataHandler.java
@@ -0,0 +1,151 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.remotecontrol.handler;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.io.OsmReader;
+import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
+
+/**
+ * Handler to load data directly from the URL.
+ * @since 7636
+ */
+public class LoadDataHandler extends RequestHandler {
+
+ private static final String OSM_MIME_TYPE = "application/x-osm+xml";
+
+ /**
+ * The remote control command name used to import data.
+ */
+ public static final String command = "load_data";
+
+ /**
+ * Holds the data input string
+ */
+ private String data;
+
+ /**
+ * Holds the mime type. Currently only OSM_MIME_TYPE is supported
+ * But it could be extended to text/csv, application/gpx+xml, ... or even binary encoded data
+ */
+ private String mimeType;
+
+ @Override
+ protected void handleRequest() throws RequestHandlerErrorException {
+ try {
+ // Transform data string to inputstream
+ InputStream source = new ByteArrayInputStream(data.getBytes("UTF-8"));
+ DataSet dataSet = new DataSet();
+ if (mimeType != null && mimeType.contains(OSM_MIME_TYPE))
+ dataSet = OsmReader.parseDataSet(source, null);
+ Main.worker.submit(new LoadDataTask(isLoadInNewLayer(), dataSet, args.get("layer_name")));
+ } catch (Exception e) {
+ Main.warn("Problem with data: " + data);
+ throw new RequestHandlerErrorException(e);
+ }
+ }
+
+ @Override
+ public String[] getMandatoryParams() {
+ return new String[]{"data"};
+ }
+
+ @Override
+ public String[] getOptionalParams() {
+ return new String[] {"new_layer", "mime_type", "layer_name"};
+ }
+
+ @Override
+ public String getUsage() {
+ return "Reads data encoded directly in the URL and adds it to the current data set";
+ }
+
+ @Override
+ public String[] getUsageExamples() {
+ return new String[] {
+ "/load_data?layer_name=extra_layer&new_layer=true&data=%3Cosm%3E%3Cnode%3E...%3C%2Fnode%3E%3C%2Fosm%3E" };
+ }
+
+ @Override
+ public String getPermissionMessage() {
+ return tr("Remote Control has been asked to load the following data:")
+ + "<br>" + data;
+ }
+
+ @Override
+ public PermissionPrefWithDefault getPermissionPref() {
+ // Same permission as the import data, as the difference from a user pov is minimal
+ return PermissionPrefWithDefault.IMPORT_DATA;
+ }
+
+ @Override
+ protected void parseArgs() {
+ if (request.indexOf('?') == -1)
+ return; // nothing to do
+
+ Map<String, String> args = new HashMap<>();
+
+ // The data itself shouldn't contain any &, = or ? chars.
+ // Those are reserved for the URL parsing
+ // and should be URL encoded as %26, %3D or %3F
+ String query = request.substring(request.indexOf('?') + 1);
+ String[] params = query.split("&");
+ for (String param : params) {
+ String[] kv = param.split("=");
+ if (kv.length == 2)
+ args.put(kv[0], kv[1]);
+ }
+ this.args = args;
+ }
+
+ @Override
+ protected void validateRequest() throws RequestHandlerBadRequestException {
+ if (args.get("data") == null)
+ throw new RequestHandlerBadRequestException("RemoteControl: No data defined in URL");
+ try {
+ data = URLDecoder.decode(args.get("data"), "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ throw new RequestHandlerBadRequestException("RemoteControl: UnsupportedEncodingException: " + e.getMessage(), e);
+ }
+ mimeType = args.get("mime_type");
+ if (mimeType == null) {
+ mimeType = OSM_MIME_TYPE;
+ }
+ }
+
+ protected class LoadDataTask extends DownloadOsmTask.AbstractInternalTask {
+
+ protected final String layerName;
+
+ public LoadDataTask(boolean newLayer, DataSet dataSet, String layerName) {
+ super(newLayer, tr("Loading data"), false);
+ this.dataSet = dataSet;
+ this.layerName = layerName;
+ }
+
+ @Override
+ public void realRun() {
+ // No real run, the data is already loaded
+ }
+
+ @Override
+ protected void cancel() {
+ // No Cancel, would be hard without a real run
+ }
+
+ @Override
+ protected void finish() {
+ loadData(layerName, null);
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java b/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
index ab814e1..218abe7 100644
--- a/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
+++ b/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
@@ -43,7 +43,7 @@ public class PluginDownloadTask extends PleaseWaitRunnable{
private final Collection<PluginInformation> toUpdate = new LinkedList<>();
private final Collection<PluginInformation> failed = new LinkedList<>();
private final Collection<PluginInformation> downloaded = new LinkedList<>();
- private Exception lastException;
+ //private Exception lastException;
private boolean canceled;
private HttpURLConnection downloadConnection;
@@ -154,7 +154,7 @@ public class PluginDownloadTask extends PleaseWaitRunnable{
protected void realRun() throws SAXException, IOException {
File pluginDir = Main.pref.getPluginsDirectory();
if (!pluginDir.exists() && !pluginDir.mkdirs()) {
- lastException = new PluginDownloadException(tr("Failed to create plugin directory ''{0}''", pluginDir.toString()));
+ /*lastException =*/ new PluginDownloadException(tr("Failed to create plugin directory ''{0}''", pluginDir.toString()));
failed.addAll(toUpdate);
return;
}
diff --git a/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java b/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java
index 7c41020..54e6202 100644
--- a/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java
+++ b/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java
@@ -18,7 +18,6 @@ import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.io.OsmTransferException;
import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.Utils;
import org.xml.sax.SAXException;
/**
diff --git a/src/org/openstreetmap/josm/tools/ExceptionUtil.java b/src/org/openstreetmap/josm/tools/ExceptionUtil.java
index eeae60e..2ee4853 100644
--- a/src/org/openstreetmap/josm/tools/ExceptionUtil.java
+++ b/src/org/openstreetmap/josm/tools/ExceptionUtil.java
@@ -35,7 +35,6 @@ import org.openstreetmap.josm.io.OsmTransferException;
import org.openstreetmap.josm.io.auth.CredentialsManager;
import org.openstreetmap.josm.tools.date.DateUtils;
- at SuppressWarnings("CallToThreadDumpStack")
public final class ExceptionUtil {
private ExceptionUtil() {
diff --git a/src/org/openstreetmap/josm/tools/ExifReader.java b/src/org/openstreetmap/josm/tools/ExifReader.java
index 1c6a7ca..eb7d773 100644
--- a/src/org/openstreetmap/josm/tools/ExifReader.java
+++ b/src/org/openstreetmap/josm/tools/ExifReader.java
@@ -36,7 +36,7 @@ public final class ExifReader {
* Returns the date/time from the given JPEG file.
* @param filename The JPEG file to read
* @return The date/time read in the EXIF section, or {@code null} if not found
- * @throws ParseException if {@link DateParser#parse} fails to parse date/time
+ * @throws ParseException if {@link PrimaryDateParser#parse} fails to parse date/time
*/
public static Date readTime(File filename) throws ParseException {
try {
diff --git a/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java b/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java
index bf41d02..df2ab14 100644
--- a/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java
+++ b/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java
@@ -61,7 +61,7 @@ public class GeoPropertyIndex<T> {
/**
* Look up the property for a certain point.
- * This gives the same result as {@link #geoProp#get(LatLon)}, but
+ * This gives the same result as {@link GeoProperty#get(LatLon)}, but
* should be faster.
* @param ll the point coordinates
* @return property value at that point
@@ -119,7 +119,7 @@ public class GeoPropertyIndex<T> {
if (children == null) {
@SuppressWarnings("unchecked")
- GPLevel<T>[] tmp = (GPLevel<T>[]) new GPLevel[4];
+ GPLevel<T>[] tmp = new GPLevel[4];
this.children = tmp;
}
diff --git a/src/org/openstreetmap/josm/tools/ImageProvider.java b/src/org/openstreetmap/josm/tools/ImageProvider.java
index f3e6386..2992097 100644
--- a/src/org/openstreetmap/josm/tools/ImageProvider.java
+++ b/src/org/openstreetmap/josm/tools/ImageProvider.java
@@ -584,7 +584,10 @@ public class ImageProvider {
return new ImageResource(svg);
} else {
try {
- return new ImageResource(read(new ByteArrayInputStream(bytes), false, false));
+ // See #10479: for PNG files, always enforce transparency to be sure tNRS chunk is used even not in paletted mode
+ // This can be removed if someday Oracle fixes https://bugs.openjdk.java.net/browse/JDK-6788458
+ // hg.openjdk.java.net/jdk7u/jdk7u/jdk/file/828c4fedd29f/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java#l656
+ return new ImageResource(read(new ByteArrayInputStream(bytes), false, true));
} catch (IOException e) {
Main.warn("IOException while reading image: "+e.getMessage());
}
diff --git a/src/org/openstreetmap/josm/tools/PlatformHookOsx.java b/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
index a233936..35a8b02 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
@@ -170,15 +170,15 @@ public class PlatformHookOsx extends PlatformHookUnixoid implements PlatformHook
Shortcut.registerSystemShortcut("apple-reserved-26", tr("reserved"), KeyEvent.VK_DEAD_GRAVE, KeyEvent.META_DOWN_MASK).setAutomatic(); // Activate the next open window in the frontmost application. See "Window Layering."
Shortcut.registerSystemShortcut("apple-reserved-27", tr("reserved"), KeyEvent.VK_DEAD_GRAVE, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Activate the previous open window in the frontmost application. See "Window Layering."
Shortcut.registerSystemShortcut("apple-reserved-28", tr("reserved"), KeyEvent.VK_DEAD_GRAVE, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Move focus to the window drawer.
- Shortcut.registerSystemShortcut("apple-reserved-29", tr("reserved"), KeyEvent.VK_MINUS, KeyEvent.META_DOWN_MASK).setAutomatic(); // Decrease the size of the selected item (equivalent to the Smaller command). See "The Format Menu."
+ //Shortcut.registerSystemShortcut("apple-reserved-29", tr("reserved"), KeyEvent.VK_MINUS, KeyEvent.META_DOWN_MASK).setAutomatic(); // Decrease the size of the selected item (equivalent to the Smaller command). See "The Format Menu."
Shortcut.registerSystemShortcut("apple-reserved-30", tr("reserved"), KeyEvent.VK_MINUS, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Zoom out when screen zooming is on. See Accessibility Overview.
- Shortcut.registerSystemShortcut("system:align-left", tr("reserved"), KeyEvent.VK_OPEN_BRACKET, KeyEvent.META_DOWN_MASK); // Left-align a selection (equivalent to the Align Left command). See "The Format Menu."
- Shortcut.registerSystemShortcut("system:align-right",tr("reserved"), KeyEvent.VK_CLOSE_BRACKET, KeyEvent.META_DOWN_MASK); // Right-align a selection (equivalent to the Align Right command). See "The Format Menu."
+ //Shortcut.registerSystemShortcut("system:align-left", tr("reserved"), KeyEvent.VK_OPEN_BRACKET, KeyEvent.META_DOWN_MASK); // Left-align a selection (equivalent to the Align Left command). See "The Format Menu."
+ //Shortcut.registerSystemShortcut("system:align-right",tr("reserved"), KeyEvent.VK_CLOSE_BRACKET, KeyEvent.META_DOWN_MASK); // Right-align a selection (equivalent to the Align Right command). See "The Format Menu."
// I found no KeyEvent for |
//Shortcut.registerSystemCut("system:align-center", tr("reserved"), '|', KeyEvent.META_DOWN_MASK); // Center-align a selection (equivalent to the Align Center command). See "The Format Menu."
- Shortcut.registerSystemShortcut("system:spelling", tr("reserved"), KeyEvent.VK_COLON, KeyEvent.META_DOWN_MASK); // Display the Spelling window (equivalent to the Spelling command). See "The Edit Menu."
- Shortcut.registerSystemShortcut("system:spellcheck", tr("reserved"), KeyEvent.VK_SEMICOLON, KeyEvent.META_DOWN_MASK); // Find misspelled words in the document (equivalent to the Check Spelling command). See "The Edit Menu."
+ //Shortcut.registerSystemShortcut("system:spelling", tr("reserved"), KeyEvent.VK_COLON, KeyEvent.META_DOWN_MASK); // Display the Spelling window (equivalent to the Spelling command). See "The Edit Menu."
+ //Shortcut.registerSystemShortcut("system:spellcheck", tr("reserved"), KeyEvent.VK_SEMICOLON, KeyEvent.META_DOWN_MASK); // Find misspelled words in the document (equivalent to the Check Spelling command). See "The Edit Menu."
Shortcut.registerSystemShortcut("system:preferences", tr("reserved"), KeyEvent.VK_COMMA, KeyEvent.META_DOWN_MASK).setAutomatic(); // Open the application's preferences window (equivalent to the Preferences command). See "The Application Menu."
Shortcut.registerSystemShortcut("apple-reserved-31", tr("reserved"), KeyEvent.VK_COMMA, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Decrease screen contrast. See Accessibility Overview.
@@ -198,33 +198,33 @@ public class PlatformHookOsx extends PlatformHookUnixoid implements PlatformHook
Shortcut.registerSystemShortcut("apple-reserved-41", tr("reserved"), KeyEvent.VK_8, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK).setAutomatic(); // Invert the screen colors. See Accessibility Overview.
Shortcut.registerSystemShortcut("system:selectall", tr("reserved"), KeyEvent.VK_A, KeyEvent.META_DOWN_MASK); // Highlight every item in a document or window, or all characters in a text field (equivalent to the Select All command). See "The Edit Menu."
- Shortcut.registerSystemShortcut("system:bold", tr("reserved"), KeyEvent.VK_B, KeyEvent.META_DOWN_MASK); // Boldface the selected text or toggle boldfaced text on and off (equivalent to the Bold command). See "The Edit Menu."
+ //Shortcut.registerSystemShortcut("system:bold", tr("reserved"), KeyEvent.VK_B, KeyEvent.META_DOWN_MASK); // Boldface the selected text or toggle boldfaced text on and off (equivalent to the Bold command). See "The Edit Menu."
Shortcut.registerSystemShortcut("system:copy", tr("reserved"), KeyEvent.VK_C, KeyEvent.META_DOWN_MASK); // Duplicate the selected data and store on the Clipboard (equivalent to the Copy command). See "The Edit Menu."
- Shortcut.registerSystemShortcut("system:colors", tr("reserved"), KeyEvent.VK_C, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); // Display the Colors window (equivalent to the Show Colors command). See "The Format Menu."
- Shortcut.registerSystemShortcut("system:copystyle", tr("reserved"), KeyEvent.VK_C, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Copy the style of the selected text (equivalent to the Copy Style command). See "The Format Menu."
- Shortcut.registerSystemShortcut("system:copyformat", tr("reserved"), KeyEvent.VK_C, KeyEvent.META_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK).setAutomatic(); // Copy the formatting settings of the selected item and store on the Clipboard (equivalent to the Copy Ruler command). See "The Format Menu."
+ //Shortcut.registerSystemShortcut("system:colors", tr("reserved"), KeyEvent.VK_C, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); // Display the Colors window (equivalent to the Show Colors command). See "The Format Menu."
+ //Shortcut.registerSystemShortcut("system:copystyle", tr("reserved"), KeyEvent.VK_C, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Copy the style of the selected text (equivalent to the Copy Style command). See "The Format Menu."
+ //Shortcut.registerSystemShortcut("system:copyformat", tr("reserved"), KeyEvent.VK_C, KeyEvent.META_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK).setAutomatic(); // Copy the formatting settings of the selected item and store on the Clipboard (equivalent to the Copy Ruler command). See "The Format Menu."
Shortcut.registerSystemShortcut("apple-reserved-42", tr("reserved"), KeyEvent.VK_D, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Show or hide the Dock. See "The Dock."
Shortcut.registerSystemShortcut("system:dictionarylookup", tr("reserved"), KeyEvent.VK_D, KeyEvent.META_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK); // Display the definition of the selected word in the Dictionary application.
- Shortcut.registerSystemShortcut("system:findselected", tr("reserved"), KeyEvent.VK_E, KeyEvent.META_DOWN_MASK); // Use the selection for a find operation. See "Find Windows."
+ //Shortcut.registerSystemShortcut("system:findselected", tr("reserved"), KeyEvent.VK_E, KeyEvent.META_DOWN_MASK); // Use the selection for a find operation. See "Find Windows."
Shortcut.registerSystemShortcut("system:find", tr("reserved"), KeyEvent.VK_F, KeyEvent.META_DOWN_MASK); // Open a Find window (equivalent to the Find command). See "The Edit Menu."
Shortcut.registerSystemShortcut("system:search", tr("reserved"), KeyEvent.VK_F, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Jump to the search field control. See "Search Fields."
- Shortcut.registerSystemShortcut("system:findnext", tr("reserved"), KeyEvent.VK_G, KeyEvent.META_DOWN_MASK); // Find the next occurrence of the selection (equivalent to the Find Next command). See "The Edit Menu."
- Shortcut.registerSystemShortcut("system:findprev", tr("reserved"), KeyEvent.VK_G, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); // Find the previous occurrence of the selection (equivalent to the Find Previous command). See "The Edit Menu."
+ //Shortcut.registerSystemShortcut("system:findnext", tr("reserved"), KeyEvent.VK_G, KeyEvent.META_DOWN_MASK); // Find the next occurrence of the selection (equivalent to the Find Next command). See "The Edit Menu."
+ //Shortcut.registerSystemShortcut("system:findprev", tr("reserved"), KeyEvent.VK_G, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); // Find the previous occurrence of the selection (equivalent to the Find Previous command). See "The Edit Menu."
Shortcut.registerSystemShortcut("system:hide", tr("reserved"), KeyEvent.VK_H, KeyEvent.META_DOWN_MASK).setAutomatic(); // Hide the windows of the currently running application (equivalent to the Hide ApplicationName command). See "The Application Menu."
Shortcut.registerSystemShortcut("system:hideothers", tr("reserved"), KeyEvent.VK_H, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Hide the windows of all other running applications (equivalent to the Hide Others command). See "The Application Menu."
// What about applications that have italic text AND info windows?
//Shortcut.registerSystemCut("system:italic", tr("reserved"), KeyEvent.VK_I, KeyEvent.META_DOWN_MASK); // Italicize the selected text or toggle italic text on or off (equivalent to the Italic command). See "The Format Menu."
- Shortcut.registerSystemShortcut("system:info", tr("reserved"), KeyEvent.VK_I, KeyEvent.META_DOWN_MASK); // Display an Info window. See "Inspector Windows."
- Shortcut.registerSystemShortcut("system:inspector", tr("reserved"), KeyEvent.VK_I, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Display an inspector window. See "Inspector Windows."
- Shortcut.registerSystemShortcut("system:toselection", tr("reserved"), KeyEvent.VK_J, KeyEvent.META_DOWN_MASK); // Scroll to a selection.
- Shortcut.registerSystemShortcut("system:minimize", tr("reserved"), KeyEvent.VK_M, KeyEvent.META_DOWN_MASK); // Minimize the active window to the Dock (equivalent to the Minimize command). See "The Window Menu."
- Shortcut.registerSystemShortcut("system:minimizeall", tr("reserved"), KeyEvent.VK_M, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Minimize all windows of the active application to the Dock (equivalent to the Minimize All command). See "The Window Menu."
+ //Shortcut.registerSystemShortcut("system:info", tr("reserved"), KeyEvent.VK_I, KeyEvent.META_DOWN_MASK); // Display an Info window. See "Inspector Windows."
+ //Shortcut.registerSystemShortcut("system:inspector", tr("reserved"), KeyEvent.VK_I, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Display an inspector window. See "Inspector Windows."
+ //Shortcut.registerSystemShortcut("system:toselection", tr("reserved"), KeyEvent.VK_J, KeyEvent.META_DOWN_MASK); // Scroll to a selection.
+ //Shortcut.registerSystemShortcut("system:minimize", tr("reserved"), KeyEvent.VK_M, KeyEvent.META_DOWN_MASK); // Minimize the active window to the Dock (equivalent to the Minimize command). See "The Window Menu."
+ //Shortcut.registerSystemShortcut("system:minimizeall", tr("reserved"), KeyEvent.VK_M, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Minimize all windows of the active application to the Dock (equivalent to the Minimize All command). See "The Window Menu."
Shortcut.registerSystemShortcut("system:new", tr("reserved"), KeyEvent.VK_N, KeyEvent.META_DOWN_MASK); // Open a new document (equivalent to the New command). See "The File Menu."
Shortcut.registerSystemShortcut("system:open", tr("reserved"), KeyEvent.VK_O, KeyEvent.META_DOWN_MASK); // Display a dialog for choosing a document to open (equivalent to the Open command). See "The File Menu."
Shortcut.registerSystemShortcut("system:print", tr("reserved"), KeyEvent.VK_P, KeyEvent.META_DOWN_MASK); // Display the Print dialog (equivalent to the Print command). See "The File Menu."
- Shortcut.registerSystemShortcut("system:printsetup", tr("reserved"), KeyEvent.VK_P, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); // Display a dialog for specifying printing parameters (equivalent to the Page Setup command). See "The File Menu."
+ //Shortcut.registerSystemShortcut("system:printsetup", tr("reserved"), KeyEvent.VK_P, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); // Display a dialog for specifying printing parameters (equivalent to the Page Setup command). See "The File Menu."
Shortcut.registerSystemShortcut("system:menuexit", tr("reserved"), KeyEvent.VK_Q, KeyEvent.META_DOWN_MASK).setAutomatic(); // Quit the application (equivalent to the Quit command). See "The Application Menu."
Shortcut.registerSystemShortcut("apple-reserved-43", tr("reserved"), KeyEvent.VK_Q, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Log out the current user (equivalent to the Log Out command).
@@ -232,14 +232,14 @@ public class PlatformHookOsx extends PlatformHookUnixoid implements PlatformHook
Shortcut.registerSystemShortcut("system:save", tr("reserved"), KeyEvent.VK_S, KeyEvent.META_DOWN_MASK); // Save the active document (equivalent to the Save command). See "The File Menu."
Shortcut.registerSystemShortcut("system:saveas", tr("reserved"), KeyEvent.VK_S, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); // Display the Save dialog (equivalent to the Save As command). See "The File Menu."
- Shortcut.registerSystemShortcut("system:fonts", tr("reserved"), KeyEvent.VK_T, KeyEvent.META_DOWN_MASK); // Display the Fonts window (equivalent to the Show Fonts command). See "The Format Menu."
+ //Shortcut.registerSystemShortcut("system:fonts", tr("reserved"), KeyEvent.VK_T, KeyEvent.META_DOWN_MASK); // Display the Fonts window (equivalent to the Show Fonts command). See "The Format Menu."
Shortcut.registerSystemShortcut("system:toggletoolbar", tr("reserved"), KeyEvent.VK_T, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Show or hide a toolbar (equivalent to the Show/Hide Toolbar command). See "The View Menu" and "Toolbars."
- Shortcut.registerSystemShortcut("system:underline", tr("reserved"), KeyEvent.VK_U, KeyEvent.META_DOWN_MASK); // Underline the selected text or turn underlining on or off (equivalent to the Underline command). See "The Format Menu."
+ //Shortcut.registerSystemShortcut("system:underline", tr("reserved"), KeyEvent.VK_U, KeyEvent.META_DOWN_MASK); // Underline the selected text or turn underlining on or off (equivalent to the Underline command). See "The Format Menu."
Shortcut.registerSystemShortcut("system:paste", tr("reserved"), KeyEvent.VK_V, KeyEvent.META_DOWN_MASK); // Insert the Clipboard contents at the insertion point (equivalent to the Paste command). See "The File Menu."
- Shortcut.registerSystemShortcut("system:pastestyle", tr("reserved"), KeyEvent.VK_V, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Apply the style of one object to the selected object (equivalent to the Paste Style command). See "The Format Menu."
- Shortcut.registerSystemShortcut("system:pastemwithoutstyle", tr("reserved"), KeyEvent.VK_V, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Apply the style of the surrounding text to the inserted object (equivalent to the Paste and Match Style command). See "The Edit Menu."
- Shortcut.registerSystemShortcut("system:pasteformatting", tr("reserved"), KeyEvent.VK_V, KeyEvent.META_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK); // Apply formatting settings to the selected object (equivalent to the Paste Ruler command). See "The Format Menu."
- Shortcut.registerSystemShortcut("system:closewindow", tr("reserved"), KeyEvent.VK_W, KeyEvent.META_DOWN_MASK); // Close the active window (equivalent to the Close command). See "The File Menu."
+ //Shortcut.registerSystemShortcut("system:pastestyle", tr("reserved"), KeyEvent.VK_V, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Apply the style of one object to the selected object (equivalent to the Paste Style command). See "The Format Menu."
+ //Shortcut.registerSystemShortcut("system:pastemwithoutstyle", tr("reserved"), KeyEvent.VK_V, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Apply the style of the surrounding text to the inserted object (equivalent to the Paste and Match Style command). See "The Edit Menu."
+ //Shortcut.registerSystemShortcut("system:pasteformatting", tr("reserved"), KeyEvent.VK_V, KeyEvent.META_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK); // Apply formatting settings to the selected object (equivalent to the Paste Ruler command). See "The Format Menu."
+ //Shortcut.registerSystemShortcut("system:closewindow", tr("reserved"), KeyEvent.VK_W, KeyEvent.META_DOWN_MASK); // Close the active window (equivalent to the Close command). See "The File Menu."
Shortcut.registerSystemShortcut("system:closefile", tr("reserved"), KeyEvent.VK_W, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); // Close a file and its associated windows (equivalent to the Close File command). See "The File Menu."
Shortcut.registerSystemShortcut("system:closeallwindows", tr("reserved"), KeyEvent.VK_W, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Close all windows in the application (equivalent to the Close All command). See "The File Menu."
Shortcut.registerSystemShortcut("system:cut", tr("reserved"), KeyEvent.VK_X, KeyEvent.META_DOWN_MASK); // Remove the selection and store on the Clipboard (equivalent to the Cut command). See "The Edit Menu."
diff --git a/src/org/openstreetmap/josm/tools/Shortcut.java b/src/org/openstreetmap/josm/tools/Shortcut.java
index a810d38..7c9dfcd 100644
--- a/src/org/openstreetmap/josm/tools/Shortcut.java
+++ b/src/org/openstreetmap/josm/tools/Shortcut.java
@@ -412,16 +412,18 @@ public final class Shortcut {
}
Shortcut conflict = findShortcut(requestedKey, defaultModifier);
if (conflict != null) {
+ if (Main.isPlatformOsx()) {
+ // Try to reassign Meta to Ctrl
+ int newmodifier = findNewOsxModifier(requestedGroup);
+ if ( findShortcut(requestedKey, newmodifier) == null ) {
+ return reassignShortcut(shortText, longText, requestedKey, conflict, requestedGroup, requestedKey, newmodifier);
+ }
+ }
for (int m : mods) {
for (int k : keys) {
int newmodifier = getGroupModifier(m);
if ( findShortcut(k, newmodifier) == null ) {
- Shortcut newsc = new Shortcut(shortText, longText, requestedKey, m, k, newmodifier, false, false);
- Main.info(tr("Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''.",
- shortText, conflict.getShortText(), newsc.getKeyText()));
- newsc.saveDefault();
- shortcuts.put(shortText, newsc);
- return newsc;
+ return reassignShortcut(shortText, longText, requestedKey, conflict, m, k, newmodifier);
}
}
}
@@ -435,6 +437,26 @@ public final class Shortcut {
return null;
}
+ private static int findNewOsxModifier(int requestedGroup) {
+ switch (requestedGroup) {
+ case CTRL: return KeyEvent.CTRL_DOWN_MASK;
+ case ALT_CTRL: return KeyEvent.ALT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK;
+ case CTRL_SHIFT: return KeyEvent.CTRL_DOWN_MASK|KeyEvent.SHIFT_DOWN_MASK;
+ case ALT_CTRL_SHIFT: return KeyEvent.ALT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK|KeyEvent.SHIFT_DOWN_MASK;
+ default: return 0;
+ }
+ }
+
+ private static Shortcut reassignShortcut(String shortText, String longText, int requestedKey, Shortcut conflict,
+ int m, int k, int newmodifier) {
+ Shortcut newsc = new Shortcut(shortText, longText, requestedKey, m, k, newmodifier, false, false);
+ Main.info(tr("Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''.",
+ shortText, conflict.getShortText(), newsc.getKeyText()));
+ newsc.saveDefault();
+ shortcuts.put(shortText, newsc);
+ return newsc;
+ }
+
/**
* Replies the platform specific key stroke for the 'Copy' command, i.e.
* 'Ctrl-C' on windows or 'Meta-C' on a Mac. null, if the platform specific
diff --git a/styles/standard/elemstyles.mapcss b/styles/standard/elemstyles.mapcss
index bc56909..9cfe2cd 100644
--- a/styles/standard/elemstyles.mapcss
+++ b/styles/standard/elemstyles.mapcss
@@ -98,7 +98,7 @@ way[bridge=covered]::core_bridge,
way[bridge=low_water_crossing]::core_bridge,
way[bridge=trestle]::core_bridge,
way[bridge=aqueduct]::core_bridge {
- major-z-index: 2.1;
+ major-z-index: 2;
object-z-index: -1;
width: +4;
color: bridge#0000FF;
@@ -108,7 +108,7 @@ way[tunnel?]::core_tunnel,
way[tunnel=culvert]::core_tunnel,
way[tunnel=building_passage]::core_tunnel,
way[tunnel=avalanche_protector]::core_tunnel {
- major-z-index: 2.1;
+ major-z-index: 2;
object-z-index: -1;
width: +5;
color: tunnel#964B00;
@@ -341,6 +341,7 @@ node[barrier=gate] {
set icon_z17;
text: auto;
}
+way[barrier=yes],
way[barrier=hedge],
way[barrier=fence],
way[barrier=wall],
@@ -348,7 +349,8 @@ way[barrier=guard_rail],
way[barrier=city_wall],
way[barrier=retaining_wall],
way[barrier=block],
-way[barrier=chain] {
+way[barrier=chain],
+way[barrier=kerb] {
width: 2;
color: barrier#F0F050;
}
@@ -361,6 +363,11 @@ node[barrier=retaining_wall] {
set icon_z17;
text: auto;
}
+node[barrier=kerb] {
+ icon-image: "vehicle/kerb.svg";
+ set icon_z17;
+ text: auto;
+}
node[barrier=block] {
icon-image: "vehicle/block.svg";
set icon_z17;
@@ -442,7 +449,7 @@ node[barrier=hampshire_gate] {
/****************/
way[motorroad?]::core_motorroad {
- major-z-index: 2.1;
+ major-z-index: 2;
z-index: -1;
width: +4;
color: motorroad#3377ff;
@@ -1349,7 +1356,8 @@ area[leisure=nature_reserve],
area[leisure=park],
area[leisure=playground],
area[leisure=garden],
-area[leisure=common] {
+area[leisure=common],
+area[leisure=firepit] {
fill-color: leisure#c7f1a3;
}
node[leisure=slipway] {
@@ -1387,6 +1395,11 @@ node[leisure=common] {
set icon_z17;
text: auto;
}
+node[leisure=firepit] {
+ icon-image: "leisure/firepit.svg";
+ set icon_z17;
+ text: auto;
+}
area[leisure=swimming_pool] {
fill-color: swimming_pool#51c4ef;
}
@@ -1498,6 +1511,7 @@ area[shop=bed],
area[shop=beauty],
area[shop=tea],
area[shop=coffee],
+area[shop=antiques],
area[shop=bag] {
fill-color: shop#00005f;
}
@@ -1850,6 +1864,11 @@ node[shop=coffee] {
set icon_z17;
text: auto;
}
+node[shop=antiques] {
+ icon-image: "shop/antique.svg";
+ set icon_z17;
+ text: auto;
+}
node[shop=bag] {
icon-image: "shop/bag.svg";
set icon_z17;
@@ -1965,8 +1984,8 @@ node[amenity=bicycle_parking] {
set icon_z17;
text: auto;
}
-node[parking=park_and_ride] {
- icon-image: "vehicle/parking/park_ride.png";
+node[park_ride][park_ride!=no] {
+ icon-image: "vehicle/parking/park_ride.svg";
set icon_z17;
text: auto;
}
@@ -2051,6 +2070,7 @@ area[emergency=phone],
area[emergency=aed],
area[emergency=defibrillator],
area[amenity=toilets],
+area[amenity=shower],
area[amenity=recycling] {
fill-color: amenity_light#f7efb7;
}
@@ -2074,6 +2094,11 @@ node[amenity=toilets] {
set icon_z17;
text: auto;
}
+node[amenity=shower] {
+ icon-image: "service/shower.svg";
+ set icon_z17;
+ text: auto;
+}
node[amenity=recycling] {
icon-image: "service/recycling.png";
set icon_z17;
@@ -2121,7 +2146,7 @@ node[amenity=drinking_water] {
text: auto;
}
node[amenity=fountain] {
- icon-image: "misc/landmark/spring.png";
+ icon-image: "misc/fountain.png";
set icon_z17;
text: auto;
}
@@ -3094,7 +3119,6 @@ way[highway][railway=tram]::core_railway, way[!highway][railway=tram] {
object-z-index: 1;
modifier: false; /* don't draw default way if there is no line on default layer */
width: 1;
- color: otherrail#808080;
color: railover#202020;
dashes: 9,9;
casing-width: 1;
@@ -3120,8 +3144,11 @@ way[railway=preserved] {
/* disused often appears together with highway=xy */
/* -> draw on separate layer with higher z-index, but use */
/* modifier: false; to suppress default line when used alone. */
-way[railway=disused]::core_railway,
-way[railway=abandoned]::core_railway {
+/* use default layer when used without highway=* to display bridge correctly */
+way[railway=disused][highway]::core_railway,
+way[railway=disused][!highway],
+way[railway=abandoned][highway]::core_railway,
+way[railway=abandoned][!highway] {
width: 1;
modifier: false;
z-index: 1;
@@ -3170,12 +3197,37 @@ node[service=yard], node[service=siding], node[service=spur] {
set icon_z17;
text: auto;
}
+way[railway=construction][!highway] {
+ width: 1;
+ color: construction#ffff00;
+ dashes: 9,9;
+}
+way[railway=construction][construction=rail] {
+ width: 2;
+ color: rail#404040;
+ dashes: 9,9;
+ dashes-background-color: construction#ffff00;
+}
+way[railway=construction][construction=light_rail] {
+ width: 2;
+}
+way[railway=construction][construction=tram][highway]::core_railway,
+way[railway=construction][construction=tram][!highway] {
+ z-index: 1;
+ width: 1;
+ color: railover#202020;
+ dashes: 9,9;
+ casing-width: 1;
+ casing-color: construction#ffff00;
+ casing-linecap: round;
+ casing-dashes: 9,9;
+}
/****************/
/* aeroway tags */
/****************/
-area[aeroway=aerodrome] {
+area[aeroway=aerodrome]:closed {
fill-color: aeroway#660000;
}
way[aeroway=aerodrome] {
@@ -3204,7 +3256,7 @@ node[aeroway=helipad] {
set icon_z17;
text: auto;
}
-area[aeroway=runway] {
+area[aeroway=runway]:closed {
fill-color: aeroway_dark#330000;
}
way[aeroway=runway] {
@@ -3216,7 +3268,7 @@ node[aeroway=runway] {
set icon_z17;
text: auto;
}
-area[aeroway=taxiway] {
+area[aeroway=taxiway]:closed {
fill-color: aeroway#660000;
}
way[aeroway=taxiway] {
@@ -3561,7 +3613,7 @@ area[sport=bowling],
area[sport=handball],
area[sport=rowing],
area[sport=sailing],
-area[sport=diving],
+area[sport=scuba_diving],
area[sport=badminton] {
fill-color: sport#bde3cb;
}
@@ -3605,8 +3657,8 @@ node[sport=sailing] {
set icon_z17;
text: auto;
}
-node[sport=diving] {
- icon-image: "sport/diving.png";
+node[sport=scuba_diving] {
+ icon-image: "sport/scuba_diving.svg";
set icon_z17;
text: auto;
}
diff --git a/taginfoextract.groovy b/taginfoextract.groovy
index 88b3db0..4fd5415 100644
--- a/taginfoextract.groovy
+++ b/taginfoextract.groovy
@@ -6,37 +6,32 @@
*
* groovy -cp dist/josm-custom.jar taginfoextract.groovy
*/
-
-import java.io.BufferedReader
import java.awt.image.BufferedImage
+
import javax.imageio.ImageIO
import org.openstreetmap.josm.Main
+import org.openstreetmap.josm.data.Version
import org.openstreetmap.josm.data.coor.LatLon
import org.openstreetmap.josm.data.osm.Node
import org.openstreetmap.josm.data.osm.Way
+import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer
import org.openstreetmap.josm.data.projection.Projections
-import org.openstreetmap.josm.data.Version
+import org.openstreetmap.josm.gui.NavigatableComponent
import org.openstreetmap.josm.gui.mappaint.AreaElemStyle
-import org.openstreetmap.josm.gui.mappaint.Cascade
import org.openstreetmap.josm.gui.mappaint.Environment
import org.openstreetmap.josm.gui.mappaint.LineElemStyle
-import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.SimpleKeyValueCondition
+import org.openstreetmap.josm.gui.mappaint.MultiCascade
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference
import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource
-import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser
+import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.SimpleKeyValueCondition
import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector
-import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference
-import org.openstreetmap.josm.gui.mappaint.MultiCascade
+import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser
import org.openstreetmap.josm.io.CachedFile
-import org.openstreetmap.josm.gui.NavigatableComponent
-import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer
-import org.openstreetmap.josm.data.Bounds
-//import org.openstreetmap.josm.data.osm.DataSet
-import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings
-
class taginfoextract {
-
+
static def options
static String image_dir
int josm_svn_revision
@@ -45,25 +40,25 @@ class taginfoextract {
FileWriter output_file
def base_dir = "."
def tags = [] as Set
-
+
private def cached_svnrev
/**
* Check if a certain tag is supported by the style as node / way / area.
*/
abstract class Checker {
-
+
def tag
def osm
-
+
Checker(tag) {
this.tag = tag
}
-
+
def apply_stylesheet(osm) {
osm.put(tag[0], tag[1])
def mc = new MultiCascade()
-
+
def env = new Environment(osm, mc, null, style_source)
for (def r in style_source.rules) {
env.clearSelectorMatchingInformation()
@@ -79,7 +74,7 @@ class taginfoextract {
env.layer = "default"
return env
}
-
+
/**
* Determine full image url (can refer to JOSM or OSM repository).
*/
@@ -99,14 +94,14 @@ class taginfoextract {
/**
* Create image file from ElemStyle.
* @return the URL
- */
+ */
def create_image(elem_style, type, nc) {
def img = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB)
def g = img.createGraphics()
g.setClip(0, 0, 16, 16)
def renderer = new StyledMapRenderer(g, nc, false)
renderer.getSettings(false)
- elem_style.paintPrimitive(osm, MapPaintSettings.INSTANCE, renderer, false, false)
+ elem_style.paintPrimitive(osm, MapPaintSettings.INSTANCE, renderer, false, false, false)
def base_url = options.imgurlprefix ? options.imgurlprefix : image_dir
def image_name = "${type}_${tag[0]}=${tag[1]}.png"
ImageIO.write(img, "png", new File("${image_dir}/${image_name}"))
@@ -233,7 +228,7 @@ class taginfoextract {
image_dir_file.mkdirs()
}
}
-
+
void run() {
init()
parse_style_sheet()
@@ -279,7 +274,7 @@ class taginfoextract {
final_url = area_url
}
}
-
+
output """${sep} {
| "key": "${tag[0]}",
| "value": "${tag[1]}",
@@ -293,7 +288,7 @@ class taginfoextract {
| }""".stripMargin()
}
sep = ",\n"
- }
+ }
output """
| ]
|}
@@ -342,14 +337,14 @@ class taginfoextract {
} else {
xml = "svn info --xml ${base_dir}/images/styles/standard/".execute().text
}
-
+
def svninfo = new XmlParser().parseText(xml)
def rev = svninfo.entry.'@revision'[0]
cached_svnrev = Integer.parseInt(rev)
assert cached_svnrev > 0
return cached_svnrev
}
-
+
/**
* Read the style sheet file and parse the MapCSS code.
*/
@@ -361,7 +356,7 @@ class taginfoextract {
style_source.url = ""
parser.sheet(style_source)
}
-
+
/**
* Collect all the tag from the style sheet.
*/
@@ -381,7 +376,7 @@ class taginfoextract {
/**
* Write the JSON output (either to file or to command line).
- */
+ */
def output(x) {
if (output_file != null) {
output_file.write(x)
@@ -397,6 +392,6 @@ class taginfoextract {
static def err_print(s) {
System.err.print(s);
}
-
+
}
diff --git a/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java b/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java
index 5a30b41..7e5976a 100644
--- a/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java
+++ b/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java
@@ -2,7 +2,6 @@
package org.openstreetmap.josm.gui.history;
import java.awt.BorderLayout;
-import java.util.logging.Logger;
import javax.swing.JFrame;
@@ -21,8 +20,6 @@ import org.openstreetmap.josm.io.OsmTransferException;
@Ignore
public class HistoryBrowserTest extends JFrame {
- static private Logger logger = Logger.getLogger(HistoryBrowserTest.class.getName());
-
@BeforeClass
static public void init() {
JOSMFixture.createFunctionalTestFixture().init();
diff --git a/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java b/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java
index 702223d..27085c3 100644
--- a/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java
@@ -38,7 +38,8 @@ public class JoinAreasActionTest {
try (InputStream is = new FileInputStream(TestUtils.getRegressionDataFile(10511, "10511_mini.osm"))) {
DataSet ds = OsmReader.parseDataSet(is, null);
Main.map.mapView.addLayer(new OsmDataLayer(ds, null, null));
- new JoinAreasAction().join(ds.getWays());
+ // FIXME enable this test after we fix the bug. Test disabled for now
+ // new JoinAreasAction().join(ds.getWays());
}
}
}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java
index 5b58eee..8ff308d 100644
--- a/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java
@@ -2,6 +2,7 @@
package org.openstreetmap.josm.data.validation.tests;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
@@ -68,10 +69,10 @@ public class MultipolygonTestTest {
assertTrue(ElemStyles.hasAreaElemStyle(w, false));
assertEquals(1, MULTIPOLYGON_TEST.getErrors().size());
- // Correct tag, but has also an area style
+ // Correct tag, without area style since #10601 (r7603)
w = createUnclosedWay("aeroway=taxiway");
MULTIPOLYGON_TEST.visit(w);
- assertTrue(ElemStyles.hasAreaElemStyle(w, false));
+ assertFalse(ElemStyles.hasAreaElemStyle(w, false));
assertEquals(1, MULTIPOLYGON_TEST.getErrors().size());
MULTIPOLYGON_TEST.endTest();
--
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