[josm] 02/08: Merge tag 'upstream/0.0.svn9060+dfsg'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Nov 24 09:26:17 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 2496ffe73c3e901c66413cddd89a22f2ea7d00b4
Merge: 9a41ee5 7e12814
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Nov 24 09:15:38 2015 +0100
Merge tag 'upstream/0.0.svn9060+dfsg'
Upstream version 0.0.svn9060+dfsg
REVISION | 6 +-
build.xml | 2 +-
data/defaultpresets.xml | 478 +++++-
data/validator/combinations.mapcss | 6 +-
data/validator/deprecated.mapcss | 22 +-
data/validator/geometry.mapcss | 1 +
data/validator/ignoretags.cfg | 274 +---
data/validator/numeric.mapcss | 7 +
i18n/launchpad.pl | 4 +-
i18n/po/af.po | 482 ++++--
i18n/po/am.po | 482 ++++--
i18n/po/ar.po | 488 ++++--
i18n/po/ast.po | 502 +++++--
i18n/po/az.po | 482 ++++--
i18n/po/be.po | 510 +++++--
i18n/po/bg.po | 500 +++++--
i18n/po/bn.po | 484 ++++--
i18n/po/br.po | 484 ++++--
i18n/po/bs.po | 484 ++++--
i18n/po/ca.po | 560 +++++--
i18n/po/ca at valencia.po | 502 +++++--
i18n/po/cs.po | 1555 ++++++++++++--------
i18n/po/cy.po | 484 ++++--
i18n/po/da.po | 1320 ++++++++++-------
i18n/po/de.po | 629 ++++++--
i18n/po/de_DE.po | 484 ++++--
i18n/po/el.po | 500 +++++--
i18n/po/en_AU.po | 500 +++++--
i18n/po/en_CA.po | 482 ++++--
i18n/po/en_GB.po | 1296 ++++++++++------
i18n/po/eo.po | 484 ++++--
i18n/po/es.po | 510 +++++--
i18n/po/et.po | 490 ++++--
i18n/po/eu.po | 496 +++++--
i18n/po/fa.po | 482 ++++--
i18n/po/fi.po | 501 +++++--
i18n/po/fil.po | 482 ++++--
i18n/po/fo.po | 482 ++++--
i18n/po/fr.po | 538 +++++--
i18n/po/ga.po | 482 ++++--
i18n/po/gl.po | 496 +++++--
i18n/po/he.po | 488 ++++--
i18n/po/hi.po | 484 ++++--
i18n/po/hr.po | 484 ++++--
i18n/po/ht.po | 482 ++++--
i18n/po/hu.po | 549 +++++--
i18n/po/hy.po | 482 ++++--
i18n/po/ia.po | 482 ++++--
i18n/po/id.po | 502 +++++--
i18n/po/is.po | 492 +++++--
i18n/po/it.po | 504 +++++--
i18n/po/ja.po | 544 +++++--
i18n/po/ka.po | 484 ++++--
i18n/po/km.po | 498 +++++--
i18n/po/ko.po | 486 ++++--
i18n/po/ky.po | 482 ++++--
i18n/po/lo.po | 484 ++++--
i18n/po/lt.po | 679 ++++++---
i18n/po/lv.po | 484 ++++--
i18n/po/mk.po | 484 ++++--
i18n/po/mr.po | 484 ++++--
i18n/po/ms.po | 484 ++++--
i18n/po/nb.po | 490 ++++--
i18n/po/nds.po | 482 ++++--
i18n/po/nl.po | 782 +++++++---
i18n/po/nn.po | 484 ++++--
i18n/po/oc.po | 486 ++++--
i18n/po/pa.po | 482 ++++--
i18n/po/pl.po | 605 ++++++--
i18n/po/pt.po | 654 ++++++--
i18n/po/pt_BR.po | 539 +++++--
i18n/po/rm.po | 482 ++++--
i18n/po/ro.po | 486 ++++--
i18n/po/ru.po | 566 +++++--
i18n/po/sk.po | 656 ++++++---
i18n/po/sl.po | 498 +++++--
i18n/po/sq.po | 484 ++++--
i18n/po/sr.po | 484 ++++--
i18n/po/sv.po | 839 +++++++----
i18n/po/ta.po | 484 ++++--
i18n/po/te.po | 482 ++++--
i18n/po/th.po | 482 ++++--
i18n/po/tr.po | 500 +++++--
i18n/po/ug.po | 482 ++++--
i18n/po/uk.po | 648 ++++++--
i18n/po/ur.po | 482 ++++--
i18n/po/vi.po | 504 +++++--
i18n/po/zh_CN.po | 496 +++++--
i18n/po/zh_TW.po | 497 +++++--
i18n/specialmessages.java | 1 +
linux/latest/usr/bin/josm-latest | 64 +-
linux/tested/usr/bin/josm | 64 +-
.../disk/block/BlockDiskCacheFactory.java | 3 +-
.../disk/indexed/IndexedDiskCacheFactory.java | 3 +-
.../jcs/auxiliary/disk/jdbc/JDBCDiskCache.java | 164 +--
.../disk/jdbc/JDBCDiskCacheAttributes.java | 49 +-
.../auxiliary/disk/jdbc/JDBCDiskCacheFactory.java | 160 +-
.../disk/jdbc/JDBCDiskCachePoolAccess.java | 271 ----
.../jdbc/JDBCDiskCachePoolAccessAttributes.java | 179 ---
.../disk/jdbc/JDBCDiskCachePoolAccessManager.java | 211 ---
.../disk/jdbc/dsfactory/DataSourceFactory.java | 85 ++
.../disk/jdbc/dsfactory/JndiDataSourceFactory.java | 185 +++
.../dsfactory/SharedPoolDataSourceFactory.java | 150 ++
.../auxiliary/disk/jdbc/mysql/MySQLDiskCache.java | 13 +-
.../disk/jdbc/mysql/MySQLDiskCacheFactory.java | 27 +-
.../disk/jdbc/mysql/MySQLTableOptimizer.java | 31 +-
.../engine/control/CompositeCacheConfigurator.java | 24 +-
.../engine/logging/behavior/ICacheEventLogger.java | 1 +
.../commons/jcs/engine/stats/StatElement.java | 2 +-
src/org/openstreetmap/josm/Main.java | 4 +-
.../openstreetmap/josm/actions/AboutAction.java | 43 +-
.../josm/actions/DialogsToggleAction.java | 6 +-
.../josm/actions/DuplicateAction.java | 9 +-
.../josm/actions/ImageryAdjustAction.java | 2 +-
.../josm/actions/PasteTagsAction.java | 5 +-
.../openstreetmap/josm/actions/PurgeAction.java | 27 +-
.../openstreetmap/josm/actions/SplitWayAction.java | 45 +-
.../josm/actions/UnselectAllAction.java | 5 +-
.../openstreetmap/josm/actions/UploadAction.java | 2 +-
.../josm/actions/mapmode/DrawAction.java | 1 +
.../josm/actions/mapmode/ExtrudeAction.java | 1 +
.../josm/actions/mapmode/MapMode.java | 1 +
.../josm/actions/mapmode/SelectAction.java | 48 +-
.../actions/relation/DownloadMembersAction.java | 6 +-
.../DownloadSelectedIncompleteMembersAction.java | 3 +-
.../josm/actions/search/SearchAction.java | 36 +-
.../josm/actions/search/SearchCompiler.java | 115 +-
.../josm/command/ChangePropertyCommand.java | 4 +-
src/org/openstreetmap/josm/data/Version.java | 82 +-
.../josm/data/cache/HostLimitQueue.java | 4 +-
.../josm/data/cache/JCSCacheManager.java | 6 +-
.../josm/data/cache/JCSCachedTileLoaderJob.java | 2 +
.../josm/data/conflict/ConflictCollection.java | 1 +
.../josm/data/imagery/ImageryInfo.java | 2 +-
.../josm/data/imagery/TMSCachedTileLoader.java | 23 +-
.../openstreetmap/josm/data/notes/NoteComment.java | 7 +-
.../josm/data/osm/ChangesetCache.java | 2 +-
.../josm/data/osm/DefaultChangesetCacheEvent.java | 2 +-
src/org/openstreetmap/josm/data/osm/Node.java | 2 +-
.../josm/data/osm/PrimitiveDeepCopy.java | 2 +-
src/org/openstreetmap/josm/data/osm/Storage.java | 1 +
.../openstreetmap/josm/data/osm/WaySegment.java | 16 +
.../osm/event/AbstractDatasetChangedEvent.java | 12 +-
.../josm/data/osm/event/DatasetEventManager.java | 6 +-
.../josm/data/osm/history/HistoryDataSet.java | 2 +-
.../josm/data/osm/history/HistoryRelation.java | 2 +-
.../josm/data/osm/visitor/Visitor.java | 3 +
.../data/osm/visitor/paint/StyledMapRenderer.java | 120 +-
.../osm/visitor/paint/relations/Multipolygon.java | 8 +-
.../josm/data/validation/tests/TagChecker.java | 120 +-
src/org/openstreetmap/josm/gui/ExtendedDialog.java | 2 +-
.../josm/gui/HelpAwareOptionPane.java | 4 +-
.../josm/gui/JosmUserIdentityManager.java | 2 +-
src/org/openstreetmap/josm/gui/MainMenu.java | 4 +
src/org/openstreetmap/josm/gui/MapFrame.java | 1 +
src/org/openstreetmap/josm/gui/MapStatus.java | 12 +-
.../openstreetmap/josm/gui/SelectionManager.java | 1 +
.../josm/gui/bbox/TileSelectionBBoxChooser.java | 6 +-
.../relation/RelationMemberListColumnModel.java | 2 +-
.../tags/CombinePrimitiveResolverDialog.java | 24 +-
.../gui/conflict/tags/MultiValueCellEditor.java | 1 +
.../tags/TagConflictResolverColumnModel.java | 2 +-
.../josm/gui/dialogs/ChangesetDialog.java | 6 +-
.../josm/gui/dialogs/CommandStackDialog.java | 5 +-
.../josm/gui/dialogs/ConflictDialog.java | 2 +-
.../DeleteFromRelationConfirmationDialog.java | 26 +-
.../josm/gui/dialogs/DialogsPanel.java | 1 +
.../josm/gui/dialogs/FilterDialog.java | 3 +-
.../josm/gui/dialogs/LayerListDialog.java | 4 +-
.../josm/gui/dialogs/NotesDialog.java | 3 +-
.../josm/gui/dialogs/RelationListDialog.java | 39 +-
.../josm/gui/dialogs/UserListDialog.java | 2 +-
.../dialogs/changeset/ChangesetCacheManager.java | 8 +-
.../changeset/ChangesetCacheManagerModel.java | 2 +-
.../changeset/ChangesetContentDownloadTask.java | 2 +-
.../dialogs/changeset/ChangesetContentPanel.java | 6 +-
.../changeset/ChangesetContentTableModel.java | 2 +-
.../dialogs/changeset/ChangesetDetailPanel.java | 6 +-
.../dialogs/changeset/ChangesetDownloadTask.java | 2 +-
.../changeset/ChangesetHeaderDownloadTask.java | 2 +-
.../changeset/ChangesetInSelectionListModel.java | 3 +-
.../gui/dialogs/changeset/ChangesetTagsPanel.java | 2 +-
.../changeset/SingleChangesetDownloadPanel.java | 2 +-
.../changeset/query/ChangesetQueryTask.java | 2 +-
.../gui/dialogs/properties/PropertiesDialog.java | 57 +-
.../dialogs/properties/SearchBasedRowFilter.java | 88 ++
.../gui/dialogs/relation/ChildRelationBrowser.java | 2 +-
.../dialogs/relation/GenericRelationEditor.java | 6 +-
.../josm/gui/dialogs/relation/MemberTable.java | 37 +-
.../gui/dialogs/relation/MemberTableModel.java | 9 +-
.../relation/ParentRelationLoadingTask.java | 2 +-
.../dialogs/relation/RelationDialogManager.java | 3 +-
.../josm/gui/dialogs/relation/RelationEditor.java | 1 +
.../gui/dialogs/relation/SelectionTableModel.java | 2 +-
.../gui/dialogs/relation/sort/RelationNodeMap.java | 2 +-
.../gui/dialogs/relation/sort/RelationSorter.java | 4 +-
.../relation/sort/WayConnectionTypeCalculator.java | 1 +
.../josm/gui/download/BookmarkSelection.java | 2 +-
.../josm/gui/download/BoundingBoxSelection.java | 2 +-
.../josm/gui/download/DownloadDialog.java | 3 +-
.../josm/gui/history/CoordinateInfoViewer.java | 2 +-
.../josm/gui/history/HistoryBrowserDialog.java | 2 +-
.../josm/gui/history/TwoColumnDiff.java | 2 +-
.../josm/gui/history/VersionInfoPanel.java | 2 +-
.../josm/gui/history/VersionTable.java | 2 +-
.../josm/gui/io/ChangesetManagementPanel.java | 4 +-
.../josm/gui/io/CredentialDialog.java | 2 +-
.../josm/gui/io/DownloadFileTask.java | 2 +-
.../josm/gui/io/UploadParameterSummaryPanel.java | 2 +-
.../josm/gui/layer/AbstractTileSourceLayer.java | 6 +-
.../gui/layer/gpx/ConvertToDataLayerAction.java | 4 +-
.../josm/gui/mappaint/AreaElemStyle.java | 16 +-
.../gui/mappaint/LabelCompositionStrategy.java | 17 +-
.../openstreetmap/josm/gui/mappaint/StyleKeys.java | 1 +
.../gui/mappaint/mapcss/ExpressionFactory.java | 1 +
.../josm/gui/mappaint/mapcss/Selector.java | 2 +-
.../gui/oauth/FullyAutomaticAuthorizationUI.java | 2 +-
.../josm/gui/oauth/ManualAuthorizationUI.java | 2 +-
.../josm/gui/oauth/OsmPrivilegesPanel.java | 2 +-
.../gui/oauth/SemiAutomaticAuthorizationUI.java | 2 +-
.../josm/gui/preferences/PreferenceTabbedPane.java | 9 +-
.../josm/gui/preferences/ToolbarPreferences.java | 17 +-
.../gui/preferences/map/MapPaintPreference.java | 9 +-
.../projection/CustomProjectionChoice.java | 3 +-
.../server/AuthenticationPreferencesPanel.java | 2 +-
.../josm/gui/progress/AbstractProgressMonitor.java | 7 +-
.../josm/gui/tagging/TagCellEditor.java | 2 +-
.../josm/gui/tagging/TagEditorModel.java | 2 +
.../openstreetmap/josm/gui/tagging/TagTable.java | 7 +-
.../josm/gui/tagging/presets/TaggingPresets.java | 6 +
.../tagging/presets/items/ComboMultiSelect.java | 2 +
.../widgets/AbstractTextComponentValidator.java | 2 +-
.../gui/widgets/BoundingBoxSelectionPanel.java | 2 +-
.../gui/widgets/CompileSearchTextDecorator.java | 74 +
.../josm/gui/widgets/QuadStateCheckBox.java | 1 +
.../widgets/SelectAllOnFocusGainedDecorator.java | 2 +-
.../josm/io/BoundingBoxDownloader.java | 2 +-
src/org/openstreetmap/josm/io/CachedFile.java | 1 +
src/org/openstreetmap/josm/io/GpxReader.java | 14 +-
.../josm/io/MultiFetchServerObjectReader.java | 2 +-
src/org/openstreetmap/josm/io/NoteReader.java | 5 +-
.../josm/io/auth/CredentialsAgentResponse.java | 7 +
.../josm/io/session/ImagerySessionExporter.java | 5 +
.../josm/plugins/PluginDownloadTask.java | 2 +-
.../openstreetmap/josm/plugins/PluginHandler.java | 3 +-
src/org/openstreetmap/josm/tools/Diff.java | 8 +
.../openstreetmap/josm/tools/GeoPropertyIndex.java | 1 +
src/org/openstreetmap/josm/tools/Geometry.java | 25 +-
src/org/openstreetmap/josm/tools/I18n.java | 14 +-
.../openstreetmap/josm/tools/ImageProvider.java | 4 +-
src/org/openstreetmap/josm/tools/Shortcut.java | 3 +
src/org/openstreetmap/josm/tools/Utils.java | 49 +
.../openstreetmap/josm/tools/date/DateUtils.java | 1 +
styles/standard/elemstyles.mapcss | 181 ++-
test/data/regress/12038/data.osm | 655 +++++++++
.../pair/properties/PropertiesMergerTest.java | 2 +-
.../josm/actions/PurgeActionTest.java | 61 +
.../josm/data/cache/JCSCacheManagerTest.java | 25 +
.../josm/data/imagery/ImageryInfoTest.java | 35 +
.../org/openstreetmap/josm/data/osm/NodeTest.java | 44 +
.../josm/data/osm/WaySegmentTest.java | 48 +
.../josm/data/validation/tests/TagCheckerTest.java | 19 +
262 files changed, 37388 insertions(+), 11488 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