[josm] 02/06: Merge tag 'upstream/0.0.svn11639+dfsg'
Bas Couwenberg
sebastic at debian.org
Tue Feb 28 07:10:45 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 5c0550183e5f45f57890e51c6988022a53b56862
Merge: 2a4fa52 df9eb86
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Feb 28 07:41:30 2017 +0100
Merge tag 'upstream/0.0.svn11639+dfsg'
Upstream version 0.0.svn11639+dfsg
.classpath | 2 +-
REVISION | 8 +-
build.xml | 9 +-
data/boundaries.osm | 6 +-
data/defaultpresets.xml | 27 +-
data/maps.xsd | 4 +-
data/validator/combinations.mapcss | 14 +-
data/validator/deprecated.mapcss | 16 +
data/validator/ignoretags.cfg | 10 +
data/validator/opening_hours.js | 29 +-
data_nodist/trans/fr.lang | Bin 11395 -> 12280 bytes
data_nodist/trans/pt.lang | Bin 13588 -> 13690 bytes
i18n/build.xml | 7 +-
i18n/convtag2link.pl | 46 ++
i18n/i18n.pl | 8 +-
i18n/launchpad.pl | 10 +-
i18n/po/af.po | 307 ++++++++--
i18n/po/am.po | 307 ++++++++--
i18n/po/ar.po | 307 ++++++++--
i18n/po/ast.po | 344 +++++++++--
i18n/po/az.po | 307 ++++++++--
i18n/po/be.po | 324 +++++++++--
i18n/po/bg.po | 312 ++++++++--
i18n/po/bn.po | 307 ++++++++--
i18n/po/br.po | 307 ++++++++--
i18n/po/bs.po | 307 ++++++++--
i18n/po/ca.po | 314 ++++++++--
i18n/po/ca at valencia.po | 311 ++++++++--
i18n/po/cs.po | 335 +++++++++--
i18n/po/cy.po | 307 ++++++++--
i18n/po/da.po | 320 ++++++++--
i18n/po/de.po | 404 ++++++++++---
i18n/po/de_DE.po | 307 ++++++++--
i18n/po/el.po | 307 ++++++++--
i18n/po/en_AU.po | 307 ++++++++--
i18n/po/en_CA.po | 307 ++++++++--
i18n/po/en_GB.po | 316 ++++++++--
i18n/po/eo.po | 307 ++++++++--
i18n/po/es.po | 536 +++++++++++++----
i18n/po/et.po | 337 +++++++++--
i18n/po/eu.po | 307 ++++++++--
i18n/po/fa.po | 307 ++++++++--
i18n/po/fi.po | 307 ++++++++--
i18n/po/fil.po | 307 ++++++++--
i18n/po/fo.po | 307 ++++++++--
i18n/po/fr.po | 469 +++++++++++----
i18n/po/ga.po | 307 ++++++++--
i18n/po/gl.po | 307 ++++++++--
i18n/po/he.po | 307 ++++++++--
i18n/po/hi.po | 307 ++++++++--
i18n/po/hr.po | 307 ++++++++--
i18n/po/ht.po | 307 ++++++++--
i18n/po/hu.po | 597 +++++++++++++------
i18n/po/hy.po | 307 ++++++++--
i18n/po/ia.po | 307 ++++++++--
i18n/po/id.po | 311 ++++++++--
i18n/po/is.po | 307 ++++++++--
i18n/po/it.po | 332 +++++++++--
i18n/po/ja.po | 314 ++++++++--
i18n/po/ka.po | 307 ++++++++--
i18n/po/km.po | 307 ++++++++--
i18n/po/ko.po | 405 ++++++++++---
i18n/po/ku.po | 309 ++++++++--
i18n/po/ky.po | 307 ++++++++--
i18n/po/lb.po | 307 ++++++++--
i18n/po/lo.po | 307 ++++++++--
i18n/po/lt.po | 310 ++++++++--
i18n/po/lv.po | 307 ++++++++--
i18n/po/mk.po | 307 ++++++++--
i18n/po/mr.po | 307 ++++++++--
i18n/po/ms.po | 307 ++++++++--
i18n/po/nb.po | 335 +++++++++--
i18n/po/nds.po | 307 ++++++++--
i18n/po/nl.po | 341 +++++++++--
i18n/po/nn.po | 307 ++++++++--
i18n/po/oc.po | 307 ++++++++--
i18n/po/pa.po | 307 ++++++++--
i18n/po/pl.po | 319 ++++++++--
i18n/po/pt.po | 604 +++++++++++++------
i18n/po/pt_BR.po | 415 ++++++++++---
i18n/po/rm.po | 307 ++++++++--
i18n/po/ro.po | 307 ++++++++--
i18n/po/ru.po | 330 +++++++++--
i18n/po/sk.po | 369 ++++++++++--
i18n/po/sl.po | 307 ++++++++--
i18n/po/sq.po | 307 ++++++++--
i18n/po/sr.po | 307 ++++++++--
i18n/po/sv.po | 641 ++++++++++++++-------
i18n/po/ta.po | 307 ++++++++--
i18n/po/te.po | 307 ++++++++--
i18n/po/th.po | 307 ++++++++--
i18n/po/tr.po | 313 ++++++++--
i18n/po/ug.po | 307 ++++++++--
i18n/po/uk.po | 386 ++++++++++---
i18n/po/ur.po | 307 ++++++++--
i18n/po/vi.po | 314 ++++++++--
i18n/po/wae.po | 307 ++++++++--
i18n/po/zh_CN.po | 309 ++++++++--
i18n/po/zh_TW.po | 360 ++++++++++--
images/presets/service/internet_cafe.svg | 97 ++++
images/presets/service/photo_booth.svg | 220 +++++++
...eryIndex.groovy => SyncEditorLayerIndex.groovy} | 230 +++++---
src/org/apache/commons/jcs/JCS.java | 16 +
.../utils/servlet/JCSServletContextListener.java | 28 +-
.../josm/actions/AbstractPasteAction.java | 2 +-
.../josm/actions/AddImageryLayerAction.java | 1 +
.../josm/actions/CombineWayAction.java | 6 +-
.../openstreetmap/josm/actions/DownloadAction.java | 5 +-
src/org/openstreetmap/josm/actions/HelpAction.java | 7 +-
.../josm/actions/JoinAreasAction.java | 15 +-
src/org/openstreetmap/josm/actions/JosmAction.java | 6 +-
.../openstreetmap/josm/actions/JumpToAction.java | 4 +-
.../josm/actions/MergeNodesAction.java | 7 +-
.../josm/actions/OpenLocationAction.java | 2 +-
.../openstreetmap/josm/actions/PurgeAction.java | 30 +-
.../josm/actions/ShowStatusReportAction.java | 4 +-
.../openstreetmap/josm/actions/SplitWayAction.java | 6 +-
.../josm/actions/UpdateDataAction.java | 2 +-
.../josm/actions/UpdateSelectionAction.java | 12 +-
.../openstreetmap/josm/actions/ValidateAction.java | 14 +-
.../AbstractChangesetDownloadTask.java | 1 +
.../actions/downloadtasks/DownloadOsmTask.java | 8 +-
.../josm/actions/mapmode/DrawAction.java | 92 +--
.../josm/actions/mapmode/DrawSnapHelper.java | 10 +-
.../josm/actions/mapmode/ExtrudeAction.java | 4 +-
.../actions/mapmode/ImproveWayAccuracyAction.java | 5 +-
.../josm/actions/mapmode/ParallelWayAction.java | 7 +-
.../josm/actions/mapmode/SelectAction.java | 4 +-
.../actions/relation/AbstractRelationAction.java | 4 +-
.../actions/relation/RecentRelationsAction.java | 53 +-
.../josm/actions/search/SearchCompiler.java | 22 +-
.../josm/command/AddPrimitivesCommand.java | 79 ++-
.../josm/command/ChangePropertyKeyCommand.java | 4 +-
.../openstreetmap/josm/command/DeleteCommand.java | 4 +-
src/org/openstreetmap/josm/data/Bounds.java | 15 +-
.../josm/data/CustomConfigurator.java | 1 +
src/org/openstreetmap/josm/data/DataSource.java | 7 +-
src/org/openstreetmap/josm/data/Preferences.java | 29 +-
.../josm/data/SystemOfMeasurement.java | 7 +-
.../openstreetmap/josm/data/UndoRedoHandler.java | 9 +-
.../josm/data/cache/HostLimitQueue.java | 8 +-
.../josm/data/cache/JCSCachedTileLoaderJob.java | 1 +
.../josm/data/gpx/ImmutableGpxTrack.java | 5 +-
.../josm/data/gpx/ImmutableGpxTrackSegment.java | 5 +-
.../josm/data/imagery/ImageryInfo.java | 114 +++-
.../josm/data/imagery/ImageryLayerInfo.java | 80 ++-
.../josm/data/imagery/TMSCachedTileLoaderJob.java | 18 +-
.../josm/data/imagery/WMTSTileSource.java | 31 +-
.../josm/data/osm/AbstractPrimitive.java | 58 +-
src/org/openstreetmap/josm/data/osm/DataSet.java | 82 ++-
.../openstreetmap/josm/data/osm/OsmPrimitive.java | 17 +-
.../openstreetmap/josm/data/osm/QuadBuckets.java | 7 +-
src/org/openstreetmap/josm/data/osm/Relation.java | 7 +-
.../josm/data/osm/RelationMember.java | 9 +-
src/org/openstreetmap/josm/data/osm/TagMap.java | 9 +-
src/org/openstreetmap/josm/data/osm/Tagged.java | 14 +-
.../openstreetmap/josm/data/osm/TigerUtils.java | 68 ---
.../josm/data/osm/event/DataChangedEvent.java | 17 +-
.../josm/data/osm/history/HistoryNode.java | 5 +-
.../josm/data/osm/history/HistoryOsmPrimitive.java | 105 +++-
.../josm/data/osm/history/HistoryRelation.java | 5 +-
.../josm/data/osm/history/HistoryWay.java | 5 +-
.../data/osm/visitor/paint/MapRendererFactory.java | 20 +-
.../josm/data/osm/visitor/paint/PaintColors.java | 11 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 5 +-
.../osm/visitor/paint/relations/Multipolygon.java | 8 +-
.../josm/data/preferences/AbstractProperty.java | 8 +-
.../josm/data/preferences/ColorProperty.java | 4 +-
.../josm/data/preferences/PreferencesReader.java | 8 +-
.../josm/data/preferences/PreferencesWriter.java | 6 +-
.../josm/data/projection/CustomProjection.java | 43 +-
.../josm/data/projection/datum/NTV2SubGrid.java | 2 +-
.../projection/proj/LambertAzimuthalEqualArea.java | 96 +--
.../data/projection/proj/TransverseMercator.java | 35 +-
.../josm/data/validation/OsmValidator.java | 11 +-
.../openstreetmap/josm/data/validation/Test.java | 12 +-
.../data/validation/routines/DomainValidator.java | 4 +-
.../josm/data/validation/routines/package.html | 2 +-
.../josm/data/validation/tests/Addresses.java | 4 +-
.../josm/data/validation/tests/Coastlines.java | 2 +-
.../josm/data/validation/tests/CrossingWays.java | 12 +-
.../josm/data/validation/tests/DuplicateNode.java | 5 +-
.../data/validation/tests/DuplicateRelation.java | 10 +-
.../josm/data/validation/tests/DuplicateWay.java | 30 +-
.../josm/data/validation/tests/Highways.java | 8 +-
.../josm/data/validation/tests/LongSegment.java | 2 +-
.../data/validation/tests/MapCSSTagChecker.java | 10 +-
.../data/validation/tests/MultipolygonTest.java | 6 +-
.../data/validation/tests/OverlappingWays.java | 10 +-
.../josm/data/validation/tests/PowerLines.java | 6 +-
.../data/validation/tests/TurnrestrictionTest.java | 4 +-
.../data/validation/tests/UnconnectedWays.java | 20 +-
.../data/validation/tests/WayConnectedToArea.java | 3 +-
.../data/validation/util/MultipleNameVisitor.java | 6 +-
.../josm/gui/DefaultNameFormatter.java | 39 +-
.../openstreetmap/josm/gui/IconToggleButton.java | 6 +-
src/org/openstreetmap/josm/gui/MainPanel.java | 6 +-
src/org/openstreetmap/josm/gui/MapFrame.java | 5 +-
src/org/openstreetmap/josm/gui/MapMover.java | 11 +-
src/org/openstreetmap/josm/gui/MapScaler.java | 3 +-
src/org/openstreetmap/josm/gui/MapStatus.java | 11 +-
src/org/openstreetmap/josm/gui/MapViewState.java | 7 +-
.../josm/gui/NavigatableComponent.java | 1 +
.../josm/gui/conflict/pair/AbstractListMerger.java | 4 +-
.../tags/CombinePrimitiveResolverDialog.java | 56 +-
.../tags/MultiValueResolutionDecision.java | 7 +-
.../tags/RelationMemberConflictDecision.java | 6 +-
.../tags/RelationMemberConflictResolverModel.java | 46 +-
.../conflict/tags/TagConflictResolutionUtil.java | 428 +++++++++++++-
.../conflict/tags/TagConflictResolverModel.java | 39 +-
.../josm/gui/datatransfer/ClipboardUtils.java | 1 +
.../josm/gui/datatransfer/OsmTransferHandler.java | 4 +-
.../josm/gui/dialogs/ChangesetDialog.java | 1 +
.../josm/gui/dialogs/LatLonDialog.java | 11 +-
.../josm/gui/dialogs/RelationListDialog.java | 4 +
.../josm/gui/dialogs/ToggleDialog.java | 2 +-
.../dialogs/changeset/ChangesetCacheManager.java | 2 +-
.../dialogs/properties/PropertiesCellRenderer.java | 12 +-
.../gui/dialogs/properties/PropertiesDialog.java | 12 +-
.../gui/dialogs/relation/ChildRelationBrowser.java | 4 +-
.../relation/ParentRelationLoadingTask.java | 9 +-
.../dialogs/relation/RelationDialogManager.java | 15 +-
.../relation/actions/PasteMembersAction.java | 2 +-
.../dialogs/relation/sort/RelationSortUtils.java | 36 +-
.../josm/gui/download/BoundingBoxSelection.java | 2 +-
.../josm/gui/help/ContextSensitiveHelpAction.java | 5 +-
.../josm/gui/history/HistoryBrowserModel.java | 25 +-
.../josm/gui/history/HistoryLoadTask.java | 5 +-
.../josm/gui/io/ActionFlagsTableCell.java | 3 +-
.../josm/gui/io/ChangesetCellRenderer.java | 10 +-
.../josm/gui/io/CloseChangesetTask.java | 6 +-
.../openstreetmap/josm/gui/io/SaveLayerTask.java | 7 +-
.../josm/gui/io/SaveLayersDialog.java | 8 +-
.../josm/gui/io/TagSettingsPanel.java | 6 +-
.../openstreetmap/josm/gui/io/UploadDialog.java | 6 +-
.../openstreetmap/josm/gui/io/UploadLayerTask.java | 11 +-
.../josm/gui/io/UploadNoteLayerTask.java | 7 +-
.../josm/gui/io/UploadParameterSummaryPanel.java | 5 +-
.../josm/gui/io/UploadPrimitivesTask.java | 69 +--
.../josm/gui/io/UploadedObjectsSummaryPanel.java | 7 +-
.../josm/gui/layer/AbstractTileSourceLayer.java | 18 +-
.../openstreetmap/josm/gui/layer/ImageryLayer.java | 1 -
src/org/openstreetmap/josm/gui/layer/Layer.java | 7 +-
.../openstreetmap/josm/gui/layer/OsmDataLayer.java | 25 +-
.../gui/layer/geoimage/CorrelateGpxWithImages.java | 19 +-
.../josm/gui/layer/geoimage/ImageDisplay.java | 57 +-
.../josm/gui/layer/geoimage/ImageEntry.java | 4 +-
.../josm/gui/layer/geoimage/ThumbsLoader.java | 4 +-
.../gui/layer/gpx/ChooseTrackVisibilityAction.java | 7 +-
.../josm/gui/layer/gpx/DateFilterPanel.java | 8 +-
.../gui/layer/gpx/DownloadWmsAlongTrackAction.java | 1 +
.../josm/gui/layer/gpx/GpxDrawHelper.java | 225 ++++++--
.../josm/gui/layer/gpx/ImportAudioAction.java | 23 +-
.../gui/layer/imagery/ColorfulImageProcessor.java | 6 +-
.../josm/gui/layer/markerlayer/Marker.java | 7 +-
.../josm/gui/mappaint/ElemStyles.java | 2 +-
.../josm/gui/mappaint/MapPaintStyles.java | 2 +-
.../josm/gui/mappaint/StyleCache.java | 7 +-
.../josm/gui/mappaint/mapcss/ConditionFactory.java | 12 +-
.../josm/gui/mappaint/mapcss/MapCSSException.java | 33 +-
.../josm/gui/mappaint/mapcss/MapCSSParser.jj | 3 +-
.../styleelement/LabelCompositionStrategy.java | 38 +-
.../gui/mappaint/styleelement/LineElement.java | 12 +-
.../gui/mappaint/styleelement/NodeElement.java | 7 +-
.../gui/oauth/FullyAutomaticAuthorizationUI.java | 8 +-
.../josm/gui/oauth/RetrieveAccessTokenTask.java | 4 +-
.../josm/gui/oauth/RetrieveRequestTokenTask.java | 4 +-
.../josm/gui/preferences/ToolbarPreferences.java | 16 +-
.../josm/gui/preferences/advanced/PrefEntry.java | 4 +-
.../gui/preferences/display/GPXSettingsPanel.java | 83 ++-
.../gui/preferences/imagery/ImageryPreference.java | 8 +-
.../gui/preferences/plugin/PluginPreference.java | 5 +-
.../plugin/PluginUpdatePolicyPanel.java | 23 +-
.../projection/AbstractProjectionChoice.java | 8 +-
.../preferences/server/OsmApiUrlInputPanel.java | 4 +-
.../preferences/server/ProxyPreferencesPanel.java | 12 +-
.../tagging/presets/items/ComboMultiSelect.java | 5 +-
.../josm/gui/tagging/presets/items/Link.java | 5 +-
.../josm/gui/tagging/presets/items/Text.java | 2 +-
.../openstreetmap/josm/gui/util/CursorManager.java | 5 +-
.../josm/gui/widgets/ButtonColumn.java | 11 +-
.../openstreetmap/josm/gui/widgets/HtmlPanel.java | 19 +-
.../openstreetmap/josm/io/DiffResultProcessor.java | 6 +-
src/org/openstreetmap/josm/io/FileWatcher.java | 5 +-
src/org/openstreetmap/josm/io/GpxExporter.java | 33 +-
src/org/openstreetmap/josm/io/NameFinder.java | 12 +-
src/org/openstreetmap/josm/io/NmeaReader.java | 11 +-
src/org/openstreetmap/josm/io/NoteReader.java | 15 +-
src/org/openstreetmap/josm/io/OsmApi.java | 14 +-
src/org/openstreetmap/josm/io/OsmConnection.java | 21 +-
src/org/openstreetmap/josm/io/OsmReader.java | 2 +-
src/org/openstreetmap/josm/io/OsmWriter.java | 2 +-
.../josm/io/OverpassDownloadReader.java | 15 +-
.../openstreetmap/josm/io/ProgressInputStream.java | 7 +-
.../josm/io/StreamProgressUpdater.java | 6 +-
.../josm/io/UTFInputStreamReader.java | 7 +-
.../josm/io/XmlStreamParsingException.java | 7 +-
.../josm/io/imagery/ImageryReader.java | 8 +
.../openstreetmap/josm/io/imagery/WMSImagery.java | 18 +-
.../io/remotecontrol/RemoteControlHttpServer.java | 4 +-
.../io/remotecontrol/RemoteControlHttpsServer.java | 4 +-
.../josm/io/remotecontrol/RequestProcessor.java | 6 +-
.../io/remotecontrol/handler/FeaturesHandler.java | 2 +-
.../io/remotecontrol/handler/RequestHandler.java | 4 +-
.../io/remotecontrol/handler/VersionHandler.java | 2 +-
.../josm/io/session/SessionReader.java | 4 +-
.../openstreetmap/josm/plugins/PluginHandler.java | 1 +
.../josm/plugins/PluginInformation.java | 6 +-
.../plugins/ReadRemotePluginInformationTask.java | 6 +-
.../openstreetmap/josm/tools/ExceptionUtil.java | 11 +-
src/org/openstreetmap/josm/tools/HttpClient.java | 12 +-
.../openstreetmap/josm/tools/ImageProvider.java | 6 +-
src/org/openstreetmap/josm/tools/Logging.java | 2 +-
.../openstreetmap/josm/tools/OsmUrlToBounds.java | 8 +-
src/org/openstreetmap/josm/tools/Pair.java | 2 +-
.../openstreetmap/josm/tools/PlatformHookOsx.java | 1 +
.../josm/tools/PlatformHookUnixoid.java | 2 +-
.../josm/tools/RightAndLefthandTraffic.java | 4 +-
src/org/openstreetmap/josm/tools/Shortcut.java | 5 +-
.../josm/tools/bugreport/BugReportQueue.java | 1 +
.../openstreetmap/josm/tools/date/DateUtils.java | 7 +-
styles/standard/elemstyles.mapcss | 25 +-
.../josm/actions/AddImageryLayerActionTest.java | 4 +-
.../josm/command/AddPrimitivesCommandTest.java | 39 ++
.../openstreetmap/josm/data/PreferencesTest.java | 2 +-
.../org/openstreetmap/josm/data/osm/NodeTest.java | 2 +-
.../validation/routines/DomainValidatorTest.java | 8 +-
.../validation/routines/DomainValidatorTestIT.java | 9 +-
.../josm/data/validation/routines/ResultPair.java | 2 +-
.../data/validation/routines/UrlValidatorTest.java | 21 -
.../tags/TagConflictResolutionUtilTest.java | 444 ++++++++++++++
.../josm/gui/layer/geoimage/ImageDisplayTest.java | 44 ++
.../gui/mappaint/mapcss/ConditionFactoryTest.java | 32 +
.../remotecontrol/handler/RequestHandlerTest.java | 5 +-
tools/checkstyle/josm_checks.xml | 7 +
335 files changed, 27307 insertions(+), 5303 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