[josm] 03/07: Merge tag 'upstream/0.0.svn13053+dfsg'

Bas Couwenberg sebastic at debian.org
Mon Oct 30 16:23:27 UTC 2017


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm.

commit 1cd53edab80aa9fe37ad9c2d43be644519834a12
Merge: e5f0a1b 9fcf51f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Oct 30 16:35:06 2017 +0100

    Merge tag 'upstream/0.0.svn13053+dfsg'
    
    Upstream version 0.0.svn13053+dfsg

 .classpath                                         |    4 +-
 REVISION                                           |    6 +-
 build.xml                                          |    8 +-
 data/defaultpresets.xml                            |  204 +++-
 data/validator/combinations.mapcss                 |   11 +-
 data/validator/deprecated.mapcss                   |   23 +-
 data/validator/geometry.mapcss                     |   41 +-
 data/validator/highway.mapcss                      |   14 +-
 data/validator/numeric.mapcss                      |   13 +-
 data/validator/unnecessary.mapcss                  |    2 +-
 data_nodist/mapcss/basic.mapcss                    |  220 -----
 data_nodist/mapcss/basic.osm                       |  296 ------
 data_nodist/mapcss/relation.mapcss                 |   12 -
 data_nodist/mapcss/relation.osm                    |  151 ---
 i18n/po/af.po                                      |  502 ++++++++--
 i18n/po/am.po                                      |  502 ++++++++--
 i18n/po/ar.po                                      |  504 ++++++++--
 i18n/po/ast.po                                     |  514 ++++++++--
 i18n/po/az.po                                      |  502 ++++++++--
 i18n/po/be.po                                      |  524 ++++++++--
 i18n/po/bg.po                                      |  508 ++++++++--
 i18n/po/bn.po                                      |  502 ++++++++--
 i18n/po/br.po                                      |  502 ++++++++--
 i18n/po/bs.po                                      |  502 ++++++++--
 i18n/po/ca.po                                      |  530 ++++++++--
 i18n/po/ca at valencia.po                             |  508 ++++++++--
 i18n/po/cs.po                                      |  560 +++++++++--
 i18n/po/cy.po                                      |  502 ++++++++--
 i18n/po/da.po                                      |  579 ++++++++---
 i18n/po/de.po                                      |  849 +++++++++++-----
 i18n/po/de_DE.po                                   |  502 ++++++++--
 i18n/po/el.po                                      |  502 ++++++++--
 i18n/po/en_AU.po                                   |  508 ++++++++--
 i18n/po/en_CA.po                                   |  502 ++++++++--
 i18n/po/en_GB.po                                   |  518 ++++++++--
 i18n/po/eo.po                                      |  502 ++++++++--
 i18n/po/es.po                                      |  638 +++++++++---
 i18n/po/et.po                                      |  504 ++++++++--
 i18n/po/eu.po                                      |  502 ++++++++--
 i18n/po/fa.po                                      |  502 ++++++++--
 i18n/po/fi.po                                      |  508 ++++++++--
 i18n/po/fil.po                                     |  502 ++++++++--
 i18n/po/fo.po                                      |  502 ++++++++--
 i18n/po/fr.po                                      | 1024 +++++++++++++++-----
 i18n/po/ga.po                                      |  502 ++++++++--
 i18n/po/gl.po                                      |  504 ++++++++--
 i18n/po/he.po                                      |  504 ++++++++--
 i18n/po/hi.po                                      |  502 ++++++++--
 i18n/po/hr.po                                      |  502 ++++++++--
 i18n/po/ht.po                                      |  502 ++++++++--
 i18n/po/hu.po                                      |  524 ++++++++--
 i18n/po/hy.po                                      |  502 ++++++++--
 i18n/po/ia.po                                      |  502 ++++++++--
 i18n/po/id.po                                      |  506 ++++++++--
 i18n/po/is.po                                      |  502 ++++++++--
 i18n/po/it.po                                      |  536 ++++++++--
 i18n/po/ja.po                                      |  528 ++++++++--
 i18n/po/ka.po                                      |  502 ++++++++--
 i18n/po/km.po                                      |  504 ++++++++--
 i18n/po/ko.po                                      |  502 ++++++++--
 i18n/po/ku.po                                      |  502 ++++++++--
 i18n/po/ky.po                                      |  502 ++++++++--
 i18n/po/lb.po                                      |  502 ++++++++--
 i18n/po/lo.po                                      |  502 ++++++++--
 i18n/po/lt.po                                      |  816 +++++++++++-----
 i18n/po/lv.po                                      |  502 ++++++++--
 i18n/po/mk.po                                      |  502 ++++++++--
 i18n/po/mr.po                                      |  504 ++++++++--
 i18n/po/ms.po                                      |  502 ++++++++--
 i18n/po/nb.po                                      |  504 ++++++++--
 i18n/po/nds.po                                     |  502 ++++++++--
 i18n/po/nl.po                                      |  585 +++++++++--
 i18n/po/nn.po                                      |  502 ++++++++--
 i18n/po/oc.po                                      |  502 ++++++++--
 i18n/po/pa.po                                      |  504 ++++++++--
 i18n/po/pl.po                                      |  526 ++++++++--
 i18n/po/pt.po                                      |  631 +++++++++---
 i18n/po/pt_BR.po                                   |  528 ++++++++--
 i18n/po/rm.po                                      |  502 ++++++++--
 i18n/po/ro.po                                      |  502 ++++++++--
 i18n/po/ru.po                                      |  587 +++++++++--
 i18n/po/sk.po                                      |  578 +++++++++--
 i18n/po/sl.po                                      |  502 ++++++++--
 i18n/po/sq.po                                      |  502 ++++++++--
 i18n/po/sr.po                                      |  502 ++++++++--
 i18n/po/sv.po                                      |  516 ++++++++--
 i18n/po/ta.po                                      |  502 ++++++++--
 i18n/po/te.po                                      |  502 ++++++++--
 i18n/po/th.po                                      |  502 ++++++++--
 i18n/po/tr.po                                      |  504 ++++++++--
 i18n/po/ug.po                                      |  502 ++++++++--
 i18n/po/uk.po                                      |  632 +++++++++---
 i18n/po/ur.po                                      |  502 ++++++++--
 i18n/po/vi.po                                      |  512 ++++++++--
 i18n/po/wae.po                                     |  502 ++++++++--
 i18n/po/zh_CN.po                                   |  738 ++++++++++----
 i18n/po/zh_TW.po                                   |  529 ++++++++--
 images/presets/landuse/salt_pond.svg               |  123 +++
 images/presets/misc/grave.svg                      |  100 ++
 images/presets/misc/tomb.svg                       |  107 ++
 images/presets/place/quarter.svg                   |   79 ++
 images/presets/power/pole_switch.svg               |  121 +++
 josm-latest.jnlp                                   |    2 +-
 josm.jnlp                                          |    2 +-
 netbeans/nbproject/genfiles.properties             |    4 +-
 scripts/TagInfoExtract.groovy                      |    3 +-
 scripts/since_xxx.py                               |    6 +-
 .../jcs/engine/control/CompositeCacheManager.java  |    2 +-
 src/org/openstreetmap/josm/Main.java               |    3 +-
 .../josm/actions/AlignInLineAction.java            |    6 +-
 .../josm/actions/ImageryAdjustAction.java          |   12 +-
 .../josm/actions/JoinAreasAction.java              |   14 +-
 .../josm/actions/MergeNodesAction.java             |    1 +
 .../openstreetmap/josm/actions/UploadAction.java   |   14 +-
 .../josm/actions/mapmode/DrawAction.java           |   10 +-
 .../josm/actions/mapmode/ExtrudeAction.java        |    6 +-
 .../actions/mapmode/ImproveWayAccuracyAction.java  |    6 +-
 .../josm/actions/mapmode/ParallelWayAction.java    |    6 +-
 .../josm/actions/mapmode/ParallelWays.java         |   16 +-
 .../josm/actions/upload/UploadHook.java            |   32 +-
 src/org/openstreetmap/josm/data/APIDataSet.java    |   12 +-
 src/org/openstreetmap/josm/data/Preferences.java   |  366 +++----
 .../openstreetmap/josm/data/UndoRedoHandler.java   |   28 -
 .../josm/data/imagery/TMSCachedTileLoaderJob.java  |   60 +-
 .../josm/data/oauth/OAuthAccessTokenHolder.java    |   52 +
 .../josm/data/oauth/OAuthParameters.java           |   38 +-
 .../josm/data/osm/DataSelectionListener.java       |   20 +
 src/org/openstreetmap/josm/data/osm/DataSet.java   |    6 +-
 src/org/openstreetmap/josm/data/osm/Node.java      |   11 -
 src/org/openstreetmap/josm/data/osm/OsmUtils.java  |   14 +
 src/org/openstreetmap/josm/data/osm/Way.java       |   14 +-
 .../openstreetmap/josm/data/osm/WaySegment.java    |    4 +
 .../josm/data/osm/event/SelectionEventManager.java |   18 +-
 .../osm/visitor/paint/ComputeStyleListWorker.java  |   21 +-
 .../josm/data/osm/visitor/paint/PaintColors.java   |   45 +-
 .../data/osm/visitor/paint/StyledMapRenderer.java  |   18 +-
 .../josm/data/preferences/AbstractProperty.java    |   27 +-
 .../data/preferences/AbstractToStringProperty.java |    7 -
 .../josm/data/preferences/CachingProperty.java     |    8 +-
 .../josm/data/preferences/CollectionProperty.java  |    9 +-
 .../josm/data/preferences/ColorInfo.java           |  151 +++
 .../josm/data/preferences/ColorProperty.java       |    5 +-
 .../josm/data/preferences/EnumProperty.java        |    4 +-
 .../josm/data/preferences/FallbackProperty.java    |   99 ++
 .../josm/data/preferences/IntegerProperty.java     |    4 +-
 .../josm/data/preferences/JosmBaseDirectories.java |  135 +++
 .../josm/data/preferences/ListProperty.java        |    4 +-
 .../josm/data/preferences/NamedColorProperty.java  |  178 ++++
 .../josm/data/validation/Severity.java             |    8 +-
 .../data/validation/routines/DomainValidator.java  |    2 -
 .../data/validation/tests/ConditionalKeys.java     |    2 +-
 .../josm/data/validation/tests/CrossingWays.java   |   41 +-
 .../data/validation/tests/MapCSSTagChecker.java    |   34 +-
 .../data/validation/tests/MultipolygonTest.java    |   37 +
 .../data/validation/tests/RelationChecker.java     |   17 +-
 .../openstreetmap/josm/gui/DownloadParamType.java  |    2 +-
 .../openstreetmap/josm/gui/MainApplication.java    |   64 +-
 src/org/openstreetmap/josm/gui/MapFrame.java       |    5 +-
 src/org/openstreetmap/josm/gui/MapScaler.java      |    4 +-
 src/org/openstreetmap/josm/gui/MapStatus.java      |   15 +-
 .../openstreetmap/josm/gui/SelectionManager.java   |    8 +-
 .../josm/gui/autofilter/AutoFilterButton.java      |    4 +-
 .../josm/gui/bbox/SlippyMapBBoxChooser.java        |   75 +-
 .../openstreetmap/josm/gui/bbox/SourceButton.java  |  220 ++---
 .../josm/gui/bugreport/JosmUpdatePanel.java        |    7 +-
 .../josm/gui/conflict/ConflictColors.java          |    6 +-
 .../tags/CombinePrimitiveResolverDialog.java       |   54 +-
 .../josm/gui/dialogs/ConflictDialog.java           |    6 +-
 .../josm/gui/dialogs/LatLonDialog.java             |    8 +-
 .../josm/gui/dialogs/MapPaintDialog.java           |    4 +-
 .../josm/gui/dialogs/ValidatorDialog.java          |    3 +-
 .../changeset/query/BasicChangesetQueryPanel.java  |   13 +-
 .../dialogs/properties/PropertiesCellRenderer.java |   10 +-
 .../dialogs/relation/GenericRelationEditor.java    |   35 +-
 .../actions/AbstractRelationEditorAction.java      |    2 +-
 .../gui/dialogs/relation/actions/SelectAction.java |   44 +
 .../gui/dialogs/validator/ValidatorTreePanel.java  |    8 +-
 .../josm/gui/download/BoundingBoxSelection.java    |   17 +-
 .../josm/gui/download/OverpassDownloadSource.java  |    2 +-
 .../gui/download/OverpassQueryWizardDialog.java    |    5 +-
 .../josm/gui/history/OpenChangesetPopupMenu.java   |   11 +-
 .../josm/gui/history/VersionInfoPanel.java         |   10 +-
 .../josm/gui/io/CredentialDialog.java              |   23 +-
 src/org/openstreetmap/josm/gui/layer/GpxLayer.java |    4 +-
 src/org/openstreetmap/josm/gui/layer/Layer.java    |    9 +-
 .../openstreetmap/josm/gui/layer/OsmDataLayer.java |    6 +-
 .../josm/gui/layer/geoimage/ImageDisplay.java      |   28 +-
 .../josm/gui/layer/geoimage/ImageViewerDialog.java |    8 +
 .../josm/gui/layer/geoimage/Offset.java            |    3 +-
 .../josm/gui/layer/gpx/GpxDrawHelper.java          |    9 +-
 .../josm/gui/layer/markerlayer/MarkerLayer.java    |    6 +-
 .../josm/gui/mappaint/ElemStyles.java              |   30 +-
 .../josm/gui/mappaint/MapPaintStyles.java          |   32 +-
 .../josm/gui/mappaint/RenderingCLI.java            |  131 +--
 .../josm/gui/mappaint/RenderingHelper.java         |  188 ++++
 .../josm/gui/mappaint/mapcss/ConditionFactory.java |    5 +-
 .../josm/gui/mappaint/mapcss/MapCSSParser.jj       |    9 +-
 .../gui/mappaint/mapcss/MapCSSStyleSource.java     |    2 +-
 .../josm/gui/mappaint/mapcss/Selector.java         |    9 +-
 .../gui/mappaint/styleelement/LineElement.java     |    4 +
 .../josm/gui/oauth/AbstractAuthorizationUI.java    |   13 +
 .../gui/oauth/AdvancedOAuthPropertiesPanel.java    |   36 +
 .../gui/oauth/FullyAutomaticAuthorizationUI.java   |   26 +
 .../josm/gui/oauth/OAuthAuthorizationWizard.java   |   10 +-
 .../gui/preferences/DefaultPreferenceSetting.java  |   53 +-
 .../gui/preferences/advanced/PreferencesTable.java |    6 +-
 .../gui/preferences/audio/AudioPreference.java     |   22 +-
 .../gui/preferences/display/ColorPreference.java   |  383 ++++++--
 .../gui/preferences/display/GPXSettingsPanel.java  |    4 +-
 .../gui/preferences/imagery/ImageryPreference.java |    4 +-
 .../server/AuthenticationPreferencesPanel.java     |    5 +-
 .../OAuthAuthenticationPreferencesPanel.java       |    9 +-
 .../josm/gui/preferences/shortcut/PrefJPanel.java  |    6 +-
 .../josm/gui/tagging/presets/TaggingPreset.java    |    2 +-
 .../gui/widgets/BoundingBoxSelectionPanel.java     |   25 +-
 .../josm/gui/widgets/PopupMenuButton.java          |  152 +++
 .../josm/gui/widgets/QuadStateCheckBox.java        |    4 +-
 src/org/openstreetmap/josm/io/OsmApi.java          |    9 +-
 src/org/openstreetmap/josm/io/OsmApiException.java |   38 +-
 src/org/openstreetmap/josm/io/OsmConnection.java   |   34 +-
 src/org/openstreetmap/josm/io/OsmServerReader.java |    5 +-
 .../josm/io/auth/AbstractCredentialsAgent.java     |   23 +-
 .../josm/io/auth/CredentialsAgent.java             |    8 +
 .../josm/io/auth/CredentialsManager.java           |   12 +
 .../josm/io/protocols/data/DataConnection.java     |    8 +-
 src/org/openstreetmap/josm/plugins/Plugin.java     |   62 ++
 .../openstreetmap/josm/plugins/PluginHandler.java  |   18 +-
 .../josm/spi/preferences/IPreferences.java         |    6 +
 .../josm/spi/preferences/ListSetting.java          |    2 +-
 .../josm/spi/preferences/MemoryPreferences.java    |    7 +
 .../openstreetmap/josm/tools/ExceptionUtil.java    |    2 +-
 src/org/openstreetmap/josm/tools/ExifReader.java   |    3 +-
 src/org/openstreetmap/josm/tools/I18n.java         |  102 +-
 .../openstreetmap/josm/tools/ImageProvider.java    |   80 +-
 .../tools/JosmDecimalFormatSymbolsProvider.java    |   53 +
 src/org/openstreetmap/josm/tools/Logging.java      |    4 +
 src/org/openstreetmap/josm/tools/Utils.java        |   18 +
 .../template_engine/CompoundTemplateEntry.java     |   21 +-
 .../josm/tools/template_engine/Condition.java      |   20 +-
 .../josm/tools/template_engine/ParseError.java     |    5 +
 .../template_engine/SearchExpressionCondition.java |    9 +
 .../josm/tools/template_engine/StaticText.java     |    9 +
 .../TemplateEngineDataProvider.java                |   23 +-
 .../josm/tools/template_engine/TemplateEntry.java  |   19 +
 .../josm/tools/template_engine/TemplateParser.java |   10 +-
 .../josm/tools/template_engine/Tokenizer.java      |   10 +
 .../josm/tools/template_engine/Variable.java       |   20 +-
 styles/standard/elemstyles.mapcss                  |   28 +
 test/data/renderer/area-fill-color/reference.png   |  Bin 1724 -> 1829 bytes
 test/data/renderer/area-fill-image/reference.png   |  Bin 6343 -> 6699 bytes
 test/data/renderer/area-icon/reference.png         |  Bin 10861 -> 11218 bytes
 test/data/renderer/area-text/reference.png         |  Bin 4889 -> 5223 bytes
 test/data/renderer/eval/data.osm                   |   18 +
 test/data/renderer/eval/reference.png              |  Bin 0 -> 5395 bytes
 test/data/renderer/eval/style.mapcss               |   38 +
 test/data/renderer/node-shapes-combined/data.osm   |   13 +
 .../renderer/node-shapes-combined/reference.png    |  Bin 0 -> 4953 bytes
 .../renderer/node-shapes-combined/style.mapcss     |   59 ++
 test/data/renderer/node-shapes-default/data.osm    |    7 +
 .../renderer/node-shapes-default/reference.png     |  Bin 0 -> 360 bytes
 .../data/renderer/node-shapes-default/style.mapcss |    9 +
 test/data/renderer/node-shapes/reference.png       |  Bin 3850 -> 3856 bytes
 test/data/renderer/node-shapes2/data.osm           |   80 ++
 test/data/renderer/node-shapes2/reference.png      |  Bin 0 -> 9088 bytes
 test/data/renderer/node-shapes2/style.mapcss       |   35 +
 test/data/renderer/node-text/reference.png         |  Bin 6755 -> 6672 bytes
 test/data/renderer/node-text2/data.osm             |    8 +
 test/data/renderer/node-text2/reference.png        |  Bin 0 -> 2344 bytes
 test/data/renderer/node-text2/style.mapcss         |   55 ++
 test/data/renderer/order/reference.png             |  Bin 13118 -> 13153 bytes
 test/data/renderer/relation-linkselector/data.osm  |   73 ++
 .../renderer/relation-linkselector/reference.png   |  Bin 0 -> 3598 bytes
 .../renderer/relation-linkselector/style.mapcss    |    9 +
 .../data/renderer/relation-parentselector/data.osm |   55 ++
 .../renderer/relation-parentselector/reference.png |  Bin 0 -> 4053 bytes
 .../renderer/relation-parentselector/style.mapcss  |   11 +
 test/data/renderer/way-color/reference.png         |  Bin 4779 -> 4284 bytes
 test/data/renderer/way-dashes-clamp/reference.png  |  Bin 6015 -> 5407 bytes
 test/data/renderer/way-dashes/reference.png        |  Bin 4889 -> 4893 bytes
 test/data/renderer/way-dashes2/data.osm            |   37 +
 test/data/renderer/way-dashes2/reference.png       |  Bin 0 -> 5065 bytes
 test/data/renderer/way-dashes2/style.mapcss        |   34 +
 .../renderer/way-repeat-image-clamp/reference.png  |  Bin 43650 -> 42746 bytes
 test/data/renderer/way-repeat-image/reference.png  |  Bin 46674 -> 47455 bytes
 test/data/renderer/way-text/reference.png          |  Bin 21086 -> 21247 bytes
 test/data/renderer/way-width/reference.png         |  Bin 3557 -> 3573 bytes
 .../josm/gui/mappaint/MapCSSRendererTest.java      |  189 ++--
 test/unit/org/openstreetmap/josm/JOSMFixture.java  |    3 +-
 .../openstreetmap/josm/data/APIDataSetTest.java    |   12 +-
 .../openstreetmap/josm/data/PreferencesTest.java   |   33 -
 .../josm/data/oauth/OAuthParametersTest.java       |    2 +
 ...opertyTest.java => NamedColorPropertyTest.java} |   38 +-
 .../gui/datatransfer/OsmTransferHandlerTest.java   |    3 +-
 .../relation/GenericRelationEditorTest.java        |    2 +
 .../actions/RelationEditorActionsTest.java         |    1 +
 .../josm/gui/layer/AutosaveTaskTest.java           |    9 +
 .../openstreetmap/josm/gui/layer/LayerTest.java    |   10 +-
 .../josm/gui/layer/markerlayer/WebMarkerTest.java  |    2 +-
 .../gui/mappaint/mapcss/MapCSSParserTest.groovy    |    3 -
 .../josm/testutils/JOSMTestRules.java              |    5 +-
 .../tools/template_engine/TemplateParserTest.java  |   24 +-
 301 files changed, 40784 insertions(+), 10014 deletions(-)

-- 
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