[josm] 02/06: Merge tag 'upstream/0.0.svn13478+dfsg'
Bas Couwenberg
sebastic at debian.org
Thu Mar 1 15:29:53 UTC 2018
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit a759f24c72eca14841ac299e371833159f2e6f31
Merge: 09832c8 8c02fe1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Mar 1 16:02:50 2018 +0100
Merge tag 'upstream/0.0.svn13478+dfsg'
Upstream version 0.0.svn13478+dfsg
CONTRIBUTION | 2 +-
README | 4 +-
REVISION | 6 +-
data/boundaries.osm | 72 +-
data/defaultpresets.xml | 101 +-
data/help-browser.css | 150 +-
data/validator/combinations.mapcss | 17 +-
data/validator/deprecated.mapcss | 15 +-
data/validator/geometry.mapcss | 5 +
data/validator/highway.mapcss | 2 +-
data/validator/ignoretags.cfg | 4 +-
data/validator/unnecessary.mapcss | 15 +-
data_nodist/projection/epsg | 718 ++-
data_nodist/projection/esri | 5937 ++++++++++++++++++
data_nodist/projection/josm-epsg | 2 +
data_nodist/projection/projection-reference-data | 6462 +++++++++++++++++++-
.../projection/projection-regression-test-data | 2780 ++++++++-
i18n/build.xml | 6 +-
i18n/po/af.po | 2817 +++++----
i18n/po/am.po | 2803 +++++----
i18n/po/ar.po | 1277 ++--
i18n/po/ast.po | 3277 +++++-----
i18n/po/az.po | 2803 +++++----
i18n/po/be.po | 4172 +++++++------
i18n/po/bg.po | 3547 +++++------
i18n/po/bn.po | 2803 +++++----
i18n/po/br.po | 2803 +++++----
i18n/po/bs.po | 2803 +++++----
i18n/po/ca.po | 3927 ++++++------
i18n/po/ca at valencia.po | 2841 +++++----
i18n/po/cs.po | 2884 +++++----
i18n/po/cy.po | 2803 +++++----
i18n/po/da.po | 2859 +++++----
i18n/po/de.po | 2979 ++++-----
i18n/po/de_DE.po | 2803 +++++----
i18n/po/el.po | 3184 +++++-----
i18n/po/en_AU.po | 2815 +++++----
i18n/po/en_CA.po | 2803 +++++----
i18n/po/en_GB.po | 4413 ++++++-------
i18n/po/eo.po | 2803 +++++----
i18n/po/es.po | 2826 +++++----
i18n/po/et.po | 2813 +++++----
i18n/po/eu.po | 2803 +++++----
i18n/po/fa.po | 2803 +++++----
i18n/po/fi.po | 2903 ++++-----
i18n/po/fil.po | 2803 +++++----
i18n/po/fo.po | 2803 +++++----
i18n/po/fr.po | 2145 ++++---
i18n/po/ga.po | 2803 +++++----
i18n/po/gl.po | 2833 +++++----
i18n/po/he.po | 2803 +++++----
i18n/po/hi.po | 2803 +++++----
i18n/po/hr.po | 1273 ++--
i18n/po/ht.po | 2803 +++++----
i18n/po/hu.po | 3288 +++++-----
i18n/po/hy.po | 2803 +++++----
i18n/po/ia.po | 2803 +++++----
i18n/po/id.po | 3237 +++++-----
i18n/po/is.po | 2803 +++++----
i18n/po/it.po | 4224 +++++++------
i18n/po/ja.po | 3871 ++++++------
i18n/po/ka.po | 2803 +++++----
i18n/po/km.po | 2815 +++++----
i18n/po/ko.po | 2817 +++++----
i18n/po/ku.po | 2803 +++++----
i18n/po/ky.po | 2803 +++++----
i18n/po/lb.po | 2803 +++++----
i18n/po/lo.po | 2803 +++++----
i18n/po/lt.po | 3787 ++++++------
i18n/po/lv.po | 2803 +++++----
i18n/po/mk.po | 2803 +++++----
i18n/po/mr.po | 2803 +++++----
i18n/po/ms.po | 2803 +++++----
i18n/po/nb.po | 1253 ++--
i18n/po/nds.po | 2809 +++++----
i18n/po/nl.po | 2866 +++++----
i18n/po/nn.po | 2803 +++++----
i18n/po/oc.po | 2803 +++++----
i18n/po/pa.po | 2803 +++++----
i18n/po/pl.po | 4015 ++++++------
i18n/po/pt.po | 4460 +++++++-------
i18n/po/pt_BR.po | 4431 +++++++-------
i18n/po/rm.po | 2803 +++++----
i18n/po/ro.po | 2803 +++++----
i18n/po/ru.po | 3453 ++++++-----
i18n/po/sk.po | 4517 +++++++-------
i18n/po/sl.po | 2803 +++++----
i18n/po/sq.po | 2803 +++++----
i18n/po/sr.po | 2803 +++++----
i18n/po/sv.po | 1272 ++--
i18n/po/ta.po | 2803 +++++----
i18n/po/te.po | 2803 +++++----
i18n/po/th.po | 2803 +++++----
i18n/po/tr.po | 2803 +++++----
i18n/po/ug.po | 2803 +++++----
i18n/po/uk.po | 2865 +++++----
i18n/po/ur.po | 2803 +++++----
i18n/po/vi.po | 3711 +++++------
i18n/po/wae.po | 2803 +++++----
i18n/po/zh_CN.po | 4811 ++++++++-------
i18n/po/zh_TW.po | 1688 ++---
images/dialogs/geoimage.png | Bin 1340 -> 0 bytes
images/dialogs/geoimage.svg | 681 +++
images/lock.svg | 40 +
images/logo.png | Bin 11323 -> 0 bytes
images/presets/barrier/kissing_gate.svg | 189 +
images/presets/food/biergarten.svg | 206 +-
images/presets/food/pub.svg | 66 +-
images/presets/landmark/forest.svg | 59 +-
images/presets/landmark/reef.svg | 128 +-
images/presets/landmark/tree_row.svg | 39 +-
images/presets/landuse/farmland.svg | 200 +-
images/presets/landuse/meadow.svg | 161 +-
images/presets/landuse/orchard.svg | 307 +-
images/presets/landuse/vineyard.svg | 2 +-
images/presets/leisure/bandstand.svg | 124 +
images/presets/leisure/billboard.svg | 363 +-
images/presets/leisure/dogpark.svg | 899 +--
images/presets/leisure/fitness_station.svg | 141 +-
images/presets/leisure/theater.svg | 209 +-
images/presets/misc/contact.svg | 183 +-
images/presets/misc/grave.svg | 2 +-
images/presets/misc/information/information.svg | 55 +-
images/presets/misc/{grave.svg => kiln.svg} | 65 +-
images/presets/misc/wlan.svg | 115 -
.../presets/{misc/grave.svg => place/square.svg} | 74 +-
images/presets/religion/hinduism.svg | 114 +-
images/presets/shop/alcohol.svg | 64 +-
images/presets/shop/beverages.svg | 78 +-
images/presets/shop/body.svg | 193 +-
images/presets/shop/boutique.svg | 2 +-
images/presets/shop/chemist.svg | 425 +-
images/presets/shop/clothes.svg | 489 +-
images/presets/shop/copyshop.svg | 490 +-
images/presets/shop/erotic.svg | 4 +-
images/presets/shop/groceries/bakery.svg | 185 +-
images/presets/shop/groceries/cheese.svg | 313 +-
images/presets/shop/groceries/seafood.svg | 188 +-
images/presets/shop/hardware.svg | 930 +--
images/presets/shop/hearing_aids.svg | 506 +-
images/presets/shop/mall.svg | 431 +-
images/presets/shop/medical_supply.svg | 51 +-
images/presets/shop/music.svg | 2 +-
images/presets/shop/musical_instrument.svg | 475 +-
images/presets/shop/outdoor.svg | 1080 ++--
images/presets/shop/pet.svg | 904 +--
images/presets/shop/present.svg | 2 +-
images/presets/shop/tailor.svg | 621 +-
images/presets/shop/tattoo.svg | 144 +-
images/presets/shop/travel_agency.svg | 494 +-
images/presets/shop/wine.svg | 604 +-
.../presets/sightseeing/palaeontological_site.svg | 36 +-
images/presets/sport/billiards.svg | 318 +-
images/presets/sport/canoe.svg | 107 +-
images/presets/sport/cycling.svg | 62 +-
images/presets/sport/golf.svg | 99 +-
images/presets/sport/miniature_golf.svg | 118 +-
images/presets/sport/racquetball.svg | 96 +-
images/presets/sport/running.svg | 70 +-
images/presets/sport/scuba_diving.svg | 111 +-
images/presets/sport/skiing.svg | 66 +-
images/presets/sport/soccer.svg | 181 +-
images/presets/sport/swimming.svg | 90 +-
images/presets/sport/tennis.svg | 58 +-
images/statusline/easting.svg | 2 +-
images/statusline/northing.svg | 2 +-
josm-latest.jnlp | 2 +-
josm.jnlp | 2 +-
linux/latest/usr/share/man/man1/josm-latest.1 | 2 +-
linux/tested/usr/share/man/man1/josm.1 | 2 +-
netbeans/nbproject/project.properties | 4 +-
scripts/BuildProjectionDefinitions.java | 57 +-
scripts/SyncEditorLayerIndex.groovy | 11 +-
scripts/geticons.pl | 9 +-
src/org/openstreetmap/josm/Main.java | 19 +-
.../josm/actions/AbstractInfoAction.java | 4 +-
.../josm/actions/AddImageryLayerAction.java | 15 +-
.../josm/actions/AlignInCircleAction.java | 2 +-
.../josm/actions/AlignInLineAction.java | 2 +-
.../josm/actions/AutoScaleAction.java | 10 +-
.../josm/actions/CombineWayAction.java | 8 +-
src/org/openstreetmap/josm/actions/CopyAction.java | 6 +-
.../josm/actions/CopyCoordinatesAction.java | 2 +-
.../josm/actions/CreateCircleAction.java | 2 +-
.../openstreetmap/josm/actions/DeleteAction.java | 2 +-
.../josm/actions/DistributeAction.java | 2 +-
.../josm/actions/DownloadReferrersAction.java | 2 +-
.../josm/actions/DuplicateAction.java | 2 +-
.../josm/actions/FollowLineAction.java | 2 +-
.../josm/actions/HistoryInfoAction.java | 2 +-
.../josm/actions/ImageryAdjustAction.java | 5 +-
src/org/openstreetmap/josm/actions/InfoAction.java | 4 +-
.../josm/actions/JoinAreasAction.java | 2 +-
.../josm/actions/JoinNodeWayAction.java | 2 +-
src/org/openstreetmap/josm/actions/JosmAction.java | 31 +-
.../openstreetmap/josm/actions/JumpToAction.java | 3 +-
.../josm/actions/MergeNodesAction.java | 4 +-
.../josm/actions/MergeSelectionAction.java | 2 +-
.../openstreetmap/josm/actions/MirrorAction.java | 2 +-
src/org/openstreetmap/josm/actions/MoveAction.java | 2 +-
.../openstreetmap/josm/actions/MoveNodeAction.java | 4 +-
.../josm/actions/OrthogonalizeAction.java | 4 +-
.../josm/actions/PasteTagsAction.java | 11 +-
.../openstreetmap/josm/actions/PurgeAction.java | 2 +-
.../openstreetmap/josm/actions/RestartAction.java | 3 +
.../josm/actions/ReverseWayAction.java | 3 +-
.../josm/actions/SelectAllAction.java | 5 +-
.../josm/actions/SelectByInternalPointAction.java | 4 +-
.../SelectNonBranchingWaySequencesAction.java | 4 +-
.../josm/actions/SessionLoadAction.java | 5 +-
.../josm/actions/ShowStatusReportAction.java | 4 +-
.../josm/actions/SimplifyWayAction.java | 2 +-
.../openstreetmap/josm/actions/SplitWayAction.java | 16 +-
.../josm/actions/TaggingPresetSearchAction.java | 2 +-
.../openstreetmap/josm/actions/UnGlueAction.java | 2 +-
.../josm/actions/UnJoinNodeWayAction.java | 2 +-
.../josm/actions/UnselectAllAction.java | 4 +-
.../josm/actions/UploadNotesAction.java | 10 +-
.../josm/actions/UploadSelectionAction.java | 2 +-
.../openstreetmap/josm/actions/ValidateAction.java | 14 +-
.../josm/actions/WireframeToggleAction.java | 2 +-
.../openstreetmap/josm/actions/ZoomToAction.java | 2 +-
.../actions/downloadtasks/DownloadNotesTask.java | 6 +-
.../actions/downloadtasks/DownloadOsmTask.java | 40 +-
.../josm/actions/mapmode/DeleteAction.java | 2 +-
.../josm/actions/mapmode/DrawAction.java | 2 +-
.../josm/actions/mapmode/DrawSnapHelper.java | 2 +-
.../josm/actions/mapmode/ExtrudeAction.java | 3 +-
.../actions/mapmode/ImproveWayAccuracyAction.java | 3 +-
.../josm/actions/mapmode/MapMode.java | 12 +
.../josm/actions/mapmode/ParallelWayAction.java | 7 +-
.../josm/actions/mapmode/SelectAction.java | 34 +-
.../actions/relation/AddSelectionToRelations.java | 16 +-
.../actions/relation/DeleteRelationsAction.java | 6 +
.../actions/relation/DownloadMembersAction.java | 3 +-
.../DownloadSelectedIncompleteMembersAction.java | 3 +-
.../actions/relation/DuplicateRelationAction.java | 2 +-
.../josm/actions/relation/EditRelationAction.java | 11 +-
.../josm/actions/relation/SelectMembersAction.java | 4 +-
.../actions/relation/SelectRelationAction.java | 10 +-
.../josm/actions/search/SearchAction.java | 8 +-
.../actions/upload/ApiPreconditionCheckerHook.java | 7 +-
.../openstreetmap/josm/command/PurgeCommand.java | 35 +-
.../command/conflict/ConflictResolveCommand.java | 2 +-
.../RelationMemberConflictResolverCommand.java | 12 +-
.../josm/data/cache/CacheEntryAttributes.java | 2 +-
.../josm/data/imagery/ImageryInfo.java | 21 +-
.../josm/data/imagery/TMSCachedTileLoaderJob.java | 24 +-
.../josm/data/imagery/WMTSTileSource.java | 33 +-
src/org/openstreetmap/josm/data/osm/Changeset.java | 2 +-
src/org/openstreetmap/josm/data/osm/DataSet.java | 220 +-
.../josm/data/osm/DefaultNameFormatter.java | 4 +-
.../openstreetmap/josm/data/osm/FilterModel.java | 2 +-
src/org/openstreetmap/josm/data/osm/Lockable.java | 25 +
src/org/openstreetmap/josm/data/osm/NoteData.java | 11 +
.../openstreetmap/josm/data/osm/OsmPrimitive.java | 46 +
src/org/openstreetmap/josm/data/osm/Relation.java | 6 +
src/org/openstreetmap/josm/data/osm/Tagged.java | 22 +
src/org/openstreetmap/josm/data/osm/Way.java | 5 +
.../josm/data/osm/event/DatasetEventManager.java | 4 +-
.../josm/data/osm/event/SelectionEventManager.java | 4 +-
.../josm/data/osm/search/SearchCompiler.java | 4 +-
.../osm/visitor/paint/AbstractMapRenderer.java | 2 +-
.../josm/data/projection/Ellipsoid.java | 10 +
.../josm/data/projection/Projections.java | 10 +-
.../josm/data/validation/TestError.java | 4 +-
.../data/validation/routines/DomainValidator.java | 3 +-
.../josm/data/validation/tests/Highways.java | 2 +-
.../validation/tests/PublicTransportRouteTest.java | 6 +-
.../data/validation/tests/SimilarNamedWays.java | 2 +-
.../josm/data/validation/tests/TagChecker.java | 9 +-
.../openstreetmap/josm/gui/MainApplication.java | 31 +-
src/org/openstreetmap/josm/gui/MapStatus.java | 8 +-
src/org/openstreetmap/josm/gui/MapView.java | 23 +-
src/org/openstreetmap/josm/gui/MapViewState.java | 15 +-
.../josm/gui/NavigatableComponent.java | 6 +-
.../openstreetmap/josm/gui/SelectionManager.java | 4 +-
.../josm/gui/autofilter/AutoFilterManager.java | 14 +-
.../josm/gui/bbox/SlippyMapBBoxChooser.java | 16 +-
.../josm/gui/bbox/TileSelectionBBoxChooser.java | 2 +-
.../tags/PasteTagsConflictResolverDialog.java | 6 +-
.../josm/gui/dialogs/ChangesetDialog.java | 37 +-
.../josm/gui/dialogs/ConflictDialog.java | 10 +-
.../josm/gui/dialogs/InspectPrimitiveDialog.java | 2 +-
.../josm/gui/dialogs/RelationListDialog.java | 11 +-
.../josm/gui/dialogs/SelectionListDialog.java | 19 +-
.../josm/gui/dialogs/UserListDialog.java | 6 +-
.../josm/gui/dialogs/ValidatorDialog.java | 10 +-
.../dialogs/changeset/ChangesetContentPanel.java | 23 +-
.../dialogs/changeset/ChangesetDetailPanel.java | 32 +-
.../ChangesetsInActiveDataLayerListModel.java | 8 +-
.../gui/dialogs/properties/PresetListPanel.java | 2 +-
.../gui/dialogs/properties/PropertiesDialog.java | 40 +-
.../josm/gui/dialogs/properties/TagEditHelper.java | 5 +-
.../gui/dialogs/relation/MemberTableModel.java | 2 +-
.../gui/dialogs/relation/SelectionTableModel.java | 2 +-
.../gui/dialogs/validator/ValidatorTreePanel.java | 2 +-
.../openstreetmap/josm/gui/help/HelpBrowser.java | 15 +-
.../josm/gui/history/CoordinateInfoViewer.java | 2 +-
.../josm/gui/history/HistoryBrowserModel.java | 19 +-
.../josm/gui/history/NodeListViewer.java | 16 +-
.../josm/gui/io/UploadPrimitivesTask.java | 26 +-
.../josm/gui/io/importexport/NoteImporter.java | 9 +-
.../josm/gui/layer/AbstractModifiableLayer.java | 70 +-
.../josm/gui/layer/AbstractTileSourceLayer.java | 14 +-
.../josm/gui/layer/DownloadFromServer.java | 19 +
.../josm/gui/layer/MainLayerManager.java | 143 +-
.../josm/gui/layer/MapViewGraphics.java | 5 +
.../openstreetmap/josm/gui/layer/NoteLayer.java | 12 +-
.../openstreetmap/josm/gui/layer/OsmDataLayer.java | 79 +-
.../josm/gui/layer/UploadToServer.java | 9 +
.../josm/gui/layer/geoimage/GeoImageLayer.java | 2 +-
.../josm/gui/layer/imagery/ColorfulFilter.java | 61 +-
.../gui/layer/imagery/TileCoordinateConverter.java | 2 +-
.../josm/gui/layer/markerlayer/AudioMarker.java | 11 +
.../josm/gui/layer/markerlayer/ButtonMarker.java | 14 +-
.../josm/gui/layer/markerlayer/MarkerLayer.java | 12 +
.../josm/gui/mappaint/ElemStyles.java | 8 +-
.../josm/gui/mappaint/MapPaintMenu.java | 2 +-
.../josm/gui/mappaint/MapPaintStyles.java | 7 +-
.../josm/gui/mappaint/RenderingCLI.java | 8 +-
.../gui/mappaint/styleelement/AreaElement.java | 2 +-
.../preferences/DefaultTabPreferenceSetting.java | 6 +
.../josm/gui/preferences/PreferenceDialog.java | 24 +-
.../josm/gui/preferences/PreferenceTabbedPane.java | 5 +
.../josm/gui/preferences/TabPreferenceSetting.java | 7 +
.../josm/gui/preferences/ToolbarPreferences.java | 5 +
.../preferences/advanced/AdvancedPreference.java | 10 +-
.../gui/preferences/audio/AudioPreference.java | 6 +
.../gui/preferences/display/DisplayPreference.java | 6 +
.../gui/preferences/imagery/AddWMSLayerPanel.java | 2 +-
.../gui/preferences/imagery/ImageryPreference.java | 29 +-
.../josm/gui/preferences/map/MapPreference.java | 6 +
.../gui/preferences/plugin/PluginPreference.java | 5 +
.../remotecontrol/RemoteControlPreference.java | 6 +
.../preferences/server/ServerAccessPreference.java | 5 +
.../preferences/shortcut/ShortcutPreference.java | 6 +
.../preferences/validator/ValidatorPreference.java | 6 +
.../josm/gui/tagging/ac/AutoCompletionManager.java | 3 +-
.../josm/gui/tagging/presets/TaggingPreset.java | 2 +-
.../TaggingPresetSearchPrimitiveDialog.java | 11 +-
.../josm/gui/util/HighlightHelper.java | 2 +-
.../openstreetmap/josm/gui/widgets/ImageLabel.java | 3 +-
.../josm/io/CertificateAmendment.java | 129 +-
.../openstreetmap/josm/io/DiffResultProcessor.java | 8 +
src/org/openstreetmap/josm/io/OsmReader.java | 40 +-
.../openstreetmap/josm/io/audio/AudioPlayer.java | 3 +-
.../openstreetmap/josm/io/imagery/WMSImagery.java | 2 +-
.../openstreetmap/josm/tools/ImageProvider.java | 7 +-
src/org/openstreetmap/josm/tools/PlatformHook.java | 6 +-
.../openstreetmap/josm/tools/PlatformHookOsx.java | 24 +
.../josm/tools/PlatformHookUnixoid.java | 4 +-
.../josm/tools/PlatformHookWindows.java | 84 +-
src/org/openstreetmap/josm/tools/Utils.java | 49 +-
styles/standard/elemstyles.mapcss | 41 +-
.../openstreetmap/josm/data/BoundariesTestIT.java | 6 +
test/unit/org/openstreetmap/josm/TestUtils.java | 10 +
.../josm/data/osm/DefaultNameFormatterTest.java | 14 +
.../josm/data/osm/search/SearchCompilerTest.java | 15 +-
.../tests/PublicTransportRouteTestTest.java | 2 +-
.../validation/tests/SimilarNamedWaysTest.java | 2 +
.../josm/data/validation/tests/TagCheckerTest.java | 2 +
.../josm/gui/history/HistoryBrowserModelTest.java | 2 +-
.../josm/gui/history/HistoryLoadTaskTest.java | 2 +-
.../gui/io/DownloadOpenChangesetsTaskTest.java | 2 +-
.../josm/gui/io/DownloadPrimitivesTaskTest.java | 2 +-
.../josm/gui/layer/MainLayerManagerTest.java | 6 +-
.../layer/imagery/ColorfulImageProcessorTest.java | 26 +-
.../preferences/map/MapPaintPreferenceTestIT.java | 2 +-
.../josm/io/CertificateAmendmentTest.java | 2 +-
tools/checkstyle/META-INF/MANIFEST.MF | 2 +-
371 files changed, 152986 insertions(+), 125732 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