[josm] 02/05: Merge tag 'upstream/0.0.svn9963+dfsg'

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sat Mar 12 14:32:47 UTC 2016


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

sebastic pushed a commit to branch master
in repository josm.

commit 9802fac9f62b1b6eff84d74ff9210d0f870a0820
Merge: 2722e86 17e6e15
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Mar 12 14:57:02 2016 +0100

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

 .classpath                                         |     2 +-
 REVISION                                           |     8 +-
 build.xml                                          |     2 +-
 data/defaultpresets.xml                            |    57 +-
 data/help-browser.css                              |    88 +-
 data/validator/combinations.mapcss                 |     8 +-
 data/validator/speed_limits.json                   |   466 +-
 data_nodist/empty.xml                              |     6 +-
 data_nodist/projection/josm-epsg                   |     7 +
 data_nodist/projection/projection-reference-data   | 56838 +------------------
 .../projection/projection-regression-test-data     |     8 +
 .../projection-regression-test-data-java9          | 35756 ++++++------
 data_nodist/trans/ast.lang                         |   Bin 8725 -> 8727 bytes
 data_nodist/trans/be.lang                          |   Bin 15874 -> 15876 bytes
 data_nodist/trans/bg.lang                          |   Bin 2399 -> 2401 bytes
 data_nodist/trans/ca-valencia.lang                 |   Bin 7809 -> 7811 bytes
 data_nodist/trans/ca.lang                          |   Bin 10328 -> 10330 bytes
 data_nodist/trans/cs.lang                          |   Bin 10079 -> 10150 bytes
 data_nodist/trans/da.lang                          |   Bin 9382 -> 9384 bytes
 data_nodist/trans/de.lang                          |   Bin 10388 -> 10469 bytes
 data_nodist/trans/el.lang                          |   Bin 1401 -> 1403 bytes
 data_nodist/trans/en.lang                          |   Bin 8603 -> 8672 bytes
 data_nodist/trans/en_AU.lang                       |   Bin 1486 -> 1488 bytes
 data_nodist/trans/en_GB.lang                       |   Bin 1952 -> 1954 bytes
 data_nodist/trans/es.lang                          |   Bin 11231 -> 11288 bytes
 data_nodist/trans/et.lang                          |   Bin 1434 -> 1436 bytes
 data_nodist/trans/fi.lang                          |   Bin 3072 -> 3074 bytes
 data_nodist/trans/fr.lang                          |   Bin 10584 -> 10586 bytes
 data_nodist/trans/gl.lang                          |   Bin 2949 -> 2951 bytes
 data_nodist/trans/hu.lang                          |   Bin 10817 -> 10819 bytes
 data_nodist/trans/id.lang                          |   Bin 6721 -> 6723 bytes
 data_nodist/trans/it.lang                          |   Bin 9873 -> 9875 bytes
 data_nodist/trans/ja.lang                          |   Bin 11389 -> 11391 bytes
 data_nodist/trans/km.lang                          |   Bin 16176 -> 16178 bytes
 data_nodist/trans/lt.lang                          |   Bin 1950 -> 1952 bytes
 data_nodist/trans/nb.lang                          |   Bin 1677 -> 1679 bytes
 data_nodist/trans/nl.lang                          |   Bin 10985 -> 10987 bytes
 data_nodist/trans/pl.lang                          |   Bin 2779 -> 2781 bytes
 data_nodist/trans/pt.lang                          |   Bin 13218 -> 13220 bytes
 data_nodist/trans/pt_BR.lang                       |   Bin 9738 -> 9740 bytes
 data_nodist/trans/ru.lang                          |   Bin 16365 -> 16502 bytes
 data_nodist/trans/sk.lang                          |   Bin 9450 -> 9452 bytes
 data_nodist/trans/sv.lang                          |   Bin 1338 -> 1340 bytes
 data_nodist/trans/uk.lang                          |   Bin 16799 -> 16801 bytes
 data_nodist/trans/vi.lang                          |   Bin 10528 -> 10530 bytes
 data_nodist/trans/zh_CN.lang                       |   Bin 5852 -> 5854 bytes
 data_nodist/trans/zh_TW.lang                       |   Bin 4645 -> 4647 bytes
 i18n/po/af.po                                      |   205 +-
 i18n/po/am.po                                      |   205 +-
 i18n/po/ar.po                                      |   205 +-
 i18n/po/ast.po                                     |   225 +-
 i18n/po/az.po                                      |   205 +-
 i18n/po/be.po                                      |   227 +-
 i18n/po/bg.po                                      |   209 +-
 i18n/po/bn.po                                      |   205 +-
 i18n/po/br.po                                      |   205 +-
 i18n/po/bs.po                                      |   205 +-
 i18n/po/ca.po                                      |   229 +-
 i18n/po/ca at valencia.po                             |   226 +-
 i18n/po/cs.po                                      |   238 +-
 i18n/po/cy.po                                      |   205 +-
 i18n/po/da.po                                      |   232 +-
 i18n/po/de.po                                      |   272 +-
 i18n/po/de_DE.po                                   |   205 +-
 i18n/po/el.po                                      |   208 +-
 i18n/po/en_AU.po                                   |   220 +-
 i18n/po/en_CA.po                                   |   205 +-
 i18n/po/en_GB.po                                   |   416 +-
 i18n/po/eo.po                                      |   205 +-
 i18n/po/es.po                                      |   292 +-
 i18n/po/et.po                                      |   207 +-
 i18n/po/eu.po                                      |   205 +-
 i18n/po/fa.po                                      |   205 +-
 i18n/po/fi.po                                      |   208 +-
 i18n/po/fil.po                                     |   205 +-
 i18n/po/fo.po                                      |   205 +-
 i18n/po/fr.po                                      |   225 +-
 i18n/po/ga.po                                      |   205 +-
 i18n/po/gl.po                                      |   205 +-
 i18n/po/he.po                                      |   205 +-
 i18n/po/hi.po                                      |   205 +-
 i18n/po/hr.po                                      |   208 +-
 i18n/po/ht.po                                      |   205 +-
 i18n/po/hu.po                                      |   276 +-
 i18n/po/hy.po                                      |   205 +-
 i18n/po/ia.po                                      |   205 +-
 i18n/po/id.po                                      |   224 +-
 i18n/po/is.po                                      |   205 +-
 i18n/po/it.po                                      |   225 +-
 i18n/po/ja.po                                      |   256 +-
 i18n/po/ka.po                                      |   205 +-
 i18n/po/km.po                                      |   222 +-
 i18n/po/ko.po                                      |   205 +-
 i18n/po/ky.po                                      |   205 +-
 i18n/po/lo.po                                      |   205 +-
 i18n/po/lt.po                                      |   328 +-
 i18n/po/lv.po                                      |   205 +-
 i18n/po/mk.po                                      |   205 +-
 i18n/po/mr.po                                      |   208 +-
 i18n/po/ms.po                                      |   205 +-
 i18n/po/nb.po                                      |   205 +-
 i18n/po/nds.po                                     |   205 +-
 i18n/po/nl.po                                      |   223 +-
 i18n/po/nn.po                                      |   205 +-
 i18n/po/oc.po                                      |   205 +-
 i18n/po/pa.po                                      |   205 +-
 i18n/po/pl.po                                      |   297 +-
 i18n/po/pt.po                                      |   227 +-
 i18n/po/pt_BR.po                                   |   255 +-
 i18n/po/rm.po                                      |   205 +-
 i18n/po/ro.po                                      |   205 +-
 i18n/po/ru.po                                      |   245 +-
 i18n/po/sk.po                                      |   237 +-
 i18n/po/sl.po                                      |   205 +-
 i18n/po/sq.po                                      |   205 +-
 i18n/po/sr.po                                      |   205 +-
 i18n/po/sv.po                                      |   210 +-
 i18n/po/ta.po                                      |   205 +-
 i18n/po/te.po                                      |   205 +-
 i18n/po/th.po                                      |   205 +-
 i18n/po/tr.po                                      |   205 +-
 i18n/po/ug.po                                      |   205 +-
 i18n/po/uk.po                                      |   269 +-
 i18n/po/ur.po                                      |   205 +-
 i18n/po/vi.po                                      |   223 +-
 i18n/po/{az.po => wae.po}                          |   225 +-
 i18n/po/zh_CN.po                                   |   690 +-
 i18n/po/zh_TW.po                                   |   210 +-
 scripts/SyncEditorImageryIndex.groovy              |     7 +-
 scripts/TagInfoExtract.groovy                      |     3 +
 .../josm/actions/AbstractInfoAction.java           |     3 +-
 .../josm/actions/AddImageryLayerAction.java        |    41 +-
 .../josm/actions/OrthogonalizeAction.java          |   112 +-
 .../josm/actions/SimplifyWayAction.java            |     3 +-
 .../actions/downloadtasks/PostDownloadHandler.java |   108 +-
 .../josm/actions/mapmode/AddNoteAction.java        |     4 +-
 .../josm/actions/search/SearchAction.java          |     4 -
 .../josm/actions/search/SearchCompiler.java        |    35 +-
 src/org/openstreetmap/josm/data/Preferences.java   |     4 -
 src/org/openstreetmap/josm/data/coor/LatLon.java   |     6 +-
 src/org/openstreetmap/josm/data/gpx/GpxTrack.java  |    20 +-
 .../josm/data/gpx/GpxTrackSegment.java             |    16 +-
 .../josm/data/gpx/ImmutableGpxTrack.java           |     9 +
 .../josm/data/imagery/WMTSTileSource.java          |     2 +-
 src/org/openstreetmap/josm/data/osm/DataSet.java   |     5 +
 .../openstreetmap/josm/data/osm/DataSetMerger.java |     2 +-
 .../openstreetmap/josm/data/osm/OsmPrimitive.java  |    11 +-
 .../josm/data/osm/OsmPrimitiveComparator.java      |     3 +-
 .../osm/event/AbstractDatasetChangedEvent.java     |     3 +-
 .../data/osm/event/PrimitiveFlagsChangedEvent.java |    36 +
 .../data/osm/visitor/paint/StyledMapRenderer.java  |     2 +-
 .../osm/visitor/paint/relations/Multipolygon.java  |    13 +-
 .../josm/data/projection/Projections.java          |     2 +
 .../josm/data/projection/proj/Sinusoidal.java      |    64 +
 .../josm/data/validation/OsmValidator.java         |     2 +
 .../josm/data/validation/Severity.java             |     6 +-
 .../validation/routines/AbstractValidator.java     |     6 +
 .../data/validation/routines/DomainValidator.java  |    19 +-
 .../data/validation/routines/EmailValidator.java   |     5 +
 .../validation/routines/InetAddressValidator.java  |     5 +
 .../data/validation/routines/RegexValidator.java   |     5 +
 .../data/validation/routines/UrlValidator.java     |     5 +
 .../josm/data/validation/tests/InternetTags.java   |     3 +-
 .../validation/tests/PublicTransportRouteTest.java |    68 +
 .../data/validation/tests/RelationChecker.java     |    17 +-
 .../josm/gui/HelpAwareOptionPane.java              |    11 +-
 src/org/openstreetmap/josm/gui/MapScaler.java      |    48 +-
 .../josm/gui/NavigatableComponent.java             |    30 +-
 .../openstreetmap/josm/gui/bbox/SizeButton.java    |    77 +-
 .../josm/gui/dialogs/FilterDialog.java             |     2 +-
 .../josm/gui/dialogs/LayerListDialog.java          |    92 +-
 .../josm/gui/dialogs/LayerListPopup.java           |     4 +
 .../dialogs/changeset/ChangesetCacheManager.java   |   174 +-
 .../changeset/query/ChangesetQueryDialog.java      |    10 +-
 .../gui/dialogs/properties/PropertiesDialog.java   |     4 +-
 .../dialogs/properties/RecentTagCollection.java    |    86 +
 .../josm/gui/dialogs/properties/TagEditHelper.java |   122 +-
 .../josm/gui/history/HistoryBrowserModel.java      |     2 +
 .../josm/gui/io/AbstractUploadTask.java            |     2 +-
 .../josm/gui/layer/AbstractTileSourceLayer.java    |    10 +-
 .../josm/gui/layer/CustomizeColor.java             |    24 +-
 src/org/openstreetmap/josm/gui/layer/GpxLayer.java |    39 +-
 .../openstreetmap/josm/gui/layer/ImageryLayer.java |     3 +-
 src/org/openstreetmap/josm/gui/layer/Layer.java    |    25 +-
 .../josm/gui/layer/NativeScaleLayer.java           |    10 +-
 .../openstreetmap/josm/gui/layer/OsmDataLayer.java |    11 +-
 .../openstreetmap/josm/gui/layer/WMTSLayer.java    |    11 +-
 .../josm/gui/layer/gpx/DownloadAlongPanel.java     |     6 +-
 .../gui/mappaint/mapcss/ExpressionFactory.java     |    15 +-
 .../gui/oauth/AdvancedOAuthPropertiesPanel.java    |     4 +-
 .../josm/gui/oauth/OAuthAuthorizationWizard.java   |     2 +-
 .../gui/oauth/OsmOAuthAuthorizationClient.java     |    32 +-
 .../josm/gui/preferences/advanced/PrefEntry.java   |    22 +
 .../josm/gui/tagging/presets/TaggingPreset.java    |    12 +-
 .../gui/tagging/presets/TaggingPresetItem.java     |    20 +
 src/org/openstreetmap/josm/gui/util/GuiHelper.java |    12 +
 .../openstreetmap/josm/plugins/PluginHandler.java  |    23 +-
 src/org/openstreetmap/josm/tools/Geometry.java     |    99 +-
 src/org/openstreetmap/josm/tools/HttpClient.java   |    32 +-
 .../openstreetmap/josm/tools/ImageProvider.java    |    16 +-
 .../openstreetmap/josm/tools/PlatformHookOsx.java  |    52 -
 src/org/openstreetmap/josm/tools/Utils.java        |    16 +-
 styles_nodist/standard/README.txt                  |     2 +-
 styles_nodist/standard/overview.xsl                |  1302 +-
 test/data/customconfigurator/append.xml            |    20 +-
 test/data/customconfigurator/replace.xml           |    32 +-
 test/data/multipolygon.osm                         |    68 +
 test/data/orthogonalize.osm                        |    95 +
 test/data/wmts/bug12573-wmts-identifier.xml        |  1341 +
 .../bug12573-wmts-missing-style-identifier.xml     |  1340 +
 test/unit/org/openstreetmap/josm/TestUtils.java    |   381 +
 .../josm/actions/AddImageryLayerActionTest.java    |    75 +
 .../josm/actions/OrthogonalizeActionTest.java      |   102 +
 .../downloadtasks/DownloadNotesTaskTest.java       |     2 +-
 .../downloadtasks/PostDownloadHandlerTest.java     |   157 +
 .../josm/actions/mapmode/AddNoteActionTest.java    |    48 +
 .../josm/actions/mapmode/DeleteActionTest.java     |    44 +
 .../josm/actions/mapmode/ExtrudeActionTest.java    |    44 +
 .../mapmode/ImproveWayAccuracyActionTest.java      |    44 +
 .../actions/mapmode/ParallelWayActionTest.java     |    44 +
 .../josm/actions/mapmode/PlayHeadDragModeTest.java |    45 +
 .../josm/actions/search/SearchCompilerTest.java    |    44 +-
 .../openstreetmap/josm/command/AddCommandTest.java |     5 +
 .../josm/command/AddPrimitivesCommandTest.java     |     5 +
 .../josm/command/ChangeCommandTest.java            |     5 +
 .../josm/command/ChangeNodesCommandTest.java       |     5 +
 .../josm/command/ChangePropertyCommandTest.java    |     5 +
 .../josm/command/ChangePropertyKeyCommandTest.java |     5 +
 .../ChangeRelationMemberRoleCommandTest.java       |     5 +
 .../openstreetmap/josm/command/CommandTest.java    |     5 +
 .../josm/command/DeleteCommandTest.java            |     5 +
 .../josm/command/MoveCommandTest.java              |     8 +
 .../josm/command/PurgeCommandTest.java             |     8 +
 .../josm/command/RemoveNodesCommandTest.java       |     5 +
 .../josm/command/RotateCommandTest.java            |     8 +
 .../josm/command/ScaleCommandTest.java             |     8 +
 .../josm/command/SelectCommandTest.java            |     5 +
 .../josm/command/SequenceCommandTest.java          |     5 +
 .../josm/command/TransformNodesCommandTest.java    |     8 +
 .../command/conflict/ConflictAddCommandTest.java   |     5 +
 .../conflict/ConflictResolveCommandTest.java       |    10 +
 .../CoordinateConflictResolveCommandTest.java      |     5 +
 .../DeletedStateConflictResolveCommandTest.java    |     5 +
 .../ModifiedConflictResolveCommandTest.java        |     5 +
 .../RelationMemberConflictResolverCommandTest.java |     5 +
 .../conflict/TagConflictResolveCommandTest.java    |     5 +
 .../VersionConflictResolveCommandTest.java         |     5 +
 .../WayNodesConflictResolverCommandTest.java       |     5 +
 .../josm/data/imagery/WMTSTileSourceTest.java      |    21 +
 .../josm/data/osm/DataSetMergerTest.java           |    41 +
 .../josm/data/projection/ProjectionRefTest.java    |     2 +-
 .../data/projection/ProjectionRegressionTest.java  |    11 +-
 .../josm/data/projection/ProjectionTest.java       |     1 +
 .../tests/PublicTransportRouteTestTest.java        |    70 +
 .../validation/tests/RelationCheckerTest.groovy    |    22 +
 .../josm/gui/JosmUserIdentityManagerTest.groovy    |    69 +-
 .../org/openstreetmap/josm/gui/MapScalerTest.java  |    45 +
 .../josm/gui/bbox/SizeButtonTest.java              |    42 +
 .../RelationMemberTableCellEditorTest.java         |    40 +
 .../RelationMemberTableCellRendererTest.java       |    42 +
 .../conflict/tags/MultiValueCellEditorTest.java    |    30 +
 .../conflict/tags/MultiValueCellRendererTest.java  |    63 +
 .../josm/gui/dialogs/LayerListDialogTest.java      |    71 +
 .../changeset/ChangesetCacheManagerTest.java       |   152 +
 .../properties/RecentTagCollectionTest.java        |    80 +
 .../MemberTableLinkedCellRendererTest.java         |    40 +
 .../MemberTableMemberCellRendererTest.java         |    39 +
 .../relation/MemberTableRoleCellRendererTest.java  |    38 +
 .../relation/RelationTreeCellRendererTest.java     |    34 +
 .../relation/SelectionTableCellRendererTest.java   |    37 +
 .../josm/gui/io/ActionFlagsTableCellTest.java      |    49 +
 .../josm/gui/io/ChangesetCellRendererTest.java     |    35 +
 .../gui/io/LayerNameAndFilePathTableCellTest.java  |    50 +
 .../josm/gui/io/SaveLayerInfoTest.java             |     7 +-
 .../openstreetmap/josm/gui/layer/GpxLayerTest.java |   205 +
 .../layer/gpx/ChooseTrackVisibilityActionTest.java |    10 +-
 .../layer/gpx/DownloadWmsAlongTrackActionTest.java |   128 +-
 .../gui/oauth/OsmOAuthAuthorizationClientTest.java |    25 +
 .../gui/preferences/advanced/PrefEntryTest.java    |    61 +
 .../map/TaggingPresetPreferenceTestIT.java         |     4 +-
 .../tagging/presets/PresetClassificationsTest.java |     6 +-
 .../josm/io/session/SessionReaderTest.java         |     6 +
 .../org/openstreetmap/josm/tools/GeometryTest.java |    19 +-
 tools/checkstyle/josm_filters.xml                  |    46 +-
 284 files changed, 38176 insertions(+), 82232 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